diff --git a/home/base.nix b/home/base.nix new file mode 100644 index 0000000..3a1b576 --- /dev/null +++ b/home/base.nix @@ -0,0 +1,5 @@ +_: + +{ + imports = [ ./nixpkgs.nix ]; +} diff --git a/home/felschr-server.nix b/home/felschr-server.nix index 82c0de5..71414f5 100644 --- a/home/felschr-server.nix +++ b/home/felschr-server.nix @@ -7,6 +7,7 @@ { imports = [ + ./base.nix ./shell ./editors/lsp.nix ./editors/helix diff --git a/home/felschr-work.nix b/home/felschr-work.nix index 73e4003..ce4cb8f 100644 --- a/home/felschr-work.nix +++ b/home/felschr-work.nix @@ -3,6 +3,7 @@ with pkgs; { imports = [ + ./base.nix ./shell ./tailscale.nix ./editors diff --git a/home/felschr.nix b/home/felschr.nix index b0e32b0..95c4076 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -2,6 +2,7 @@ { imports = [ + ./base.nix ./shell ./tailscale.nix ./editors diff --git a/home/flake-module.nix b/home/flake-module.nix index f6b54ac..caee67c 100644 --- a/home/flake-module.nix +++ b/home/flake-module.nix @@ -16,15 +16,12 @@ let pkgs = self.pkgsFor system; extraSpecialArgs = { inherit inputs; }; - modules = - (with self.homeModules; [ nixpkgs ]) - ++ [ - { - home.username = user; - home.homeDirectory = "/home/${user}"; - } - ] - ++ modules; + modules = [ + { + home.username = user; + home.homeDirectory = "/home/${user}"; + } + ] ++ modules; }; in { @@ -32,7 +29,6 @@ in flake = { homeModules = { - nixpkgs = import ./modules/nixpkgs.nix; git = import ./modules/git.nix; firefox = import ./modules/firefox/firefox.nix; tor-browser = import ./modules/firefox/tor-browser.nix; diff --git a/home/modules/nixpkgs.nix b/home/nixpkgs.nix similarity index 100% rename from home/modules/nixpkgs.nix rename to home/nixpkgs.nix