nixos: add machine dean

5 files changed, 52 insertions, 16 deletions

diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
new file mode 100644
index 0000000..eaa9094
--- /dev/null
+++ b/nixos/machine/dean.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  config = {
+    cynerd = {
+      openvpn = {
+        oldpersonal = true;
+      };
+    };
+
+    #boot.kernelPatches = [{
+    #  name = "rwtm";
+    #  patch = null;
+    #  extraConfig = ''
+    #    TURRIS_MOX_RWTM y
+    #    ARMADA_37XX_RWTM_MBOX y
+    #    '';
+    #}];
+
+    networking = {
+      bridges = {
+        brlan = {
+          interfaces = [
+            "eth0" "lan1" "lan2" "lan3" "lan4"
+          ];
+        };
+      };
+      dhcpcd.allowInterfaces = [ "brlan" ];
+    };
+
+  };
+
+}
diff --git a/nixos/machine/default.nix b/nixos/machine/default.nix
index bfd2594..87c9d15 100644
--- a/nixos/machine/default.nix
+++ b/nixos/machine/default.nix
@@ -1,6 +1,7 @@
 {
   machine-albert = import ./albert.nix;
   machine-binky = import ./binky.nix;
+  machine-dean = import ./dean.nix;
   machine-errol = import ./errol.nix;
   machine-lipwig = import ./lipwig.nix;
   machine-ridcully = import ./ridcully.nix;
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index f59ea09..fd79073 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -33,9 +33,6 @@ in {
   config = mkIf cnf.enable {
     cynerd.hosts.enable = true;
 
-    # TODO autologin but only on tty1
-    services.gpm.enable = true;
-
     programs.sway.enable = true;
     programs.sway.wrapperFeatures.gtk = true;
     programs.sway.extraPackages = with pkgs; [
@@ -206,6 +203,7 @@ in {
       };
     };
 
+    # Autologin on the first TTY
     services.getty = {
       extraArgs = [ "--skip-login" ];
       loginProgram = "${pkgs.bash}/bin/sh";
@@ -218,5 +216,17 @@ in {
       '');
     };
 
+    # VTI settings
+    console = {
+      colors = [
+        "2e3440" "3b4252" "434c5e" "4c566a" "d8dee9" "e5e9f0" "eceff4" "8fbcbb"
+        "88c0d0" "81a1c1" "5e81ac" "bf616a" "d08770" "ebcb8b" "a3be8c" "b48ead"
+      ];
+      earlySetup = true;
+      useXkbConfig = true;
+    };
+    services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape";
+    services.gpm.enable = true;
+
   };
 }
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index c1458c8..08b3bfa 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -96,17 +96,6 @@ with lib;
 
     time.timeZone = "Europe/Prague";
     i18n.defaultLocale = "en_US.UTF-8";
-
-    console = {
-      colors = [
-        "2e3440" "3b4252" "434c5e" "4c566a" "d8dee9" "e5e9f0" "eceff4" "8fbcbb"
-        "88c0d0" "81a1c1" "5e81ac" "bf616a" "d08770" "ebcb8b" "a3be8c" "b48ead"
-      ];
-      earlySetup = true;
-      useXkbConfig = true;
-    };
-    services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape";
-    services.gpm.enable = true;
   };
 
 }
diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix
index 19f877e..e307619 100644
--- a/nixos/modules/hosts.nix
+++ b/nixos/modules/hosts.nix
@@ -30,10 +30,10 @@ in {
     cynerd.hosts = {
       vpn = {
         "lipwig" = "10.8.0.1";
+        "dean" = "10.8.0.4";
         # Portable
         "android" = "10.8.0.2";
         "albert" = "10.8.0.3";
-        "dean" = "10.8.0.4";
         "susan" = "10.8.0.5";
         "binky" = "10.8.0.6";
         # Endpoints
@@ -73,7 +73,7 @@ in {
       "${cnf.vpn.lipwig}" = ["lipwig.vpn"];
       "${cnf.vpn.android}" = ["android.vpn"];
       "${cnf.vpn.albert}" = ["albert.vpn"];
-      "${cnf.vpn.dean}" = ["dean.vpn"];
+      "${cnf.vpn.dean}" = ["dean" "dean.vpn"];
       "${cnf.vpn.susan}" = ["susan.vpn"];
       "${cnf.vpn.binky}" = ["binky.vpn"];
       "${cnf.vpn.spt-omnia}" = ["spt.vpn"];