diff --git a/flake.lock b/flake.lock index 8416aed..7add483 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,8 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "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_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1714402202, @@ -62,9 +41,9 @@ }, "blog": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pnpm2nix": "pnpm2nix", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1714940344, @@ -128,28 +107,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -302,7 +259,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -320,7 +277,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -338,7 +295,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -356,7 +313,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -374,7 +331,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1705309234, @@ -392,7 +349,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1685518550, @@ -453,27 +410,6 @@ } }, "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" @@ -549,7 +485,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1713472482, @@ -570,8 +506,8 @@ "hyprcursor": "hyprcursor", "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", - "systems": "systems_6", + "nixpkgs": "nixpkgs_4", + "systems": "systems_5", "xdph": "xdph" }, "locked": { @@ -623,7 +559,7 @@ "hypridle", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1713121246, @@ -828,11 +764,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -877,22 +813,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -908,7 +828,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -924,7 +844,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", @@ -940,7 +860,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -956,7 +876,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1714763106, "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", @@ -972,7 +892,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1007,7 +927,7 @@ "pnpm2nix": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1706694632, @@ -1061,7 +981,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1714598496, @@ -1079,12 +999,11 @@ }, "root": { "inputs": { - "agenix": "agenix", "ags": "ags", "anyrun": "anyrun", "blog": "blog", "catppuccin": "catppuccin", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager_stable": "home-manager_stable", "hypridle": "hypridle", "hyprland": "hyprland", @@ -1092,18 +1011,18 @@ "lanzaboote": "lanzaboote", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs_stable": "nixpkgs_stable", "rio-term": "rio-term", "spicetify-nix": "spicetify-nix", - "systems": "systems_13", + "systems": "systems_12", "waybar": "waybar" } }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1709259239, @@ -1147,7 +1066,7 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1714097613, @@ -1200,21 +1119,6 @@ } }, "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { "flake": false, "locked": { "lastModified": 1681028828, @@ -1230,7 +1134,7 @@ "type": "github" } }, - "systems_12": { + "systems_11": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1245,7 +1149,7 @@ "type": "github" } }, - "systems_13": { + "systems_12": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1277,16 +1181,16 @@ }, "systems_3": { "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" } }, @@ -1322,16 +1226,16 @@ }, "systems_6": { "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" } }, diff --git a/flake.nix b/flake.nix index 63b8eb0..8d9be14 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-23.11"; - agenix.url = "github:ryantm/agenix"; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -101,7 +99,6 @@ ./hosts/pluto/configuration.nix inputs.home-manager_stable.nixosModules.default inputs.blog.nixosModule - inputs.agenix.nixosModule.default ]; }; @@ -111,7 +108,6 @@ ./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 fcfcc4c..b9d03b2 100644 --- a/hosts/earth/configuration.nix +++ b/hosts/earth/configuration.nix @@ -82,9 +82,10 @@ extraGroups = ["users"]; }; - services.openssh = { - enable = true; - }; + # services.openssh = { + # enable = true; + # PasswordAuthentication = true; + # }; environment.systemPackages = with pkgs; [ alvr @@ -93,7 +94,6 @@ vesktop mangohud transmission_4 - inputs.agenix.packages.${pkgs.system}.default ]; hardware.nvidia = { diff --git a/hosts/pluto/configuration.nix b/hosts/pluto/configuration.nix index 2532afc..091ec96 100644 --- a/hosts/pluto/configuration.nix +++ b/hosts/pluto/configuration.nix @@ -63,16 +63,13 @@ description = "zack"; extraGroups = ["networkmanager" "wheel" "docker"]; shell = pkgs.zsh; + packages = with pkgs; []; hashedPassword = "$6$rounds=2000000$673Iz4rM8Dr9yz7C$Xq5JXxE7ioUrpZmMf3uTrPN2ODrEu3Sph6EhWyPoM5Ty./FhgB9hU0mz1yYo8sUj7wdUMWfR98haVJ24Wv3BK/"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICuUA9KTvcZ+ZTEO90y6VcmQyuwL30I2mOGsm8GZn7BF zack@mars" ]; }; - environment.systemPackages = [ - inputs.agenix.packages.${pkgs.system}.default - ]; - users.users.alfie = { isNormalUser = true; description = "alfie";