nixos: add machine dean

8 files changed, 65 insertions, 28 deletions

diff --git a/build-turris.sh b/build-turris.sh
index 860dbad..d93da81 100755
--- a/build-turris.sh
+++ b/build-turris.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 omnia_hash="bd7ac5d8c08538ec1f126d34b765f0362427fe17"
-routers=( "spt-mox2" "spt-omnia" )
+routers=( "dean" "spt-mox2" "spt-omnia" )
 
 cd "${0%/*}" || exit
 for system in "${routers[@]}"; do
diff --git a/flake.lock b/flake.lock
index b762311..5e6a9b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1658150454,
-        "narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=",
+        "lastModified": 1658253353,
+        "narHash": "sha256-VlpCf/hS9m0vyrXGN7VnvFR/W4cFSoyfNVkl95HdbJo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3110964916469ad6ed9fea72a0a3119a0959a14e",
+        "rev": "6f884c2f43c7bb105816303eb4867da672ec6f39",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1658079384,
-        "narHash": "sha256-olmeJLvuCEY+IU4jtnKVUM1sGwi70+zqlMrFHtnBNdE=",
+        "lastModified": 1658243298,
+        "narHash": "sha256-AeeaAx+7p+HoWShN6nmso8+7T2sglEVJeinu6NP6EMQ=",
         "ref": "refs/heads/master",
-        "rev": "12747ad801b7f4cf90a1716db5547bb0fb3b72a0",
-        "revCount": 29,
+        "rev": "aea7e04bda37da24c660ff5ab220182dfbb8244f",
+        "revCount": 32,
         "type": "git",
         "url": "https://git.cynerd.cz/nixturris"
       },
@@ -108,11 +108,11 @@
     },
     "personal-secret": {
       "locked": {
-        "lastModified": 1658221229,
-        "narHash": "sha256-+dpsauDVyKt5wRo0jCD9vvEJL5TDdf7IabX3RQKbRjQ=",
+        "lastModified": 1658301734,
+        "narHash": "sha256-lMjE6i/rM/ee1xOkkLxqYzlSqS9FXEu5HdhXi/Fxtyk=",
         "ref": "refs/heads/master",
-        "rev": "bbc74448642373618dedb1e9fa180720fab70cbf",
-        "revCount": 22,
+        "rev": "9517244ffa46efa3be21bd4e099bce054c692047",
+        "revCount": 26,
         "type": "git",
         "url": "ssh://git@cynerd.cz/nixos-personal-secret"
       },
diff --git a/flake.nix b/flake.nix
index 1a5851a..263ef81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,7 @@
         amd64System "susan" //
         armv7lSystem "spt-mpd" //
         aarch64System "adm-mpd" //
+        turrisMoxSystem "dean" //
         turrisOmniaSystem "spt-omnia" //
         turrisMoxSystem "spt-mox" //
         turrisMoxSystem "spt-mox2" //
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"];