diff --git a/flake.lock b/flake.lock index 660bd68..c7e1369 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,30 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -112,6 +137,7 @@ }, "root": { "inputs": { + "agenix": "agenix", "disko": "disko", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", @@ -119,6 +145,21 @@ "nixpkgs": "nixpkgs", "plasma-manager": "plasma-manager" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4ece566..8ed1738 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,19 @@ plasma-manager = { url = "github:nix-community/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; + + agenix = { + url = "github:ryantm/agenix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + darwin.follows = ""; + }; }; }; diff --git a/hosts/base/default.nix b/hosts/base/default.nix index 18f5b73..f031b31 100644 --- a/hosts/base/default.nix +++ b/hosts/base/default.nix @@ -13,6 +13,11 @@ imports = [ inputs.home-manager.nixosModules.home-manager inputs.nix-flatpak.nixosModules.nix-flatpak + inputs.agenix.nixosModules.default + ]; + + environment.systemPackages = [ + inputs.agenix.packages.x86_64-linux.default ]; # Bootloader. @@ -147,6 +152,7 @@ nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" ]; registry.nixpkgs.flake = inputs.nixpkgs; }; + home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/packages/uv/default.nix b/packages/uv/default.nix index 922b0c5..999dcc4 100644 --- a/packages/uv/default.nix +++ b/packages/uv/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "uv-bin"; - version = "0.5.8"; + version = "0.5.13"; src = fetchTarball { url = "https://github.com/astral-sh/uv/releases/download/${version}/uv-x86_64-unknown-linux-gnu.tar.gz"; - sha256 = "1akyn28x8hgyi9l588vcscs7z72g8zhgia1h2jr5d3rrjdnxssrh"; + sha256 = "0ks9i16yhg58k8489d799bixx84qvhy0q7b8la9sfrsbshakbc9q"; }; nativeBuildInputs = [