kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

removed attr from hypr

Browse Source
This commit is contained in:
kenji
2025-08-20 13:54:48 -05:00
parent c5bb2bf66f
commit 76edab5b1c
5 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/desktop/desktop.nix
+12 -10
View File
@@ -17,16 +17,20 @@ in {
xwayland.enable = true;
systemd.enable = true;
settings = lib.mkMerge [
(import ./hyprland/hypr/keybinds.nix {inherit config pkgs;})
(import ./hyprland/hypr/exec.nix {inherit config pkgs;})
(import ./hyprland/hypr/rules.nix {inherit config pkgs;})
(import ./hyprland/hypr/env.nix {inherit config pkgs;})
(import ./hyprland/hypr/colours.nix {inherit config pkgs;})
];
settings = lib.mkIf cfg.settings.hyprland.useNixForConf (
lib.mkMerge [
# These imports must be functions that return an attribute set.
(import ./hyprland/hypr/keybinds.nix {inherit config pkgs;})
(import ./hyprland/hypr/exec.nix {inherit config pkgs;})
(import ./hyprland/hypr/rules.nix {inherit config pkgs;})
(import ./hyprland/hypr/env.nix {inherit config pkgs;})
(import ./hyprland/hypr/colours.nix {inherit config pkgs;})
]
);
};
home.file = lib.mkMerge [
# The home.file configuration is now split into two mutually exclusive blocks.
(lib.mkIf cfg.settings.hyprland.useNixForConf {
".config/hypr/scripts" = {
source = builtins.path {
@@ -41,8 +45,6 @@ in {
path = ../../.config/hypr;
};
};
})
{
".config/quickshell".source = builtins.path {path = ../../.config/quickshell;};
".config/kitty".source = builtins.path {path = ../../.config/kitty;};
".config/foot".source = builtins.path {path = ../../.config/foot;};
@@ -52,7 +54,7 @@ in {
".config/wlogout".source = builtins.path {path = ../../.config/wlogout;};
".config/Kvantum".source = builtins.path {path = ../../.config/Kvantum;};
".config/xdg-desktop-portal".source = builtins.path {path = ../../.config/xdg-desktop-portal;};
}
})
];
home.packages =