From 8a617299fe9764dc71e6ac3f93fd39e8a70caa95 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 2 Mar 2025 03:58:14 -0500
Subject: [PATCH] Move around secrets and variables and the like

---
 .gitattributes                                      |   2 +-
 hosts/kitty/firewall/default.nix                    |   2 +-
 modules/system/default.nix                          |   2 +-
 modules/system/devices/networking/default.nix       |   1 +
 .../networking}/ips/default.nix                     |   8 ++++----
 modules/system/{variables => }/secrets/default.nix  | Bin
 modules/system/variables/default.nix                |   7 -------
 7 files changed, 8 insertions(+), 14 deletions(-)
 rename modules/system/{variables => devices/networking}/ips/default.nix (55%)
 rename modules/system/{variables => }/secrets/default.nix (100%)
 delete mode 100644 modules/system/variables/default.nix

diff --git a/.gitattributes b/.gitattributes
index fd5e710..84f7963 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-modules/system/variables/secrets/** filter=git-crypt diff=git-crypt
+modules/system/secrets/** filter=git-crypt diff=git-crypt
diff --git a/hosts/kitty/firewall/default.nix b/hosts/kitty/firewall/default.nix
index 8265bff..d63aea0 100644
--- a/hosts/kitty/firewall/default.nix
+++ b/hosts/kitty/firewall/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, config, ... }:
 {
   networking = {
     firewall.extraInputRules = ''
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 31cc55c..527396d 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,9 +4,9 @@
     ./accounts
     ./devices
     ./programs
+    ./secrets
     ./services
     ./settings
-    ./variables
   ];
 
   options.system = with lib; {
diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix
index 0105017..543b513 100644
--- a/modules/system/devices/networking/default.nix
+++ b/modules/system/devices/networking/default.nix
@@ -1,6 +1,7 @@
 { config, ... }:
 {
   imports = [
+    ./ips
     ./wireless
     ./wireguard
   ];
diff --git a/modules/system/variables/ips/default.nix b/modules/system/devices/networking/ips/default.nix
similarity index 55%
rename from modules/system/variables/ips/default.nix
rename to modules/system/devices/networking/ips/default.nix
index 9817873..84a3f58 100644
--- a/modules/system/variables/ips/default.nix
+++ b/modules/system/devices/networking/ips/default.nix
@@ -6,9 +6,9 @@
 
   config.ips = rec {
     localSpan = "10.1.0";
-    server = "${localSpan}.2";
-    pc = "${localSpan}.4";
-    vm = "${localSpan}.5";
-    hx = "${localSpan}.70";
+    server = "10.1.0.2";
+    pc = "10.1.0.4";
+    vm = "10.1.0.5";
+    hx = "10.1.0.70";
   };
 }
diff --git a/modules/system/variables/secrets/default.nix b/modules/system/secrets/default.nix
similarity index 100%
rename from modules/system/variables/secrets/default.nix
rename to modules/system/secrets/default.nix
diff --git a/modules/system/variables/default.nix b/modules/system/variables/default.nix
deleted file mode 100644
index df2682a..0000000
--- a/modules/system/variables/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./ips
-    ./secrets
-  ];
-}