Commit ccb0771f3629

Vincent Demeester <vincent@sbr.pm>
2018-10-30 13:49:01
machine: wakasu is back in the game
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent e9d4502
Changed files (3)
hardware/lenovo-p50.nix
@@ -0,0 +1,7 @@
+{ config, pkg, ...}:
+
+{
+  imports = [
+    ./thinkpad.nix
+  ];
+}
\ No newline at end of file
machine/wakasu.nix
@@ -6,14 +6,12 @@
     ../hardware-configuration.nix
     ../profiles/laptop.nix
     ../profiles/ssh.nix
-    ../profiles/yubikey.nix
     ../profiles/dev.nix
     ../profiles/containerd.nix
     ../profiles/dockerization.nix
     ../profiles/virtualization.nix
-    ../location/docker.nix
     ../location/home.nix
-    ../hardware/thinkpad-t460s.nix
+    ../hardware/lenovo-p50.nix
   ];
 
   security.pam.loginLimits = [
@@ -23,15 +21,7 @@
   ];
 
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
-      device = "/dev/disk/by-uuid/e511e87f-a3b1-472a-bebb-c6cdd5154a16";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
-
+  
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 
@@ -45,4 +35,11 @@
     url = "https://github.com/vdemeester/slim-themes/raw/master/docker-key-theme-0.1.tar.xz";
     sha256 = "127893l1nzqya0g68k8841g5lm3hlnx7b3b3h06axvplc54a1jd8";
   };
+   services.wireguard = with import ../assets/machines.nix; {
+    enable = true;
+    ips = [ "${wireguard.ips.wakasu}/24" ];
+    endpoint = wg.endpointIP;
+    endpointPort = wg.listenPort;
+    endpointPublicKey = wireguard.kerkouane.publicKey;
+  };
 }
profiles/users.nix
@@ -11,7 +11,7 @@
         shell = if config.programs.fish.enable then pkgs.fish else pkgs.bash;
         initialPassword = "changeMe";
         openssh.authorizedKeys.keys =
-          with import ../assets/machines.nix; [ ssh.honshu.key ssh.kerkouane.key ssh.hokkaido.key ssh.california.key ssh.shikoku.key ssh.massimo.key ssh.carthage.key ];
+          with import ../assets/machines.nix; [ ssh.honshu.key ssh.kerkouane.key ssh.hokkaido.key ssh.california.key ssh.shikoku.key ssh.massimo.key ssh.carthage.key ssh.wakasu.key ];
           subUidRanges = [{ startUid = 100000; count = 65536; }];
           subGidRanges = [{ startGid = 100000; count = 65536; }];
       };
@@ -38,5 +38,7 @@ Host hokkaido.vpn ${wireguard.ips.hokkaido}
   Hostname ${wireguard.ips.hokkaido}
 Host massimo.vpn ${wireguard.ips.massimo}
   Hostname ${wireguard.ips.massimo}
+Host wakasu.vpn ${wireguard.ips.wakasu}
+Hostname ${wireguard.ips.wakasu}
     '';
 }