From a3dc898ce8757a9b14024ea97488915069549bca Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Feb 2016 14:26:59 +0100 Subject: ma 1 omo: remove obsolete nixpkgs rev --- makefu/1systems/omo.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 6cff35e9d..ca0bfd2b5 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -40,7 +40,6 @@ in { networking.firewall.allowedTCPPorts = [ 80 655 8080 ]; # services.openssh.allowSFTP = false; - krebs.build.source.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; # copy config from to /var/lib/sabnzbd/ services.sabnzbd.enable = true; -- cgit v1.2.3 From ce0b1e987a4bd99ed204e9ce06a7c882060dcbcf Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Feb 2016 23:38:50 +0100 Subject: ma 2 laptop-utils: init --- makefu/1systems/pornocauster.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index b2cf0be79..9415f2345 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -8,6 +8,7 @@ [ # Include the results of the hardware scan. ../. ../2configs/main-laptop.nix #< base-gui + zsh + ../2configs/laptop-utils.nix # Krebs ../2configs/tinc-basic-retiolum.nix @@ -39,6 +40,9 @@ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; + # steam + hardware.opengl.driSupport32Bit = true; + hardware.pulseaudio.support32Bit = true; # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; -- cgit v1.2.3 From 321b831755f8d8572e30e9b735617a90525b311a Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 28 Feb 2016 02:25:53 +0100 Subject: ma 2 laptop-utils: FF with flash --- makefu/1systems/wry.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 747321968..462ec4faf 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -11,7 +11,6 @@ in { # TODO: copy this config or move to krebs ../../tv/2configs/hw/CAC.nix ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix - ../2configs/unstable-sources.nix ../2configs/headless.nix ../2configs/tinc-basic-retiolum.nix @@ -28,7 +27,8 @@ in { # collectd ../2configs/collectd/collectd-base.nix ]; - + services.nixosManual.enable = false; + programs.man.enable = false; krebs.build.host = config.krebs.hosts.wry; krebs.Reaktor = { -- cgit v1.2.3 From e8679ae6c0fd33be9c84a671d2ebfae51f5851f0 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 5 Mar 2016 10:59:09 +0100 Subject: ma 1 omo: replace disk2 --- makefu/1systems/omo.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index ca0bfd2b5..e6a1434ab 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -12,11 +12,25 @@ let # cryptsetup luksAddKey $dev tmpkey # cryptsetup luksOpen $dev crypt0 # mkfs.xfs /dev/mapper/crypt0 -L crypt0 + + # omo Chassis: + # __FRONT_ + # |* d2 | + # | | + # |* d3 | + # | | + # |* d0 | + # | | + # |* d1 | + # |* | + # | * r0 | + # |_______| cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6"; cryptDisk1 = byid "ata-TP02000GB_TPW151006050068"; - cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; + # cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; + cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; # all physical disks - allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ]; + allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ]; in { imports = [ @@ -85,7 +99,7 @@ in { (usbkey "home" homePartition) (usbkey "crypt0" cryptDisk0) (usbkey "crypt1" cryptDisk1) - (usbkey "crypt2" cryptDisk2) + (usbkey "crypt2" cryptDisk3) ]; }; loader.grub.device = rootDisk; -- cgit v1.2.3 From ef97cc848f379f84dcbe1aa3ed327bd5c30dadc2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 8 Mar 2016 18:35:32 +0100 Subject: ma 1 omo: replace crypt2 --- makefu/1systems/omo.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index e6a1434ab..aa4a8a5c9 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -10,8 +10,8 @@ let homePartition = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN-part3"; # cryptsetup luksFormat $dev --cipher aes-xts-plain64 -s 512 -h sha512 # cryptsetup luksAddKey $dev tmpkey - # cryptsetup luksOpen $dev crypt0 - # mkfs.xfs /dev/mapper/crypt0 -L crypt0 + # cryptsetup luksOpen $dev crypt0 --key-file tmpkey --keyfile-size=4096 + # mkfs.ext4 /dev/mapper/crypt0 -L crypt0 -T largefile # omo Chassis: # __FRONT_ @@ -27,10 +27,10 @@ let # |_______| cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6"; cryptDisk1 = byid "ata-TP02000GB_TPW151006050068"; - # cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; - cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; + cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG"; + # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; # all physical disks - allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ]; + allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ]; in { imports = [ @@ -99,7 +99,7 @@ in { (usbkey "home" homePartition) (usbkey "crypt0" cryptDisk0) (usbkey "crypt1" cryptDisk1) - (usbkey "crypt2" cryptDisk3) + (usbkey "crypt2" cryptDisk2) ]; }; loader.grub.device = rootDisk; -- cgit v1.2.3