diff --git a/flake.lock b/flake.lock index 5fd01a5..fb3a6f8 100644 --- a/flake.lock +++ b/flake.lock @@ -6,6 +6,7 @@ "flake-compat": [ "flake-compat" ], + "flake-parts": "flake-parts", "flake-utils": [ "flake-utils" ], @@ -17,11 +18,11 @@ ] }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -62,11 +63,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1724472190, - "narHash": "sha256-t1+LogHyWRUh89u2Xintc/kybDVJOe4OtxWcW2aeC3M=", + "lastModified": 1725467431, + "narHash": "sha256-eQLdO69XeRTLbUE00Zy2B1vOfclvo0+MPjMoyRQ2nbU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7e7335b5f870ece12ab5c3a8c6c095dddaa1e523", + "rev": "7386e62c38ffe9669431ec2addcb0f591b66a62f", "type": "gitlab" }, "original": { @@ -92,7 +93,10 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "attic", + "nixpkgs" + ] }, "locked": { "lastModified": 1722555600, @@ -108,6 +112,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -156,11 +178,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -176,11 +198,11 @@ ] }, "locked": { - "lastModified": 1722636442, - "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", + "lastModified": 1725276753, + "narHash": "sha256-kcV2M7xIoQvLRIrMndysM4E0d2zGSwIDejamT4LKnDg=", "owner": "hyprwm", "repo": "contrib", - "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", + "rev": "ae618eafa81b596db034c5df1d75d4eddf785824", "type": "github" }, "original": { @@ -189,28 +211,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "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-index-database": { "inputs": { "nixpkgs": [ @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", + "lastModified": 1725161148, + "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", + "rev": "32058e9138248874773630c846563b1a78ee7a5b", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723942470, - "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", + "lastModified": 1725152544, + "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251", + "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1724288137, - "narHash": "sha256-ZsDarezhjZ7kloarJlA2KxTrLHrLVUtLyYcXr/0wbCw=", + "lastModified": 1725497951, + "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0552f784af9f211481c5dda6df9b918733492826", + "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -293,11 +293,11 @@ "search": "search" }, "locked": { - "lastModified": 1723969476, - "narHash": "sha256-ln9SBqW8WAkvn/ilX//lISgLB08VgIgVxHXmfkb6jl4=", + "lastModified": 1725181790, + "narHash": "sha256-/Z49VwbQQjk4DCRtruSOvgGUVu7a96qpzLdeokoDoak=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "da5286bc062adee0e0aaf2bd3b784b477c623422", + "rev": "824522bf64bdb8366071613e93363750d9f354a8", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -324,23 +324,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { @@ -350,34 +350,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "system_tools", - "flake-utils" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "system_tools", - "nixpkgs" - ], - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1723343306, - "narHash": "sha256-/6sRkPq7/5weX2y0V8sQ29Sz35nt8kyj+BsFtkhgbJE=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "4a1c112ff0c67f496573dc345bd0b2247818fc29", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -392,11 +364,11 @@ ] }, "locked": { - "lastModified": 1724440431, - "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -410,7 +382,7 @@ "attic": "attic", "firefox-addons": "firefox-addons", "flake-compat": "flake-compat", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "home-manager": "home-manager", "hyprland-contrib": "hyprland-contrib", @@ -423,8 +395,7 @@ "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", - "system_tools": "system_tools", - "systems": "systems_2", + "systems": "systems", "wired-notify": "wired-notify" } }, @@ -435,11 +406,11 @@ ] }, "locked": { - "lastModified": 1724466314, - "narHash": "sha256-ltKuK6shQ64uej1mYNtBsDYxttUNFiv9AcHqk0+0NQM=", + "lastModified": 1725503082, + "narHash": "sha256-sgIkegun2+PwJEDHlvmADhSbxgjVR+8pYSMuXmB3/do=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b5b3edd96ef336b00622dcabc13788fdef9e3ca", + "rev": "17d3930e54a50df2afe52a2d1d1f506edb262bbe", "type": "github" }, "original": { @@ -460,11 +431,11 @@ ] }, "locked": { - "lastModified": 1723367906, - "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "owner": "nuschtos", "repo": "search", - "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "type": "github" }, "original": { @@ -483,11 +454,11 @@ ] }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725201042, + "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "type": "github" }, "original": { @@ -496,30 +467,6 @@ "type": "github" } }, - "system_tools": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1723392261, - "narHash": "sha256-Csa4yuYWcB3aLf7VP14v+Mp0lRzOOCCt9BdmAeeQcYU=", - "owner": "RAD-Development", - "repo": "system_tools", - "rev": "51bcc923b2b3cfb832b05687a01805c5a905b0c9", - "type": "github" - }, - "original": { - "owner": "RAD-Development", - "repo": "system_tools", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -530,44 +477,8 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "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" } }, diff --git a/flake.nix b/flake.nix index 2676282..98741e4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "NixOS configuration for RAD-Development Servers"; + description = "NixOS configuration for my machines"; nixConfig = { substituters = [ @@ -101,14 +101,6 @@ }; }; - system_tools = { - url = "github:RAD-Development/system_tools"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; - wired-notify = { url = "github:Toqozz/wired-notify"; inputs = { @@ -147,7 +139,7 @@ rec { inherit lib; # for allowing use of custom functions in nix repl - hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; }; + #hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; }; formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); nixosConfigurations = genSystems inputs outputs src (src + "/systems"); diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index 9c379c1..e50b014 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -28,7 +28,6 @@ git glances gpu-viewer - grapejuice grim htop hwloc diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index 6e43ebb..96f2b27 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -14,7 +14,6 @@ ./minio.nix ./networking.nix ./nextcloud.nix - ./services.nix ./zfs.nix ]; diff --git a/systems/palatine-hill/services.nix b/systems/palatine-hill/services.nix deleted file mode 100644 index 322400f..0000000 --- a/systems/palatine-hill/services.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - inputs, - pkgs, - ... -}: -{ - systemd = { - services.startup_validation = { - requires = [ "network-online.target" ]; - after = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - description = "validates startup"; - path = [ pkgs.zfs ]; - serviceConfig = { - Type = "oneshot"; - EnvironmentFile = config.sops.secrets."server-validation/webhook".path; - ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_palatine_hill"; - }; - }; - timers.startup_validation = { - wantedBy = [ "timers.target" ]; - timerConfig = { - OnBootSec = "10min"; - Unit = "startup_validation.service"; - }; - }; - }; - sops = { - secrets."server-validation/webhook".owner = "root"; - }; -}