diff --git a/modules/home.nix b/home/default.nix similarity index 95% rename from modules/home.nix rename to home/default.nix index 67dee7d..c52ce46 100644 --- a/modules/home.nix +++ b/home/default.nix @@ -6,11 +6,11 @@ }: let concatAttrVals = attrSet: lib.concatMap (x: x) (lib.attrValues attrSet); - tools = import ./tools.nix { + tools = import ../modules/tools.nix { inherit pkgs; inherit emacs-larstvei; }; - languages = import ./languages.nix { inherit pkgs; }; + languages = import ../modules/languages.nix { inherit pkgs; }; in { home.packages = concatAttrVals languages ++ concatAttrVals tools; diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index 178735b..14e6723 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -9,6 +9,6 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { inherit emacs-larstvei; }; - users.larstvei.imports = [ ../../modules/home.nix ]; + users.larstvei.imports = [ ../../home ]; }; }