diff --git a/flake.lock b/flake.lock index 288ec25..862098a 100644 --- a/flake.lock +++ b/flake.lock @@ -536,6 +536,27 @@ "type": "github" } }, + "hyprgrass": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1718401180, + "narHash": "sha256-DfM2BqnFW48NlHkBfC7ErHgK7WHlOgiiE+aFetN/yJ4=", + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "736119f828eecaed2deaae1d6ff1f50d6dabaaba", + "type": "github" + }, + "original": { + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "736119f828eecaed2deaae1d6ff1f50d6dabaaba", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprcursor": "hyprcursor", @@ -1245,6 +1266,7 @@ "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "hycov": "hycov", + "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", diff --git a/flake.nix b/flake.nix index 4ed61c6..ab95627 100644 --- a/flake.nix +++ b/flake.nix @@ -220,8 +220,8 @@ hycov.url = "github:DreamMaoMao/hycov/3d144a79f8b5468656de88a005be55f3317d295b"; hycov.inputs.hyprland.follows = "hyprland"; # FIXME hyprgrass broken on 0.41.0 - #hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; - #hyprgrass.inputs.hyprland.follows = "hyprland"; + hyprgrass.url = "github:horriblename/hyprgrass/736119f828eecaed2deaae1d6ff1f50d6dabaaba"; + hyprgrass.inputs.hyprland.follows = "hyprland"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 7538a31..167b2c6 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -6,7 +6,6 @@ in ../../app/terminal/alacritty.nix ../../app/terminal/kitty.nix (import ../../app/dmenu-scripts/networkmanager-dmenu.nix { - #dmenu_command = "fuzzel -d -f ${userSettings.font} :size=16"; inherit config lib pkgs; dmenu_command = "fuzzel -d"; inherit config lib pkgs; }) ../input/nihongo.nix @@ -30,7 +29,7 @@ in inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails inputs.hycov.packages.${pkgs.system}.hycov # FIXME hypgrass currently broken on 0.41.0 - #inputs.hyprgrass.packages.${pkgs.system}.default + inputs.hyprgrass.packages.${pkgs.system}.default ]; settings = { }; extraConfig = '' @@ -129,33 +128,32 @@ in show_special = 0 # show windwos in special workspace in overview. } - # FIXME hypgrass currently broken on 0.41.0 :( - #touch_gestures { - # sensitivity = 4.0 - # long_press_delay = 260 - # hyprgrass-bind = , edge:r:l, exec, hyprnome - # hyprgrass-bind = , edge:l:r, exec, hyprnome --previous - # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + touch_gestures { + sensitivity = 4.0 + long_press_delay = 260 + hyprgrass-bind = , edge:r:l, exec, hyprnome + hyprgrass-bind = , edge:l:r, exec, hyprnome --previous + hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - # hyprgrass-bind = , swipe:3:u, hycov:toggleoverview - # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + hyprgrass-bind = , swipe:3:u, hycov:toggleoverview + hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - # hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous - # hyprgrass-bind = , swipe:3:r, exec, hyprnome + hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous + hyprgrass-bind = , swipe:3:r, exec, hyprnome - # hyprgrass-bind = , swipe:4:u, movewindow,u - # hyprgrass-bind = , swipe:4:d, movewindow,d - # hyprgrass-bind = , swipe:4:l, movewindow,l - # hyprgrass-bind = , swipe:4:r, movewindow,r + hyprgrass-bind = , swipe:4:u, movewindow,u + hyprgrass-bind = , swipe:4:d, movewindow,d + hyprgrass-bind = , swipe:4:l, movewindow,l + hyprgrass-bind = , swipe:4:r, movewindow,r - # hyprgrass-bind = , tap:3, fullscreen,1 - # hyprgrass-bind = , tap:4, fullscreen,0 + hyprgrass-bind = , tap:3, fullscreen,1 + hyprgrass-bind = , tap:4, fullscreen,0 - # hyprgrass-bindm = , longpress:2, movewindow - # hyprgrass-bindm = , longpress:3, resizewindow + hyprgrass-bindm = , longpress:2, movewindow + hyprgrass-bindm = , longpress:3, resizewindow - #} + } } bind=SUPER,SUPER_L,exec,nwggrid-wrapper