diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 9b2f3a5..3cbf701 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, ... }: { imports = [ - ./hyprland.nix + ./wm/hyprland.nix ./terminal ./lf ./webapps.nix diff --git a/modules/home-manager/wm/default.nix b/modules/home-manager/wm/default.nix new file mode 100644 index 0000000..cb79b22 --- /dev/null +++ b/modules/home-manager/wm/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./hyprland.nix + ]; +} diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/wm/hyprland.nix similarity index 65% rename from modules/home-manager/hyprland.nix rename to modules/home-manager/wm/hyprland.nix index e74b21f..a2f61dd 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/wm/hyprland.nix @@ -8,11 +8,11 @@ in home.file = lib.mkMerge [ { ".config/mako/config" = { - source = builtins.toPath ../../dotfiles/mako/config; + source = builtins.toPath ../../../dotfiles/mako/config; force = true; }; ".config/wofi" = { - source = builtins.toPath ../../dotfiles/wofi; + source = builtins.toPath ../../../dotfiles/wofi; recursive = true; force = true; }; @@ -20,17 +20,17 @@ in (mkIf smayzy.desktop.enable { ".config/hypr" = { - source = builtins.toPath ../../dotfiles/hypr-desk; + source = builtins.toPath ../../../dotfiles/hypr-desk; recursive = true; force = true; }; ".config/waybar" = { - source = builtins.toPath ../../dotfiles/waybar-desk; + source = builtins.toPath ../../../dotfiles/waybar-desk; recursive = true; force = true; }; ".config/wlogout" = { - source = builtins.toPath ../../dotfiles/wlogout-desk; + source = builtins.toPath ../../../dotfiles/wlogout-desk; recursive = true; force = true; }; @@ -38,17 +38,17 @@ in (mkIf smayzy.laptop.enable { ".config/hypr" = { - source = builtins.toPath ../../dotfiles/hypr-lap; + source = builtins.toPath ../../../dotfiles/hypr-lap; recursive = true; force = true; }; ".config/waybar" = { - source = builtins.toPath ../../dotfiles/waybar-lap; + source = builtins.toPath ../../../dotfiles/waybar-lap; recursive = true; force = true; }; ".config/wlogout" = { - source = builtins.toPath ../../dotfiles/wlogout-lap; + source = builtins.toPath ../../../dotfiles/wlogout-lap; recursive = true; force = true; };