code rules

config/base.nix

@@ -38,9 +38,7 @@
   };
   i18n = {
     defaultLocale = "en_CA.UTF-8";
-    extraLocaleSettings = {
-      LC_MONETARY = "es_MX.UTF-8";
-    };
+    extraLocaleSettings.LC_MONETARY = "es_MX.UTF-8";
   };
   console = {
     font = "Lat2-Terminus16";
@@ -48,10 +46,6 @@
   };
   security = {
     polkit.enable = true;
-    sudo-rs = {
-      enable = true;
-      wheelNeedsPassword = false;
-    };
     pam.loginLimits = [
       {
         domain = "*";
@@ -60,6 +54,10 @@
         value = "8192";
       }
     ];
+    sudo-rs = {
+      enable = true;
+      wheelNeedsPassword = false;
+    };
   };
   users = {
     mutableUsers = false;

config/derek.nix

@@ -15,6 +15,9 @@ let
   };
 in
 {
+  sops.secrets = lib.mkIf config.my.secureHost {
+    derek-password.neededForUsers = true;
+  };
   my = {
     stylix = enableForDerek;
     emacs = enableForDerek;
@@ -34,9 +37,6 @@ in
       multimedia = enableForDerek;
     };
   };
-  sops.secrets = lib.mkIf config.my.secureHost {
-    derek-password.neededForUsers = true;
-  };
   services = {
     tailscale.enable = true;
     sunshine = {
@@ -48,17 +48,15 @@ in
   };
   networking.nftables = {
     enable = true;
-    tables = {
-      local-uid-block = {
-        family = "inet";
-        content = ''
-          chain output {
-            type filter hook output priority 0; policy accept;
-            meta skuid ${toString derekUid} ip daddr 127.0.0.1 tcp dport { ${toString openWebuiPort}, ${toString sillytavernPort} } drop
-            meta skuid ${toString derekUid} ip6 daddr ::1 tcp dport { ${toString openWebuiPort}, ${toString sillytavernPort} } drop
-          }
-        '';
-      };
+    tables.local-uid-block = {
+      family = "inet";
+      content = ''
+        chain output {
+          type filter hook output priority 0; policy accept;
+          meta skuid ${toString derekUid} ip daddr 127.0.0.1 tcp dport { ${toString openWebuiPort}, ${toString sillytavernPort} } drop
+          meta skuid ${toString derekUid} ip6 daddr ::1 tcp dport { ${toString openWebuiPort}, ${toString sillytavernPort} } drop
+        }
+      '';
     };
   };
   users.users.bearded_dragonn = {

config/home-manager.nix

@@ -39,27 +39,6 @@ in
     ];
   home.stateVersion = "23.05";
   programs = {
-    direnv = {
-      enable = true;
-      enableBashIntegration = shellType == "bash";
-      enableZshIntegration = shellType == "zsh";
-      nix-direnv.enable = true;
-    };
-    git = {
-      enable = true;
-      settings = {
-        pull.rebase = true;
-        init.defaultBranch = "main";
-        user = {
-          email = if osConfig == null then userEmail else osConfig.my.email;
-          name = "Danilo Reyes";
-        };
-      };
-    };
-    delta = {
-      enable = true;
-      enableGitIntegration = true;
-    };
     ssh.enableDefaultConfig = false;
     bash = lib.mkIf (shellType == "bash") {
       enable = true;
@@ -85,6 +64,27 @@ in
         ignoreAllDups = true;
       };
     };
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+    direnv = {
+      enable = true;
+      enableBashIntegration = shellType == "bash";
+      enableZshIntegration = shellType == "zsh";
+      nix-direnv.enable = true;
+    };
+    git = {
+      enable = true;
+      settings = {
+        pull.rebase = true;
+        init.defaultBranch = "main";
+        user = {
+          email = if osConfig == null then userEmail else osConfig.my.email;
+          name = "Danilo Reyes";
+        };
+      };
+    };
   };
   xdg = {
     enable = true;

config/stylix.nix

@@ -21,13 +21,11 @@ in
       description = "Users to apply Stylix theming for";
     };
   };
-  config = {
-    stylix = {
-      inherit (scheme) image polarity;
-      enable = true;
-      autoEnable = cfg.enable;
-      targets.qt.platform = lib.mkForce "qtct";
-    }
-    // lib.optionalAttrs (scheme ? base16Scheme) { inherit (scheme) base16Scheme; };
-  };
+  config.stylix = {
+    inherit (scheme) image polarity;
+    enable = true;
+    autoEnable = cfg.enable;
+    targets.qt.platform = lib.mkForce "qtct";
+  }
+  // lib.optionalAttrs (scheme ? base16Scheme) { inherit (scheme) base16Scheme; };
 }