diff options
Diffstat (limited to 'tv/1systems')
-rw-r--r-- | tv/1systems/alnus.nix | 6 | ||||
-rw-r--r-- | tv/1systems/cd.nix | 4 | ||||
-rw-r--r-- | tv/1systems/wu.nix | 15 |
3 files changed, 12 insertions, 13 deletions
diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix index bc6e3a6d8..4bc0318e8 100644 --- a/tv/1systems/alnus.nix +++ b/tv/1systems/alnus.nix @@ -22,10 +22,6 @@ with import <stockholm/lib>; devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; }; }; - loader = { - efi.canTouchEfiVariables = true; - gummiboot.enable = true; - }; }; environment.systemPackages = with pkgs; [ @@ -62,7 +58,7 @@ with import <stockholm/lib>; krebs.build = { host = config.krebs.hosts.alnus; user = mkForce config.krebs.users.dv; - source.nixpkgs.git.ref = mkForce "d7450443c42228832c68fba203a7c15cfcfb264e"; + source.nixpkgs.git.ref = mkForce "e924319cb6c74aa2a9c943eddeb0caef79db01bc"; }; networking.networkmanager.enable = true; diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 108006f34..b718d19b8 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -16,11 +16,11 @@ with import <stockholm/lib>; networking = { interfaces.enp2s1.ip4 = singleton { address = let - addr = "45.62.237.203"; + addr = "64.137.177.226"; in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr; prefixLength = 24; }; - defaultGateway = "45.62.237.1"; + defaultGateway = "64.137.177.1"; nameservers = ["8.8.8.8"]; }; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index d5be57bb8..a9d7e94eb 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -23,7 +23,6 @@ with import <stockholm/lib>; # stockholm gnumake hashPassword - haskellPackages.lentil parallel # root @@ -47,7 +46,6 @@ with import <stockholm/lib>; p7zip push qrencode - texLive tmux #ack @@ -116,18 +114,23 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; devices = [ - { name = "home"; device = "/dev/vg840/enchome"; preLVM = false; } + { name = "wuca"; device = "/dev/sda2"; } ]; }; fileSystems = { "/" = { - device = "/dev/mapper/vg840-wuroot"; + device = "/dev/mapper/wuvga-root"; + fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; + }; + "/bku" = { + device = "/dev/mapper/wuvga-bku"; fsType = "btrfs"; options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/home" = { - device = "/dev/mapper/home"; + device = "/dev/mapper/wuvga-home"; fsType = "btrfs"; options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; @@ -174,5 +177,5 @@ with import <stockholm/lib>; KERNEL=="hpet", GROUP="audio" ''; - services.virtualboxHost.enable = true; + virtualisation.virtualbox.host.enable = true; } |