qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

nix, home-manager: move common config out of flake.nix

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-09-18 19:38:20 +01:00
parent a47d1f47e8
commit e713fe3b2c
4 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/default.nix
View file

@ -6,6 +6,7 @@
./environment.nix ./environment.nix
./home-manager.nix ./home-manager.nix
./nginx.nix ./nginx.nix
./nix.nix
./openssh.nix ./openssh.nix
./security.nix ./security.nix
./steam.nix ./steam.nix

7
common/nix.nix Normal file
View file

@ -0,0 +1,7 @@
{ config, lib, pkgs, ... }:
{
nix.settings.experimental-features = "nix-command flakes";
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
nixpkgs.config.allowUnfree = true;
}

4
common/users/qenya.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, ... }:
let keys = import ../../keys.nix; let keys = import ../../keys.nix;
in { in {
@ -11,4 +11,6 @@ in {
}; };
programs.zsh.enable = true; programs.zsh.enable = true;
home-manager.users."qenya" = inputs.self.homeManagerModules."qenya";
} }

32
flake.nix
View file

@ -34,27 +34,6 @@
}; };
outputs = inputs@{ self, nixpkgs, nixpkgsSmall, home-manager, plasma-manager, nur, agenix, colmena, birdsong, ... }: { outputs = inputs@{ self, nixpkgs, nixpkgsSmall, home-manager, plasma-manager, nur, agenix, colmena, birdsong, ... }: {
nixosModules.default = {
nix.settings.experimental-features = "nix-command flakes";
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nur.overlay ];
# TODO: make this or something like it work without infinite recursion
# home-manager.users."qenya" = lib.mkIf (config.users.users ? "qenya") self.homeManagerModules."qenya";
home-manager.users."qenya" = self.homeManagerModules."qenya";
imports = [
home-manager.nixosModules.home-manager
nur.nixosModules.nur
agenix.nixosModules.default
birdsong.nixosModules.default
./common
./services
];
};
nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes; nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes;
# The name of this output type is not standardised. I have picked # The name of this output type is not standardised. I have picked
@ -85,7 +64,16 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
defaults.imports = [ self.nixosModules.default ]; defaults.imports = [
home-manager.nixosModules.home-manager
nur.nixosModules.nur
{ nixpkgs.overlays = [ nur.overlay ]; }
agenix.nixosModules.default
birdsong.nixosModules.default
./common
./services
];
kilgharrah.imports = [ ./hosts/kilgharrah ]; kilgharrah.imports = [ ./hosts/kilgharrah ];
tohru.imports = [ ./hosts/tohru ]; tohru.imports = [ ./hosts/tohru ];
yevaud.imports = [ ./hosts/yevaud ]; yevaud.imports = [ ./hosts/yevaud ];