renaming server_tools to system_tools

flake.lock

@@ -1,27 +1,5 @@
 {
   "nodes": {
-    "arch_mirror": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix"
-      },
-      "locked": {
-        "lastModified": 1722708775,
-        "narHash": "sha256-z+8+fB0/8G9ScnDmgHKzR6BMxuTiK8mu0HDdp2y0dqQ=",
-        "owner": "RichieCahill",
-        "repo": "arch_mirror",
-        "rev": "ce97f5f7e7382f6cb36e464c0f18a3177396990d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RichieCahill",
-        "repo": "arch_mirror",
-        "type": "github"
-      }
-    },
     "attic": {
       "inputs": {
         "crane": "crane",
@@ -131,24 +109,6 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": [
           "systems"
@@ -232,29 +192,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "arch_mirror",
+          "system_tools",
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1703863825,
-        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nix-github-actions_2": {
-      "inputs": {
-        "nixpkgs": [
-          "server_tools",
           "poetry2nix",
           "nixpkgs"
         ]
@@ -415,45 +353,17 @@
     "poetry2nix": {
       "inputs": {
         "flake-utils": [
-          "arch_mirror",
+          "system_tools",
           "flake-utils"
         ],
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
-          "arch_mirror",
+          "system_tools",
           "nixpkgs"
         ],
-        "systems": "systems_2",
+        "systems": "systems",
         "treefmt-nix": "treefmt-nix"
       },
-      "locked": {
-        "lastModified": 1722515463,
-        "narHash": "sha256-6FVPz1WzHak65xJQg8tRjVyFEWMesGxfskKaCxDUnRk=",
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "8c25e871bba3f472e1569bbf6c0f52dcc34bf2a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "type": "github"
-      }
-    },
-    "poetry2nix_2": {
-      "inputs": {
-        "flake-utils": [
-          "server_tools",
-          "flake-utils"
-        ],
-        "nix-github-actions": "nix-github-actions_2",
-        "nixpkgs": [
-          "server_tools",
-          "nixpkgs"
-        ],
-        "systems": "systems_3",
-        "treefmt-nix": "treefmt-nix_2"
-      },
       "locked": {
         "lastModified": 1721039874,
         "narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
@@ -497,12 +407,11 @@
     },
     "root": {
       "inputs": {
-        "arch_mirror": "arch_mirror",
         "attic": "attic",
         "firefox-addons": "firefox-addons",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "hyprland-contrib": "hyprland-contrib",
         "nix-index-database": "nix-index-database",
@@ -513,9 +422,9 @@
         "nixpkgs-stable": "nixpkgs-stable",
         "pre-commit-hooks": "pre-commit-hooks",
         "rust-overlay": "rust-overlay",
-        "server_tools": "server_tools",
         "sops-nix": "sops-nix",
-        "systems": "systems_4",
+        "system_tools": "system_tools",
+        "systems": "systems_2",
         "wired-notify": "wired-notify"
       }
     },
@@ -564,30 +473,6 @@
         "type": "github"
       }
     },
-    "server_tools": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix_2"
-      },
-      "locked": {
-        "lastModified": 1722726877,
-        "narHash": "sha256-VEfypyflLdxL3hjtURbpfRv9dyc3Z/CvvZ76bAad8l8=",
-        "owner": "RAD-Development",
-        "repo": "server_tools",
-        "rev": "16f24eddcb117c5560582c42c120ba84360c7f1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RAD-Development",
-        "repo": "server_tools",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -611,6 +496,30 @@
         "type": "github"
       }
     },
+    "system_tools": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix"
+      },
+      "locked": {
+        "lastModified": 1723383076,
+        "narHash": "sha256-kXqHASOixf8BiCpBWDGnRDU6mDLg30MPL1/LsCAPdrY=",
+        "owner": "RAD-Development",
+        "repo": "system_tools",
+        "rev": "f3b25c1afe934360e3d4e3327070f58ef78136eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RAD-Development",
+        "repo": "system_tools",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -621,40 +530,11 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "id": "systems",
-        "repo": "default",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "id": "systems",
-        "type": "indirect"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "id": "systems",
-        "type": "indirect"
-      }
-    },
-    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -672,29 +552,7 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "arch_mirror",
+          "system_tools",
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719749022,
-        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "server_tools",
           "poetry2nix",
           "nixpkgs"
         ]

flake.nix

@@ -29,11 +29,6 @@
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
     systems.url = "github:nix-systems/default";
 
-    arch_mirror = {
-      url = "github:RichieCahill/arch_mirror";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     attic = {
       url = "github:zhaofengli/attic";
       inputs = {
@@ -109,8 +104,8 @@
       };
     };
 
-    server_tools = {
+    system_tools = {
-      url = "github:RAD-Development/server_tools";
+      url = "github:RAD-Development/system_tools";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";

systems/jeeves-jr/arch_mirror.nix

@@ -23,7 +23,7 @@ in
     serviceConfig = {
       Environment = "MIRROR_DIR=${vars.main_mirror}/archlinux/";
       Type = "simple";
-      ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
+      ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/ ";
     };
   };
 }

systems/jeeves-jr/services.nix

@@ -15,7 +15,7 @@
       serviceConfig = {
         Type = "oneshot";
         EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
-        ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
+        ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeevesjr";
       };
     };
     timers.startup_validation = {

systems/jeeves/arch_mirror.nix

@@ -23,7 +23,7 @@ in
     serviceConfig = {
       Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
       Type = "simple";
-      ExecStart = "${inputs.arch_mirror.packages.x86_64-linux.default}/bin/sync_mirror";
+      ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
     };
   };
 }

systems/jeeves/services.nix

@@ -23,7 +23,7 @@
         serviceConfig = {
           EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
           Type = "oneshot";
-          ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
+          ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
         };
       };
     };

systems/palatine-hill/services.nix

@@ -15,7 +15,7 @@
       serviceConfig = {
         Type = "oneshot";
         EnvironmentFile = config.sops.secrets."server-validation/webhook".path;
-        ExecStart = "${inputs.server_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
+        ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill";
       };
     };
     timers.startup_validation = {

users/richie/home/programs.nix

@@ -43,7 +43,6 @@
     nix-prefetch
     nix-tree
     nixpkgs-fmt
-    inputs.server_tools.packages.x86_64-linux.default
+    inputs.system_tools.packages.x86_64-linux.default
-    inputs.arch_mirror.packages.x86_64-linux.default
   ];
 }