nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hosts: simplify imports with self

Browse source
This commit is contained in:
Anthony Rodriguez 2024-12-30 23:44:07 +01:00
parent 944c99f873
commit b5986f0c33
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -23,7 +23,7 @@
}; };
}); });
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper); formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
nixosConfigurations = import ./hosts {inherit inputs;}; nixosConfigurations = import ./hosts {inherit self inputs;};
packages = eachSystem (pkgs: import ./shared/pkgs {inherit inputs pkgs;}); packages = eachSystem (pkgs: import ./shared/pkgs {inherit inputs pkgs;});
deploy.nodes = import ./nodes.nix {inherit inputs;}; deploy.nodes = import ./nodes.nix {inherit inputs;};
checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;

64
hosts/default.nix
View file

@ -1,4 +1,8 @@
{inputs, ...}: let {
self,
inputs,
...
}: let
lib' = import ../shared/lib inputs.nixpkgs.lib; lib' = import ../shared/lib inputs.nixpkgs.lib;
mkSystem = args: mkSystem = args:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
@ -7,12 +11,12 @@
}; };
base = [ base = [
../config/nixos "${self}/config/nixos"
../config/nixos/core/home-manager.nix "${self}/config/nixos/core/home-manager.nix"
../config/nixos/services/documentation.nix "${self}/config/nixos/services/documentation.nix"
../config/nixos/services/location.nix "${self}/config/nixos/services/location.nix"
({ ({
config, config,
@ -21,10 +25,10 @@
}: { }: {
home-manager = { home-manager = {
users.${config.local.systemVars.username}.imports = [ users.${config.local.systemVars.username}.imports = [
../config/home-manager "${self}/config/home-manager"
../config/home-manager/services/udiskie.nix "${self}/config/home-manager/services/udiskie.nix"
../config/home-manager/services/syncthing.nix "${self}/config/home-manager/services/syncthing.nix"
]; ];
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
@ -33,22 +37,22 @@
]; ];
graphical = [ graphical = [
../config/nixos/services/logind.nix "${self}/config/nixos/services/logind.nix"
../config/nixos/services/greetd.nix "${self}/config/nixos/services/greetd.nix"
../config/nixos/programs/hyprland.nix "${self}/config/nixos/programs/hyprland.nix"
../config/nixos/services/gnome.nix "${self}/config/nixos/services/gnome.nix"
({config, ...}: { ({config, ...}: {
home-manager.users.${config.local.systemVars.username}.imports = [ home-manager.users.${config.local.systemVars.username}.imports = [
../config/home-manager/programs/waybar "${self}/config/home-manager/programs/waybar"
../config/home-manager/programs/fuzzel.nix "${self}/config/home-manager/programs/fuzzel.nix"
../config/home-manager/programs/hypr "${self}/config/home-manager/programs/hypr"
../config/home-manager/programs/wlogout.nix "${self}/config/home-manager/programs/wlogout.nix"
../config/home-manager/services/swaync "${self}/config/home-manager/services/swaync"
../config/home-manager/terminal/emulators/foot.nix "${self}/config/home-manager/terminal/emulators/foot.nix"
../config/home-manager/services/gammastep.nix "${self}/config/home-manager/services/gammastep.nix"
]; ];
}) })
]; ];
@ -57,21 +61,21 @@
../config/nixos/programs/games.nix ../config/nixos/programs/games.nix
({config, ...}: { ({config, ...}: {
home-manager.users.${config.local.systemVars.username}.imports = [ home-manager.users.${config.local.systemVars.username}.imports = [
../config/home-manager/programs/games "${self}/config/home-manager/programs/games"
../config/home-manager/services/flatpak.nix "${self}/config/home-manager/services/flatpak.nix"
]; ];
}) })
]; ];
laptop = [ laptop = [
../config/nixos/core/lanzaboote.nix "${self}/config/nixos/core/lanzaboote.nix"
../config/nixos/hardware/fprintd.nix "${self}/config/nixos/hardware/fprintd.nix"
../config/nixos/services/kanata.nix "${self}/config/nixos/services/kanata.nix"
../config/nixos/services/power.nix "${self}/config/nixos/services/power.nix"
../config/nixos/services/brightness.nix "${self}/config/nixos/services/brightness.nix"
../config/nixos/hardware/mcuxpresso.nix "${self}/config/nixos/hardware/mcuxpresso.nix"
]; ];
in { in {
vamos = mkSystem { vamos = mkSystem {
@ -99,9 +103,9 @@ in {
modules = [ modules = [
./anastacia ./anastacia
../config/nixos/services/forgejo.nix "${self}/config/nixos/services/forgejo.nix"
../config/nixos/services/searx.nix "${self}/config/nixos/services/searx.nix"
../config/nixos/services/portfolio.nix "${self}/config/nixos/services/portfolio.nix"
]; ];
}; };
} }