This commit is contained in:
LunarAkai 2025-03-14 23:35:36 +01:00
commit c8d762ee59
3 changed files with 16 additions and 33 deletions

17
flake.lock generated
View file

@ -118,8 +118,7 @@
"alejandra": "alejandra", "alejandra": "alejandra",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable"
"systems": "systems"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -138,20 +137,6 @@
"repo": "rust-analyzer", "repo": "rust-analyzer",
"type": "github" "type": "github"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -16,25 +16,13 @@
outputs = { outputs = {
self, self,
nixpkgs,
home-manager,
systems,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; myLib = import ./myLib/default.nix {inherit self inputs;};
in
with myLib; {
inherit lib;
# copied from https://github.com/Misterio77/nix-config/blob/main/flake.nix
lib = nixpkgs.lib // home-manager.lib;
forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
pkgsFor = lib.genAttrs (import systems) (
system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
}
);
in {
with myLib;
formatter = forEachSystem (pkgs: pkgs.alejandra); formatter = forEachSystem (pkgs: pkgs.alejandra);
homeManagerModules.default = ./modules/home-manager; homeManagerModules.default = ./modules/home-manager;

View file

@ -1,7 +1,17 @@
{inputs}: let {inputs, nixpkgs, home-manager, systems }: let
myLib = (import ./default.nix) {inherit inputs;}; myLib = (import ./default.nix) {inherit inputs;};
outputs = inputs.self.outputs; outputs = inputs.self.outputs;
in rec { in rec {
# copied from https://github.com/Misterio77/nix-config/blob/main/flake.nix
lib = nixpkgs.lib // home-manager.lib;
forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
pkgsFor = lib.genAttrs (import systems) (
system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
}
);
mkSystem = config: mkSystem = config:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {