diff options
| author | Soispha <soispha@vhack.eu> | 2024-02-24 14:59:50 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-02-24 15:04:49 +0100 |
| commit | 8284b6a7b4d212913083b003a819fda8d4931d4d (patch) | |
| tree | 1a41cb60fe64f3f9b1a8c33bd2895ad419366cb5 /flake | |
| parent | fix(hm/pkgs/git-update-index): Remove '--' from help text (diff) | |
| download | nixos-config-8284b6a7b4d212913083b003a819fda8d4931d4d.tar.gz nixos-config-8284b6a7b4d212913083b003a819fda8d4931d4d.zip | |
refactor(hm/pkgs): Implement with an nixpkgs overlay
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 22 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | flake/default.nix | 5 |
3 files changed, 16 insertions, 13 deletions
diff --git a/flake.lock b/flake.lock index 6dce546b..ef3a4b18 100644 --- a/flake.lock +++ b/flake.lock @@ -172,15 +172,12 @@ "flake_version_update": { "inputs": { "flake-utils": [ - "shell_library", "flake-utils" ], "nixpkgs": [ - "shell_library", "nixpkgs" ], "systems": [ - "shell_library", "systems" ] }, @@ -638,6 +635,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "flake_version_update": "flake_version_update", "generate_firefox_extensions": "generate_firefox_extensions", "gitignore": "gitignore", "haumea": "haumea", @@ -673,11 +671,11 @@ ] }, "locked": { - "lastModified": 1708654230, - "narHash": "sha256-f8B3nm0DIsWBmaLHvFvjJnqvFsEEoHxTjE9or5w4nIo=", + "lastModified": 1708740535, + "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "67853eda5dfe64922b9deb0ebc246a846fe177c7", + "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", "type": "github" }, "original": { @@ -726,7 +724,9 @@ "flake-utils": [ "flake-utils" ], - "flake_version_update": "flake_version_update", + "flake_version_update": [ + "flake_version_update" + ], "nixpkgs": [ "nixpkgs" ], @@ -735,11 +735,11 @@ ] }, "locked": { - "lastModified": 1705180069, - "narHash": "sha256-kEdWgKIL2wGY7jBYX9Z+YX67bQc+oKLkgnxBkHjji+M=", + "lastModified": 1708780295, + "narHash": "sha256-ZL4lwJeKNjmvm/mg3KRy3+OyUYxZTl1eJNRmEqHzNhQ=", "ref": "refs/heads/prime", - "rev": "d2bc174f248de40ab76068e6ad502a785be0b074", - "revCount": 168, + "rev": "3faa1f33598be74ca1bdad621c5b66d153be0e3d", + "revCount": 175, "type": "git", "url": "https://codeberg.org/soispha/shell_library.git" }, diff --git a/flake.nix b/flake.nix index fed79c78..9a504a4e 100644 --- a/flake.nix +++ b/flake.nix @@ -250,6 +250,8 @@ pkgs = import nixpkgs (import ./sys/nixpkgs { inherit (nixpkgs) lib; inherit system sysLib; + # FIXME: Don't unconditionally use tiamat here <2024-02-24> + config = self.nixosConfigurations.tiamat.config.home-manager.users.soispha; overlays = []; }); # FIXME: this `nixpkgs` misses the configs applied to the other one diff --git a/flake/default.nix b/flake/default.nix index bbf9044e..185286eb 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -140,7 +140,7 @@ }; } ); -in { + nixosConfigurations = import ./nixosConfigurations { inherit system @@ -152,7 +152,8 @@ in { defaultSpecialArgs ; }; - inherit pkgs; +in { + inherit pkgs nixosConfigurations; checks."${system}" = { inherit (self.packages."${system}") |