diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index b1f7c28..89335ea 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -61,7 +61,6 @@ in exec-once = emacs --daemon exec-once = hypridle - exec-once = sleep 5 && libinput-gestures exec-once = obs-notification-mute-daemon exec-once = hyprpaper @@ -94,7 +93,7 @@ in hotarea_size = 10 # hotarea size, 10x10 swipe_fingers = 3 # finger number of gesture,move any directory move_focus_distance = 100 # distance for movefocus,only can use 3 finger to move - enable_gesture = 0 # enable gesture + enable_gesture = 1 # enable gesture auto_exit = 1 # enable auto exit when no client in overview auto_fullscreen = 0 # auto make active window maximize after exit overview only_active_workspace = 0 # only overview the active workspace @@ -112,25 +111,12 @@ in 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 -g adw-gtk3 -o 0.55 -b '' + config.lib.stylix.colors.base00 + '' - + hyprgrass-bind = , swipe:3:d, exec, nwg-drawer hyprgrass-bind = , swipe:3:u, hycov:toggleoverview - hyprgrass-bind = , swipe:3:d, exec, nwggrid - 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 = , tap:3, fullscreen,1 - hyprgrass-bind = , tap:4, fullscreen,0 - + hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous hyprgrass-bindm = , longpress:2, movewindow hyprgrass-bindm = , longpress:3, resizewindow - - } } @@ -297,9 +283,6 @@ in layerrule = blur,gtk-layer-shell layerrule = xray,gtk-layer-shell blurls = gtk-layer-shell - layerrule = blur,~nwggrid - layerrule = xray,~nwggrid - blurls = ~nwggrid bind=SUPER,code:21,exec,pypr zoom bind=SUPER,code:21,exec,hyprctl reload @@ -369,9 +352,7 @@ in (nwg-dock-hyprland.overrideAttrs (oldAttrs: { patches = ./patches/noactiveclients.patch; })) - nwg-launchers libva-utils - libinput-gestures gsettings-desktop-schemas (pyprland.overrideAttrs (oldAttrs: { src = fetchFromGitHub { @@ -710,7 +691,6 @@ in "format" = " {} "; "exec" = ''echo "" ''; "interval" = "once"; - "on-click" = "nwggrid -g adw-gtk3 -o 0.55 -b " + config.lib.stylix.colors.base00; }; "custom/hyprprofile" = { "format" = "  {}"; @@ -1032,112 +1012,6 @@ in background-size: auto 100%; } ''; - home.file.".config/nwg-launchers/nwggrid/style.css".text = '' - button, label, image { - background: none; - border-style: none; - box-shadow: none; - color: #'' + config.lib.stylix.colors.base07 + ''; - - font-size: 20px; - } - - button { - padding: 5px; - margin: 5px; - text-shadow: none; - } - - button:hover { - background-color: rgba('' + config.lib.stylix.colors.base07-rgb-r + "," + config.lib.stylix.colors.base07-rgb-g + "," + config.lib.stylix.colors.base07-rgb-b + "," + ''0.15); - } - - button:focus { - box-shadow: 0 0 10px; - } - - button:checked { - background-color: rgba('' + config.lib.stylix.colors.base07-rgb-r + "," + config.lib.stylix.colors.base07-rgb-g + "," + config.lib.stylix.colors.base07-rgb-b + "," + ''0.15); - } - - #searchbox { - background: none; - border-color: #'' + config.lib.stylix.colors.base07 + ''; - - color: #'' + config.lib.stylix.colors.base07 + ''; - - margin-top: 20px; - margin-bottom: 20px; - - font-size: 20px; - } - - #separator { - background-color: rgba('' + config.lib.stylix.colors.base00-rgb-r + "," + config.lib.stylix.colors.base00-rgb-g + "," + config.lib.stylix.colors.base00-rgb-b + "," + ''0.55); - - color: #'' + config.lib.stylix.colors.base07 + ''; - margin-left: 500px; - margin-right: 500px; - margin-top: 10px; - margin-bottom: 10px - } - - #description { - margin-bottom: 20px - } - ''; - home.file.".config/nwg-launchers/nwggrid/terminal".text = "alacritty -e"; - home.file.".config/nwg-drawer/drawer.css".text = '' - window { - background-color: rgba('' + config.lib.stylix.colors.base00-rgb-r + "," + config.lib.stylix.colors.base00-rgb-g + "," + config.lib.stylix.colors.base00-rgb-b + "," + ''0.55); - color: #'' + config.lib.stylix.colors.base07 + '' - } - - /* search entry */ - entry { - background-color: rgba('' + config.lib.stylix.colors.base01-rgb-r + "," + config.lib.stylix.colors.base01-rgb-g + "," + config.lib.stylix.colors.base01-rgb-b + "," + ''0.45); - } - - button, image { - background: none; - border: none - } - - button:hover { - background-color: rgba('' + config.lib.stylix.colors.base02-rgb-r + "," + config.lib.stylix.colors.base02-rgb-g + "," + config.lib.stylix.colors.base02-rgb-b + "," + ''0.45); - } - - /* in case you wanted to give category buttons a different look */ - #category-button { - margin: 0 10px 0 10px - } - - #pinned-box { - padding-bottom: 5px; - border-bottom: 1px dotted; - border-color: #'' + config.lib.stylix.colors.base07 + ''; - } - - #files-box { - padding: 5px; - border: 1px dotted gray; - border-radius: 15px - border-color: #'' + config.lib.stylix.colors.base07 + ''; - } - ''; - home.file.".config/libinput-gestures.conf".text = '' - gesture swipe up 3 hyprctl dispatch hycov:toggleoverview - gesture swipe down 3 nwggrid -g adw-gtk3 -o 0.55 -b '' + config.lib.stylix.colors.base00 + '' - - gesture swipe right 3 hyprnome - gesture swipe left 3 hyprnome --previous - gesture swipe up 4 hyprctl dispatch movewindow u - gesture swipe down 4 hyprctl dispatch movewindow d - gesture swipe left 4 hyprctl dispatch movewindow l - gesture swipe right 4 hyprctl dispatch movewindow r - gesture pinch in hyprctl dispatch fullscreen 1 - gesture pinch out hyprctl dispatch fullscreen 1 - ''; services.udiskie.enable = true; services.udiskie.tray = "always";