diff --git a/flake.lock b/flake.lock index 1ee93c9..152fbdc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": "home-manager", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1714136352, + "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "owner": "ryantm", + "repo": "agenix", + "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "ags": { "inputs": { "nixpkgs": "nixpkgs" @@ -43,7 +66,7 @@ "inputs": { "nixpkgs": "nixpkgs_2", "pnpm2nix": "pnpm2nix", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1714948152, @@ -259,7 +282,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -277,7 +300,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -295,7 +318,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -313,7 +336,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -331,7 +354,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1705309234, @@ -349,7 +372,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1685518550, @@ -410,6 +433,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -485,7 +529,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1713472482, @@ -507,7 +551,7 @@ "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", - "systems": "systems_5", + "systems": "systems_6", "xdph": "xdph" }, "locked": { @@ -559,7 +603,7 @@ "hypridle", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1713121246, @@ -981,7 +1025,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1714598496, @@ -999,11 +1043,12 @@ }, "root": { "inputs": { + "agenix": "agenix", "ags": "ags", "anyrun": "anyrun", "blog": "blog", "catppuccin": "catppuccin", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "home-manager_stable": "home-manager_stable", "hypridle": "hypridle", "hyprland": "hyprland", @@ -1015,7 +1060,7 @@ "nixpkgs_stable": "nixpkgs_stable", "rio-term": "rio-term", "spicetify-nix": "spicetify-nix", - "systems": "systems_12", + "systems": "systems_13", "waybar": "waybar" } }, @@ -1119,7 +1164,6 @@ } }, "systems_10": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1135,6 +1179,7 @@ } }, "systems_11": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1164,6 +1209,21 @@ "type": "github" } }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1181,16 +1241,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1226,16 +1286,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 8d9be14..4e102f2 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,9 @@ anyrun.url = "github:Kirottu/anyrun"; anyrun.inputs.nixpkgs.follows = "nixpkgs"; ags.url = "github:Aylur/ags"; + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.darwin.follows = ""; nixos-generators = { url = "github:nix-community/nixos-generators"; @@ -99,6 +102,7 @@ ./hosts/pluto/configuration.nix inputs.home-manager_stable.nixosModules.default inputs.blog.nixosModule + inputs.agenix.nixosModules.default ]; }; @@ -108,6 +112,7 @@ ./hosts/earth/configuration.nix inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.default + inputs.agenix.nixosModules.default ]; }; diff --git a/hosts/earth/configuration.nix b/hosts/earth/configuration.nix index b9d03b2..1178349 100644 --- a/hosts/earth/configuration.nix +++ b/hosts/earth/configuration.nix @@ -94,6 +94,7 @@ vesktop mangohud transmission_4 + inputs.agenix.packages.${pkgs.system}.agenix ]; hardware.nvidia = { diff --git a/hosts/pluto/configuration.nix b/hosts/pluto/configuration.nix index 091ec96..8ec5cc0 100644 --- a/hosts/pluto/configuration.nix +++ b/hosts/pluto/configuration.nix @@ -15,6 +15,7 @@ ./services/nginx.nix ./services/mirror.nix ./services/pterodactyl.nix + ./services/gitlab.nix ]; # Bootloader. @@ -56,6 +57,8 @@ programs.mosh.enable = true; + environment.systemPackages = [inputs.agenix.packages.${pkgs.system}.agenix]; + users.mutableUsers = false; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.zack = { diff --git a/hosts/pluto/services/gitlab.nix b/hosts/pluto/services/gitlab.nix new file mode 100644 index 0000000..f9aa997 --- /dev/null +++ b/hosts/pluto/services/gitlab.nix @@ -0,0 +1,4 @@ +{ + services.gitlab = { + }; +}