Move around secrets and variables and the like

.gitattributes

@@ -1 +1 @@
-modules/system/variables/secrets/** filter=git-crypt diff=git-crypt
+modules/system/secrets/** filter=git-crypt diff=git-crypt

hosts/kitty/firewall/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, config, ... }:
 {
   networking = {
     firewall.extraInputRules = ''

modules/system/default.nix

@@ -4,9 +4,9 @@
     ./accounts
     ./devices
     ./programs
+    ./secrets
     ./services
     ./settings
-    ./variables
   ];
 
   options.system = with lib; {

modules/system/devices/networking/default.nix

@@ -1,6 +1,7 @@
 { config, ... }:
 {
   imports = [
+    ./ips
     ./wireless
     ./wireguard
   ];

modules/system/devices/networking/ips/default.nix

@@ -6,9 +6,9 @@
 
   config.ips = rec {
     localSpan = "10.1.0";
-    server = "${localSpan}.2";
+    server = "10.1.0.2";
-    pc = "${localSpan}.4";
+    pc = "10.1.0.4";
-    vm = "${localSpan}.5";
+    vm = "10.1.0.5";
-    hx = "${localSpan}.70";
+    hx = "10.1.0.70";
   };
 }

modules/system/variables/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./ips
-    ./secrets
-  ];
-}