voronind/nix
0
0
Fork 0
Code Issues 40 Pull requests Packages Projects Releases Wiki Activity

Revert HM module import.

Browse source
This commit is contained in:
Dmitry Voronin 2024-09-30 13:14:00 +03:00
parent 75db7243e7
commit 64caf26c18
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.nix
View file

@ -172,14 +172,14 @@
# HM config. # HM config.
./home/NixOs.nix ./home/NixOs.nix
] ++ ]
modules ++ ++ modules
(self.findFiles ./host/${system}/${hostname}) ++ ++ (self.findFiles ./host/${system}/${hostname})
(self.findFiles ./config) ++ ++ (self.findFiles ./config)
(self.findFiles ./container) ++ ++ (self.findFiles ./container)
(self.findFiles ./module) ++ ++ (self.findFiles ./module)
(self.findFiles ./system) ++ ++ (self.findFiles ./system)
(self.findFiles ./overlay); ++ (self.findFiles ./overlay);
# SpecialArgs allows you to pass objects down to other NixOS modules. # SpecialArgs allows you to pass objects down to other NixOS modules.
specialArgs = let specialArgs = let
@ -258,10 +258,9 @@
{ nix.settings.experimental-features = [ "nix-command " "flakes" ]; } { nix.settings.experimental-features = [ "nix-command " "flakes" ]; }
inputs.stylix.homeManagerModules.stylix inputs.stylix.homeManagerModules.stylix
] ++ ]
modules ++ ++ modules
(self.findFiles ./config) ++ ++ (self.findFiles ./config);
(self.findFiles ./module);
}; };
}; };
@ -305,8 +304,7 @@
inherit (self) __findFile; inherit (self) __findFile;
inherit lib pkgs; inherit lib pkgs;
}) })
] ++ ];
(self.findFiles ./module);
# SpecialArgs allows you to pass objects down to other configuration. # SpecialArgs allows you to pass objects down to other configuration.
extraSpecialArgs = { extraSpecialArgs = {

2
home/config/sway/default.nix
View file

@ -27,6 +27,6 @@ in {
text = (util.trimTabs '' text = (util.trimTabs ''
# Read `man 5 sway` for a complete reference. # Read `man 5 sway` for a complete reference.
include /etc/sway/config.d/* include /etc/sway/config.d/*
'') + swayRc + config.module.desktop.sway.extraConfig; '') + swayRc + config.module.desktop.sway.extraConfig or "";
} }