diff --git a/modules/hyprland/60p.conf b/modules/hyprland/60p.conf deleted file mode 100644 index 029e0ee..0000000 --- a/modules/hyprland/60p.conf +++ /dev/null @@ -1,28 +0,0 @@ -bind = $mod+CONTROL, 1, workspace, 11 -bind = $mod+CONTROL, 2, workspace, 12 -bind = $mod+CONTROL, 3, workspace, 13 -bind = $mod+CONTROL, 4, workspace, 14 -bind = $mod+CONTROL, 5, workspace, 15 -bind = $mod+CONTROL, 6, workspace, 16 -bind = $mod+CONTROL, 7, workspace, 17 -bind = $mod+CONTROL, 8, workspace, 18 -bind = $mod+CONTROL, 9, workspace, 19 -bind = $mod+CONTROL, 0, workspace, 20 - -bind = $mod+CONTROL+SHIFT, 1, hy3:movetoworkspace, 11 -bind = $mod+CONTROL+SHIFT, 2, hy3:movetoworkspace, 12 -bind = $mod+CONTROL+SHIFT, 3, hy3:movetoworkspace, 13 -bind = $mod+CONTROL+SHIFT, 4, hy3:movetoworkspace, 14 -bind = $mod+CONTROL+SHIFT, 5, hy3:movetoworkspace, 15 -bind = $mod+CONTROL+SHIFT, 6, hy3:movetoworkspace, 16 -bind = $mod+CONTROL+SHIFT, 7, hy3:movetoworkspace, 17 -bind = $mod+CONTROL+SHIFT, 8, hy3:movetoworkspace, 18 -bind = $mod+CONTROL+SHIFT, 9, hy3:movetoworkspace, 19 -bind = $mod+CONTROL+SHIFT, 0, hy3:movetoworkspace, 20 - - -bind = ,F7, exec, qs -c shell ipc call mpris playPause -bind = ,F6, exec, qs -c shell ipc call mpris next -bind = ,F5, exec, qs -c shell ipc call mpris previous - -bind = $mod, escape, exec, $launcher \ No newline at end of file diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index db53c9c..e2a95b0 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -154,7 +154,7 @@ windowrulev2 = float, title:^(Unlock Database - KeePassXC)$ windowrulev2 = float, class:^(AlacrittyFloating)$ $mod = SUPER -$launcher = qs -c shell ipc call launcher open +$launcher = qs msg -c shell launcher open bind = $mod+SHIFT, m, exit @@ -163,8 +163,8 @@ bind = $mod+SHIFT, return, exec, alacritty --class AlacrittyFloating bind = $mod, grave, exec, $launcher bind = $mod+SHIFT, q, hy3:killactive -bind = $mod+SHIFT, s, exec, qs -c shell ipc call screenshot takeScreenshot -bind = $mod, PERIOD, exec, qs -c shell ipc call lockscreen lock +bind = $mod+SHIFT, s, exec, qs msg -c shell screenshot takeScreenshot +bind = $mod, PERIOD, exec, qs msg -c shell lockscreen lock bind = $mod, f, fullscreen, 1 bind = $mod+SHIFT, f, fullscreen, 0 @@ -195,10 +195,10 @@ bind = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text true bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:height 2 bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text false -bind = ,XF86AudioStop, exec, qs -c shell ipc call mpris pauseAll -bind = ,XF86AudioPlay, exec, qs -c shell ipc call mpris playPause -bind = ,XF86AudioNext, exec, qs -c shell ipc call mpris next -bind = ,XF86AudioPrev, exec, qs -c shell ipc call mpris previous +bind = ,XF86AudioStop, exec, qs msg -c shell mpris pauseAll +bind = ,XF86AudioPlay, exec, qs msg -c shell mpris playPause +bind = ,XF86AudioNext, exec, qs msg -c shell mpris next +bind = ,XF86AudioPrev, exec, qs msg -c shell mpris previous bind = $mod, h, hy3:movefocus, l bind = $mod, j, hy3:movefocus, d @@ -246,6 +246,16 @@ bind = $mod, 7, workspace, 07 bind = $mod, 8, workspace, 08 bind = $mod, 9, workspace, 09 bind = $mod, 0, workspace, 10 +bind = $mod, F1, workspace, 11 +bind = $mod, F2, workspace, 12 +bind = $mod, F3, workspace, 13 +bind = $mod, F4, workspace, 14 +bind = $mod, F5, workspace, 15 +bind = $mod, F6, workspace, 16 +bind = $mod, F7, workspace, 17 +bind = $mod, F8, workspace, 18 +bind = $mod, F9, workspace, 19 +bind = $mod, F10, workspace, 20 bind = $mod+SHIFT, 1, hy3:movetoworkspace, 01 bind = $mod+SHIFT, 2, hy3:movetoworkspace, 02 @@ -257,6 +267,27 @@ bind = $mod+SHIFT, 7, hy3:movetoworkspace, 07 bind = $mod+SHIFT, 8, hy3:movetoworkspace, 08 bind = $mod+SHIFT, 9, hy3:movetoworkspace, 09 bind = $mod+SHIFT, 0, hy3:movetoworkspace, 10 +bind = $mod+SHIFT, F1, hy3:movetoworkspace, 11 +bind = $mod+SHIFT, F2, hy3:movetoworkspace, 12 +bind = $mod+SHIFT, F3, hy3:movetoworkspace, 13 +bind = $mod+SHIFT, F4, hy3:movetoworkspace, 14 +bind = $mod+SHIFT, F5, hy3:movetoworkspace, 15 +bind = $mod+SHIFT, F6, hy3:movetoworkspace, 16 +bind = $mod+SHIFT, F7, hy3:movetoworkspace, 17 +bind = $mod+SHIFT, F8, hy3:movetoworkspace, 18 +bind = $mod+SHIFT, F9, hy3:movetoworkspace, 19 +bind = $mod+SHIFT, F10, hy3:movetoworkspace, 20 + +bind = $mod+CONTROL, 1, hy3:focustab, index, 01 +bind = $mod+CONTROL, 2, hy3:focustab, index, 02 +bind = $mod+CONTROL, 3, hy3:focustab, index, 03 +bind = $mod+CONTROL, 4, hy3:focustab, index, 04 +bind = $mod+CONTROL, 5, hy3:focustab, index, 05 +bind = $mod+CONTROL, 6, hy3:focustab, index, 06 +bind = $mod+CONTROL, 7, hy3:focustab, index, 07 +bind = $mod+CONTROL, 8, hy3:focustab, index, 08 +bind = $mod+CONTROL, 9, hy3:focustab, index, 09 +bind = $mod+CONTROL, 0, hy3:focustab, index, 10 workspace = f[1], gapsout:0, gapsin:0 windowrule = bordersize 0, floating:0, onworkspace:f[1] diff --git a/modules/hyprland/standard.conf b/modules/hyprland/standard.conf deleted file mode 100644 index 503137c..0000000 --- a/modules/hyprland/standard.conf +++ /dev/null @@ -1,33 +0,0 @@ -bind = $mod, F1, workspace, 11 -bind = $mod, F2, workspace, 12 -bind = $mod, F3, workspace, 13 -bind = $mod, F4, workspace, 14 -bind = $mod, F5, workspace, 15 -bind = $mod, F6, workspace, 16 -bind = $mod, F7, workspace, 17 -bind = $mod, F8, workspace, 18 -bind = $mod, F9, workspace, 19 -bind = $mod, F10, workspace, 20 - -bind = $mod+SHIFT, F1, hy3:movetoworkspace, 11 -bind = $mod+SHIFT, F2, hy3:movetoworkspace, 12 -bind = $mod+SHIFT, F3, hy3:movetoworkspace, 13 -bind = $mod+SHIFT, F4, hy3:movetoworkspace, 14 -bind = $mod+SHIFT, F5, hy3:movetoworkspace, 15 -bind = $mod+SHIFT, F6, hy3:movetoworkspace, 16 -bind = $mod+SHIFT, F7, hy3:movetoworkspace, 17 -bind = $mod+SHIFT, F8, hy3:movetoworkspace, 18 -bind = $mod+SHIFT, F9, hy3:movetoworkspace, 19 -bind = $mod+SHIFT, F10, hy3:movetoworkspace, 20 - - -bind = $mod+CONTROL, 1, hy3:focustab, index, 01 -bind = $mod+CONTROL, 2, hy3:focustab, index, 02 -bind = $mod+CONTROL, 3, hy3:focustab, index, 03 -bind = $mod+CONTROL, 4, hy3:focustab, index, 04 -bind = $mod+CONTROL, 5, hy3:focustab, index, 05 -bind = $mod+CONTROL, 6, hy3:focustab, index, 06 -bind = $mod+CONTROL, 7, hy3:focustab, index, 07 -bind = $mod+CONTROL, 8, hy3:focustab, index, 08 -bind = $mod+CONTROL, 9, hy3:focustab, index, 09 -bind = $mod+CONTROL, 0, hy3:focustab, index, 10 diff --git a/systems/lenovo/hyprland/default.nix b/systems/lenovo/hyprland/default.nix index e38bb21..8abc2c2 100644 --- a/systems/lenovo/hyprland/default.nix +++ b/systems/lenovo/hyprland/default.nix @@ -1,6 +1,3 @@ { impurity, ... }: { - hyprland-session.extraConfig = '' - source = ${impurity.link ./hyprland.conf} - source = ${impurity.link ../../../modules/hyprland/standard.conf} - ''; + hyprland-session.extraConfig = "source = ${impurity.link ./hyprland.conf}"; } diff --git a/systems/msi/hyprland/default.nix b/systems/msi/hyprland/default.nix index 7710d17..a3cf2b2 100644 --- a/systems/msi/hyprland/default.nix +++ b/systems/msi/hyprland/default.nix @@ -1,9 +1,6 @@ { impurity, ... }: { hyprland-session = { - extraConfig = '' - source = ${impurity.link ./hyprland.conf} - source = ${impurity.link ../../../modules/hyprland/60p.conf} - ''; + extraConfig = "source = ${impurity.link ./hyprland.conf}"; extraConfigStatic = "source = ${./hyprland.conf}"; }; }