diff --git a/flake.lock b/flake.lock index d7671eea..8bba93b3 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ }, "flake-private": { "locked": { - "lastModified": 1755291684, - "narHash": "sha256-odToLtFoY6GJQWqOksrDW4vCYIvA/utOkwjAedQpJ0w=", + "lastModified": 1755267322, + "narHash": "sha256-uL6Ps+sF1OD5/pXkXBXSLmzDAFPIaiOuN+alO7r/itI=", "ref": "main", - "rev": "88b0a0e5b1bb9bd25803e5c2c4d6aacb54205786", - "revCount": 8, + "rev": "9b71a0ee60c4c618d4df25f771e177a1a708300c", + "revCount": 7, "type": "git", "url": "ssh://git@git.firelilith.org/lilith/flake-private.git" }, diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index 8881edb1..aef85483 100644 --- a/home/lilith/hyprland/default.nix +++ b/home/lilith/hyprland/default.nix @@ -35,7 +35,6 @@ exec-once = [ "hyprlock" "ags" - "clipse -listen" ]; exec = [ "[workspace special:keepass silent] keepassxc" ]; diff --git a/home/lilith/hyprland/hyprgrass.nix b/home/lilith/hyprland/hyprgrass.nix index 926a3d93..571c0b99 100644 --- a/home/lilith/hyprland/hyprgrass.nix +++ b/home/lilith/hyprland/hyprgrass.nix @@ -11,34 +11,13 @@ plugins = [ hyprgrass.packages.${pkgs.system}.default ]; settings.plugin.touch_gestures = { - sensitivity = 4.0; - workspace_swipe = true; + sensitivity = 2.0; workspace_swipe_fingers = 3; - workspace_swipe_cancel_ratio = 0.9; + workspace_swipe_edge = "d"; - long_press_delay = 400; + long_press_delay = 500; resize_on_border_long_press = true; - edge_margin = 30; - - experimental.send_cancel = true; - - hyprgrass-bind = [ - # weird hack, because there is no explicit way to only show or hide special workplaces - ", swipe:3:u, togglespecialworkspace, _tmp" - ", swipe:3:u, togglespecialworkspace, keepass" - ", swipe:3:u, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi" - - ", swipe:3:d, togglespecialworkspace, _tmp" - ", swipe:3:d, togglespecialworkspace, _tmp" - - ", swipe:3:ru, sendshortcut, CONTROL, C," - ", swipe:3:rd, sendshortcut, CONTROL, V," - - ", tap:5, killactive" - - ", longpress:2, resizewindow" - ", longpress:2, movewindow" - ]; + edge_margin = 20; }; }; } diff --git a/home/lilith/hyprland/keys.nix b/home/lilith/hyprland/keys.nix index 48288cc9..340daeaf 100644 --- a/home/lilith/hyprland/keys.nix +++ b/home/lilith/hyprland/keys.nix @@ -24,10 +24,10 @@ "SUPER, K, movefocus, u" "SUPER, J, movefocus, d" - "SUPER ALT, H, swapwindow, l" - "SUPER ALT, L, swapwindow, r" - "SUPER ALT, K, swapwindow, u" - "SUPER ALT, J, swapwindow, d" + "SUPER ALT, H, moveactive, l" + "SUPER ALT, L, moveactive, r" + "SUPER ALT, K, moveactive, u" + "SUPER ALT, J, moveactive, d" "SUPER, 1, workspace, 1" "SUPER, 2, workspace, 2" @@ -53,8 +53,6 @@ "SUPER, I, togglespecialworkspace, magic" "SUPER SHIFT, I, movetoworkspace, special:magic" - - "SUPER, V, exec, alacritty --class clipse -e 'clipse'" ]; bindm = [ diff --git a/home/lilith/hyprland/settings.nix b/home/lilith/hyprland/settings.nix index 4155f4b6..9c6726f6 100644 --- a/home/lilith/hyprland/settings.nix +++ b/home/lilith/hyprland/settings.nix @@ -5,18 +5,13 @@ "workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$" # show database unlock prompt on all workspaces - "workspace unset silent,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," + "unset,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," "center,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," "pin,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," # show inline images with ueberzugpp "noanim, class:^ueberzugpp_(.*)$" - # clipboard manager clipse - "float,class:(clipse)" - "size 50% 50%,class:(clipse)" - "center, class:(clipse)" - # path of exile / poetrade hacks "tag +poe, class:^(steam_app_238960)$" "tag +poe, title:^(Path of Exile)$" diff --git a/home/lilith/packages.nix b/home/lilith/packages.nix index 31477faf..d7749519 100644 --- a/home/lilith/packages.nix +++ b/home/lilith/packages.nix @@ -1,8 +1,6 @@ -{ pkgs, rose-pine-hyprcursor, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ - rose-pine-hyprcursor.packages.${pkgs.system}.default - gcc gnumake git @@ -16,7 +14,6 @@ networkmanagerapplet nh wl-clipboard - clipse xdg-utils hyprshot diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix index e3361aab..883063fd 100644 --- a/system/optional/stylix.nix +++ b/system/optional/stylix.nix @@ -44,6 +44,12 @@ }; }; + + cursor = { + package = pkgs.rose-pine-cursor; + name = "Rosé Pine"; + size = 10; + }; }; fonts.packages = with pkgs; [