From d5bfdd208c968c889d77b2113a5ff68a866e5d29 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Wed, 10 Jul 2024 14:19:12 +0300 Subject: [PATCH] Fix hyprland binding bug Signed-off-by: Nikolaos Karaolidis --- .../configs/console/home-manager/default.nix | 4 +- .../user/configs/console/persist/default.nix | 14 ++-- .../user/configs/gui/cliphist/default.nix | 4 +- .../user/configs/gui/hyprland/default.nix | 64 +++++++++---------- .../user/configs/gui/hyprshot/default.nix | 4 +- .../user/configs/gui/pipewire/default.nix | 8 +-- .../common/user/configs/gui/theme/default.nix | 4 +- 7 files changed, 49 insertions(+), 53 deletions(-) diff --git a/hosts/common/user/configs/console/home-manager/default.nix b/hosts/common/user/configs/console/home-manager/default.nix index 8d6a8ab..6ece68e 100644 --- a/hosts/common/user/configs/console/home-manager/default.nix +++ b/hosts/common/user/configs/console/home-manager/default.nix @@ -3,9 +3,7 @@ }: { config, inputs, ... }: { - imports = [ - inputs.home-manager.nixosModules.default - ]; + imports = [ inputs.home-manager.nixosModules.default ]; programs.dconf.enable = true; diff --git a/hosts/common/user/configs/console/persist/default.nix b/hosts/common/user/configs/console/persist/default.nix index 8c6e6d0..28a6caf 100644 --- a/hosts/common/user/configs/console/persist/default.nix +++ b/hosts/common/user/configs/console/persist/default.nix @@ -10,14 +10,12 @@ { programs.fuse.userAllowOther = true; - systemd.tmpfiles.rules = ( - [ - "d /persist/home 0755 root root -" - "d /cache/home 0755 root root -" - "d /persist${user.home} 0700 ${user.name} users -" - "d /cache${user.home} 0700 ${user.name} users -" - ] - ); + systemd.tmpfiles.rules = ([ + "d /persist/home 0755 root root -" + "d /cache/home 0755 root root -" + "d /persist${user.home} 0700 ${user.name} users -" + "d /cache${user.home} 0700 ${user.name} users -" + ]); home-manager.users.${user.name} = { imports = [ inputs.impermanence.nixosModules.home-manager.impermanence ]; diff --git a/hosts/common/user/configs/gui/cliphist/default.nix b/hosts/common/user/configs/gui/cliphist/default.nix index e619864..d49b8e6 100644 --- a/hosts/common/user/configs/gui/cliphist/default.nix +++ b/hosts/common/user/configs/gui/cliphist/default.nix @@ -30,8 +30,8 @@ in in [ "$mod, v, exec, ${cliphist} list | ${rofi} -cache-dir ${hmConfig.xdg.cacheHome}/rofi -dmenu -display-columns 2 | ${cliphist} decode | ${wl-copy}" - "$mod_CTRL, v, exec, ${cliphist} list | ${rofi} -cache-dir ${hmConfig.xdg.cacheHome}/rofi -dmenu -display-columns 2 | ${cliphist} delete" - "$mod_CTRL_SHIFT, v, exec, ${cliphist} wipe" + "$mod_Ctrl, v, exec, ${cliphist} list | ${rofi} -cache-dir ${hmConfig.xdg.cacheHome}/rofi -dmenu -display-columns 2 | ${cliphist} delete" + "$mod_Ctrl_Shift, v, exec, ${cliphist} wipe" ]; }; } diff --git a/hosts/common/user/configs/gui/hyprland/default.nix b/hosts/common/user/configs/gui/hyprland/default.nix index b085cf0..2743d1c 100644 --- a/hosts/common/user/configs/gui/hyprland/default.nix +++ b/hosts/common/user/configs/gui/hyprland/default.nix @@ -20,7 +20,7 @@ in enable = true; settings = { - "$mod" = "SUPER"; + "$mod" = "Super_L"; "$term" = lib.meta.getExe pkgs.kitty; bind = [ @@ -38,19 +38,19 @@ in "$mod, 9, workspace, 9" "$mod, 0, workspace, 10" - "$mod_SHIFT, `, movetoworkspacesilent, special" - "$mod_SHIFT, 1, movetoworkspacesilent, 1" - "$mod_SHIFT, 2, movetoworkspacesilent, 2" - "$mod_SHIFT, 3, movetoworkspacesilent, 3" - "$mod_SHIFT, 4, movetoworkspacesilent, 4" - "$mod_SHIFT, 5, movetoworkspacesilent, 5" - "$mod_SHIFT, 6, movetoworkspacesilent, 6" - "$mod_SHIFT, 7, movetoworkspacesilent, 7" - "$mod_SHIFT, 8, movetoworkspacesilent, 8" - "$mod_SHIFT, 9, movetoworkspacesilent, 9" - "$mod_SHIFT, 0, movetoworkspacesilent, 10" + "$mod_Shift, `, movetoworkspacesilent, special" + "$mod_Shift, 1, movetoworkspacesilent, 1" + "$mod_Shift, 2, movetoworkspacesilent, 2" + "$mod_Shift, 3, movetoworkspacesilent, 3" + "$mod_Shift, 4, movetoworkspacesilent, 4" + "$mod_Shift, 5, movetoworkspacesilent, 5" + "$mod_Shift, 6, movetoworkspacesilent, 6" + "$mod_Shift, 7, movetoworkspacesilent, 7" + "$mod_Shift, 8, movetoworkspacesilent, 8" + "$mod_Shift, 9, movetoworkspacesilent, 9" + "$mod_Shift, 0, movetoworkspacesilent, 10" - "$mod_CTRL, Space, workspaceopt, allfloat" + "$mod_Ctrl, Space, workspaceopt, allfloat" "$mod, left, movefocus, l" "$mod, h, movefocus, l" @@ -61,19 +61,19 @@ in "$mod, right, movefocus, r" "$mod, l, movefocus, r" - "$mod_SHIFT, left, movewindow, l" - "$mod_SHIFT, h, movewindow, l" - "$mod_SHIFT, down, movewindow, d" - "$mod_SHIFT, j, movewindow, d" - "$mod_SHIFT, up, movewindow, u" - "$mod_SHIFT, k, movewindow, u" - "$mod_SHIFT, right, movewindow, r" - "$mod_SHIFT, l, movewindow, r" + "$mod_Shift, left, movewindow, l" + "$mod_Shift, h, movewindow, l" + "$mod_Shift, down, movewindow, d" + "$mod_Shift, j, movewindow, d" + "$mod_Shift, up, movewindow, u" + "$mod_Shift, k, movewindow, u" + "$mod_Shift, right, movewindow, r" + "$mod_Shift, l, movewindow, r" "$mod, Tab, cyclenext" "$mod, Tab, bringactivetotop" - "$mod_SHIFT, Tab, cyclenext, prev" - "$mod_SHIFT, Tab, bringactivetotop" + "$mod_Shift, Tab, cyclenext, prev" + "$mod_Shift, Tab, bringactivetotop" "$mod, f, fullscreen, 0" "$mod, m, fullscreen, 1" @@ -82,18 +82,18 @@ in "$mod, Space, centerwindow" "$mod, q, killactive" - "CTRL_ALT, Delete, exit" + "Ctrl_Alt, Delete, exit" ]; binde = [ - "$mod_CTRL, left, resizeactive, -20 0" - "$mod_CTRL, h, resizeactive, -20 0" - "$mod_CTRL, down, resizeactive, 0 20" - "$mod_CTRL, j, resizeactive, 0 20" - "$mod_CTRL, up, resizeactive, 0 -20" - "$mod_CTRL, k, resizeactive, 0 -20" - "$mod_CTRL, right, resizeactive, 20 0" - "$mod_CTRL, l, resizeactive, 20 0" + "$mod_Ctrl, left, resizeactive, -20 0" + "$mod_Ctrl, h, resizeactive, -20 0" + "$mod_Ctrl, down, resizeactive, 0 20" + "$mod_Ctrl, j, resizeactive, 0 20" + "$mod_Ctrl, up, resizeactive, 0 -20" + "$mod_Ctrl, k, resizeactive, 0 -20" + "$mod_Ctrl, right, resizeactive, 20 0" + "$mod_Ctrl, l, resizeactive, 20 0" ]; bindm = [ diff --git a/hosts/common/user/configs/gui/hyprshot/default.nix b/hosts/common/user/configs/gui/hyprshot/default.nix index 5225b1e..8ccf89a 100644 --- a/hosts/common/user/configs/gui/hyprshot/default.nix +++ b/hosts/common/user/configs/gui/hyprshot/default.nix @@ -36,9 +36,9 @@ in in [ ", Print, exec, ${hyprshot} -m output -m active -f ${filename}" - "SHIFT, Print, exec, ${hyprshot} -m output -m active -f ${filename} -- ${swappyWrapper}" + "Shift, Print, exec, ${hyprshot} -m output -m active -f ${filename} -- ${swappyWrapper}" ", XF86SelectiveScreenshot, exec, ${hyprshot} -m region -z -f ${filename}" - "SHIFT, XF86SelectiveScreenshot, exec, ${hyprshot} -m region -z -f ${filename} -- ${swappyWrapper}" + "Shift, XF86SelectiveScreenshot, exec, ${hyprshot} -m region -z -f ${filename} -- ${swappyWrapper}" ]; }; } diff --git a/hosts/common/user/configs/gui/pipewire/default.nix b/hosts/common/user/configs/gui/pipewire/default.nix index 253a7a5..f1bcd4e 100644 --- a/hosts/common/user/configs/gui/pipewire/default.nix +++ b/hosts/common/user/configs/gui/pipewire/default.nix @@ -15,12 +15,12 @@ bindle = [ ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ -l 2.0 2%+" ", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ -l 2.0 2%-" - "CTRL, XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SOURCE@ -l 1.0 2%+" - "CTRL, XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SOURCE@ -l 1.0 2%-" + "Ctrl, XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SOURCE@ -l 1.0 2%+" + "Ctrl, XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SOURCE@ -l 1.0 2%-" ", XF86AudioNext, exec, ${playerctl} next" ", XF86AudioPrev, exec, ${playerctl} previous" - "CTRL, XF86AudioNext, exec, ${playerctl} position 10+" - "CTRL, XF86AudioPrev, exec, ${playerctl} position 10-" + "Ctrl, XF86AudioNext, exec, ${playerctl} position 10+" + "Ctrl, XF86AudioPrev, exec, ${playerctl} position 10-" ]; bindl = [ diff --git a/hosts/common/user/configs/gui/theme/default.nix b/hosts/common/user/configs/gui/theme/default.nix index 7272a9c..13173e8 100644 --- a/hosts/common/user/configs/gui/theme/default.nix +++ b/hosts/common/user/configs/gui/theme/default.nix @@ -19,8 +19,8 @@ in theme.enable = true; wayland.windowManager.hyprland.settings.bind = [ - "CTRL_ALT, r, exec, ${themeBin}" - "CTRL_ALT, t, exec, ${themeBin} toggle" + "Ctrl_Alt, r, exec, ${themeBin}" + "Ctrl_Alt, t, exec, ${themeBin} toggle" ]; home = {