falkenstein-1 -> falkenstein

README.md

@@ -54,7 +54,7 @@ sda
   └─nix   /nix
 ```
 
-### falkenstein-1
+### falkenstein
 Hetzner VPS running a few web apps.
 #### Disk layout
 ```

flake.lock

@@ -179,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700261686,
+        "lastModified": 1700419052,
-        "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=",
+        "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee",
+        "rev": "993fb02d20760067b8ee19c713d94cee07037759",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699760693,
+        "lastModified": 1700363379,
-        "narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=",
+        "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113",
+        "rev": "27920146e671a0d565aaa7452907383be14d8d82",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700204040,
+        "lastModified": 1700390070,
-        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
+        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
+        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -110,11 +110,11 @@
             }
           ];
         };
-        falkenstein-1 = nixpkgs.lib.nixosSystem {
+        falkenstein = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = attrs;
           modules = [
-            ./hosts/falkenstein-1
+            ./hosts/falkenstein
             ./shared
             {
               nixpkgs.overlays = [ self.overlays.default ];

hosts/falkenstein/modules/networks/default.nix

@@ -12,7 +12,7 @@
 
   };
   networking = {
-    hostName = "falkenstein-1";
+    hostName = "falkenstein";
     nftables.enable = true;
     domain = "rfive.de";
     useNetworkd = true;

hosts/thinkpad/default.nix

@@ -76,19 +76,21 @@
       ];
   };
 
-  fonts.packages = with pkgs; [
+  fonts = {
-    nerdfonts
+    enableDefaultFonts = false;
-    noto-fonts
+    packages = with pkgs;
-    noto-fonts-cjk
+      [
-    noto-fonts-emoji
+        nerdfonts
-    dejavu_fonts
+        noto-fonts
-    fira
+        noto-fonts-cjk
-  ];
+        noto-fonts-emoji
-
+        dejavu_fonts
+        fira
+      ];
+  };
   # Enable sound.
   sound.enable = true;
   #hardware.pulseaudio.enable = true;
-  hardware.opengl.enable = true;
   hardware.bluetooth.enable = true;
 
   security = {
@@ -185,6 +187,7 @@
     htop-vim
     dig
     traceroute
+    mtr
     whois
     inetutils
     lsof
@@ -202,15 +205,15 @@
     qpwgraph
   ];
 
-  services.mysql = {
+  # services.mysql = {
-    enable = true;
+  #   enable = true;
-    package = pkgs.mariadb;
+  #   package = pkgs.mariadb;
-    ensureUsers = [
+  #   ensureUsers = [
-      {
+  #     {
-        name = "user1";
+  #       name = "user1";
-      }
+  #     }
-    ];
+  #   ];
-  };
+  # };
 
   programs.java.enable = true;
   programs.wireshark = {

hosts/thinkpad/modules/networks/default.nix

@@ -47,6 +47,11 @@
           psk = "@DORM_PSK@";
           authProtocols = [ "SAE" ];
         };
+        "@DORM5_SSID@" = {
+          priority = 5;
+          psk = "@DORM_PSK@";
+          authProtocols = [ "SAE" ];
+        };
         "@PIXEL_SSID@" = {
           psk = "@PIXEL_PSK@";
           authProtocols = [ "WPA-PSK" ];

hosts/thinkpad/modules/networks/uni.nix

@@ -33,13 +33,13 @@
         authProtocols = [ "WPA-EAP" ];
       };
       agdsn-office = {
+        priority = 5;
         auth = ''
           eap=TTLS
           anonymous_identity="wifi@agdsn.de"
           ca_cert="/etc/ssl/certs/ca-certificates.crt"
           domain_suffix_match="radius.agdsn.de"
           identity="r5"
-          priority=5
           proto=WPA2
           password="@AGDSN_AUTH@"
           phase2="auth=PAP"