diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index e9912e7..3c3e972 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,13 +6,13 @@ zls, ... }: let - shared-programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;}; + shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib;}; in { home = { stateVersion = "23.05"; # Please read the comment before changing. packages = with pkgs; let - shared-packages = import ../shared/packages.nix {inherit pkgs;}; + shared-packages = import ../../modules/shared/packages.nix {inherit pkgs;}; in shared-packages ++ [ diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 24651f3..8b91846 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -6,7 +6,7 @@ userSettings, ... }: { - programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib userSettings;}; + programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings;}; home = { inherit (userSettings) username; @@ -14,7 +14,7 @@ # shell = pkgs.fish; stateVersion = "23.05"; # Please read the comment before changing. - packages = pkgs.callPackage ../shared/packages.nix {}; + packages = pkgs.callPackage ../../modules/shared/packages.nix {}; sessionPath = [ "$HOME/.emacs.d/bin" diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix deleted file mode 100644 index 4d18f17..0000000 --- a/modules/shared/home-manager.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - -} diff --git a/hosts/shared/home-programs.nix b/modules/shared/homeManagerPrograms.nix similarity index 100% rename from hosts/shared/home-programs.nix rename to modules/shared/homeManagerPrograms.nix diff --git a/hosts/shared/packages.nix b/modules/shared/packages.nix similarity index 100% rename from hosts/shared/packages.nix rename to modules/shared/packages.nix