More flake changes

This commit is contained in:
Charlotte Van Petegem 2021-03-24 18:18:05 +01:00
parent 5ea086db7e
commit 17a4f0a7a1
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 19 additions and 15 deletions

View file

@ -8,7 +8,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
utils.url = "github:chvp/flake-utils-plus/master";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/staging";
};
outputs = inputs@{ self, nixpkgs, emacs-overlay, home-manager, utils }: utils.lib.systemFlake {
@ -17,17 +17,21 @@
input = nixpkgs;
patches = [ ];
};
sharedOverlays = [ emacs-overlay.overlay ];
sharedModules = [
({ nixpkgs.overlays = [ emacs-overlay.overlay ]; })
({ lib, ... }: {
environment.etc = lib.mapAttrs' (key: val: { name = "channels/${key}"; value = { source = val.outPath; }; }) inputs;
nix.nixPath = [ "/etc/channels" ];
})
utils.nixosModules.saneFlakeDefaults
home-manager.nixosModules.home-manager
./modules
];
nixosProfiles = {
kharbranth = { system = "x86_64-linux"; modules = [ ./machines/kharbranth ]; };
kholinar = { system = "x86_64-linux"; modules = [ ./machines/kholinar ]; };
lasting-integrity = { system = "x86_64-linux"; modules = [ ./machines/lasting-integrity ]; };
urithiru = { system = "x86_64-linux"; modules = [ ./machines/urithiru ]; };
kharbranth = { modules = [ ./machines/kharbranth ]; };
kholinar = { modules = [ ./machines/kholinar ]; };
lasting-integrity = { modules = [ ./machines/lasting-integrity ]; };
urithiru = { modules = [ ./machines/urithiru ]; };
};
devShellBuilder = channels:
let pkgs = channels.nixpkgs; in pkgs.mkShell { buildInputs = [ pkgs.nixpkgs-fmt ]; };