zaphyra's git: nixfiles

nix fmt

diff --git a/config/nixos/modules/presets/zaphyra/dnsServer.nix b/config/nixos/modules/presets/zaphyra/dnsServer.nix
@@ -55,7 +55,12 @@ in
         in
         {
           "zaphyra.eu" = {
-            inherit SOA NS CAA TXT;
+            inherit
+              SOA
+              NS
+              CAA
+              TXT
+              ;
 
             subdomains = {
               "acme.infra".NS = [

@@ -67,7 +72,12 @@ in
             };
           };
           "zaphyra.de" = {
-            inherit SOA NS CAA TXT;
+            inherit
+              SOA
+              NS
+              CAA
+              TXT
+              ;
           };
           "zaphyra.dn42" = {
             NS = [

@@ -84,7 +94,12 @@ in
             };
           };
           "katja.wtf" = {
-            inherit SOA NS CAA TXT;
+            inherit
+              SOA
+              NS
+              CAA
+              TXT
+              ;
 
             subdomains = {
               #legacy-stuff (zuggeschmack server)

diff --git a/config/nixos/modules/presets/zaphyra/networkManagerProfiles/dn42.nix b/config/nixos/modules/presets/zaphyra/networkManagerProfiles/dn42.nix
@@ -21,7 +21,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    sops.secrets."environments/networkManagerProfiles/dn42" = {};
+    sops.secrets."environments/networkManagerProfiles/dn42" = { };
 
     networking.networkmanager.ensureProfiles = {
       environmentFiles = [ config.sops.secrets."environments/networkManagerProfiles/dn42".path ];

diff --git a/config/nixos/modules/programs/yubikey.nix b/config/nixos/modules/programs/yubikey.nix
@@ -19,32 +19,34 @@ in
     default = false;
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    (
-      #if we have home-manager enabled... but packages in the user environment
-      lib.mkIf config.modules.homeManager.enable {
-        home-manager.sharedModules = [
-          {
-            home.packages = with pkgs; [
-              yubikey-manager
-              yubioath-flutter
-            ];
-          }
-        ];
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (
+        #if we have home-manager enabled... but packages in the user environment
+        lib.mkIf config.modules.homeManager.enable {
+          home-manager.sharedModules = [
+            {
+              home.packages = with pkgs; [
+                yubikey-manager
+                yubioath-flutter
+              ];
+            }
+          ];
+        }
+      )
+      (
+        # if not... put it in the system environment
+        lib.mkIf (!config.modules.homeManager.enable) {
+          environment.systemPackages = with pkgs; [
+            yubikey-manager
+            yubioath-flutter
+          ];
+        }
+      )
+      {
+        programs.yubikey-touch-detector.enable = true;
       }
-    )
-    (
-      # if not... put it in the system environment
-      lib.mkIf (!config.modules.homeManager.enable) {
-        environment.systemPackages = with pkgs; [
-          yubikey-manager
-          yubioath-flutter
-        ];
-      }
-    )
-    {
-      programs.yubikey-touch-detector.enable = true;
-    }
-  ]);
+    ]
+  );
 
-}-
\ No newline at end of file
+}

diff --git a/config/nixos/modules/users/void.nix b/config/nixos/modules/users/void.nix
@@ -18,37 +18,37 @@ in
     default = false;
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
-      sops.secrets.voidPassword = {
-        neededForUsers = true;
-        sopsFile = inputs.self.sopsSecrets.common;
-      };
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        sops.secrets.voidPassword = {
+          neededForUsers = true;
+          sopsFile = inputs.self.sopsSecrets.common;
+        };
 
-      users.users.void = {
-        uid = 1000;
-        description = "Hannah";
-        hashedPasswordFile = config.sops.secrets.voidPassword.path;
-        isNormalUser = true;
-        extraGroups = [
-          "audio"
-          "dialout"
-          "docker"
-          "input"
-          "networkmanager"
-          "ssh"
-          "tss"
-          "video"
-          "wheel"
-        ];
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFsnTwRtKRrn2KqbkTvXgwZniD1p90A7iqvQduhoDL6 openpgp:0x03F32AB3"
-        ];
-      };
-    }
+        users.users.void = {
+          uid = 1000;
+          description = "Hannah";
+          hashedPasswordFile = config.sops.secrets.voidPassword.path;
+          isNormalUser = true;
+          extraGroups = [
+            "audio"
+            "dialout"
+            "docker"
+            "input"
+            "networkmanager"
+            "ssh"
+            "tss"
+            "video"
+            "wheel"
+          ];
+          openssh.authorizedKeys.keys = [
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFsnTwRtKRrn2KqbkTvXgwZniD1p90A7iqvQduhoDL6 openpgp:0x03F32AB3"
+          ];
+        };
+      }
 
-    (
-      lib.mkIf config.modules.homeManager.enable {
+      (lib.mkIf config.modules.homeManager.enable {
         home-manager.users.void.imports = lib.concatLists [
           [
             homeManagerModules.void.home

@@ -58,8 +58,8 @@ in
             #homeManagerModules.void.impermanence # FIXME: implement impermanence
           ])
         ];
-      }
-    )
-  ]);
+      })
+    ]
+  );
 
 }

diff --git a/config/nixos/modules/users/zaphyra.nix b/config/nixos/modules/users/zaphyra.nix
@@ -19,35 +19,35 @@ in
     default = false;
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
-      sops.secrets.zaphyraPassword = {
-        neededForUsers = true;
-        sopsFile = inputs.self.sopsSecrets.common;
-      };
-
-      users.users.zaphyra = {
-        uid = 1001;
-        description = "Katja";
-        hashedPasswordFile = config.sops.secrets.zaphyraPassword.path;
-        isNormalUser = true;
-        extraGroups =
-          [
-            "ssh"
-            "wheel"
-          ]
-          ++ lib.optionals config.networking.networkmanager.enable [
-            "networkmanager"
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        sops.secrets.zaphyraPassword = {
+          neededForUsers = true;
+          sopsFile = inputs.self.sopsSecrets.common;
+        };
+
+        users.users.zaphyra = {
+          uid = 1001;
+          description = "Katja";
+          hashedPasswordFile = config.sops.secrets.zaphyraPassword.path;
+          isNormalUser = true;
+          extraGroups =
+            [
+              "ssh"
+              "wheel"
+            ]
+            ++ lib.optionals config.networking.networkmanager.enable [
+              "networkmanager"
+            ];
+          openssh.authorizedKeys.keys = [
+            (builtins.readFile "${pkgs.zaphyra-website}/ssh_pubkey.asc")
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnNyOCX+PopTHuNrfBwEmPM7FC6oM7nFgW/2tvW7ddT"
           ];
-        openssh.authorizedKeys.keys = [
-          (builtins.readFile "${pkgs.zaphyra-website}/ssh_pubkey.asc")
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnNyOCX+PopTHuNrfBwEmPM7FC6oM7nFgW/2tvW7ddT"
-        ];
-      };
-    }
+        };
+      }
 
-    (
-      lib.mkIf config.modules.homeManager.enable {
+      (lib.mkIf config.modules.homeManager.enable {
         home-manager.users.zaphyra.imports = lib.concatLists [
           [
             homeManagerModules.zaphyra.home

@@ -108,9 +108,9 @@ in
               gnomeExtensions.bluetoothBatteryMeter
             ]
           ))
-        ];        
-      }
-    )
-  ]);
+        ];
+      })
+    ]
+  );
 
 }