diff --git a/hypr/hyprbinds.conf b/hypr/hyprbinds.conf index ce1dbc6..1b1f255 100644 --- a/hypr/hyprbinds.conf +++ b/hypr/hyprbinds.conf @@ -1,79 +1,79 @@ # Window management -bind = SUPER_L, Q, killactive, -bind = SUPER_L, M, togglefloating, -bind = SUPER_L, M, centerwindow +bind = SUPER, Q, killactive, +bind = SUPER, M, togglefloating, +bind = SUPER, M, centerwindow bindr = SUPER, SUPER_L, exec, ~/.config/scripts/wofi-launch.sh -bind = SUPER_L, B, togglesplit +bind = SUPER, B, togglesplit # Screen locking -bindl = SUPER_L, ESCAPE, exec, ~/.config/scripts/lock.sh +bindl = SUPER, ESCAPE, exec, ~/.config/scripts/lock.sh bind = , XF86Go, exec, ~/.config/scripts/idle-toggle.sh bindl= ,switch:on:Lid Switch, exec, pgrep hyprlock || hyprlock & systemctl suspend $select = winsel # Move focus with mainMod + arrow keys -bind = SUPER_L, A, exec, $select 0 -bind = SUPER_L, O, exec, $select 1 -bind = SUPER_L, E, exec, $select 2 -bind = SUPER_L, U, exec, $select 3 +bind = SUPER, A, exec, $select 0 +bind = SUPER, O, exec, $select 1 +bind = SUPER, E, exec, $select 2 +bind = SUPER, U, exec, $select 3 # Move windows around with mainMod + arrow keys -bind = SUPER_L, H, movewindow, l -bind = SUPER_L, T, movewindow, u -bind = SUPER_L, N, movewindow, d -bind = SUPER_L, S, movewindow, r +bind = SUPER, H, movewindow, l +bind = SUPER, T, movewindow, u +bind = SUPER, N, movewindow, d +bind = SUPER, S, movewindow, r # Navigate multiple monitors -bind = SUPER_L, PERIOD, focusmonitor, -1 -bind = SUPER_L, P, movecurrentworkspacetomonitor, -1 +bind = SUPER, PERIOD, focusmonitor, -1 +bind = SUPER, P, movecurrentworkspacetomonitor, -1 # Switch workspaces with mainMod + [0-9] -bind = SUPER_L, 1, workspace, 1 -bind = SUPER_L, 2, workspace, 2 -bind = SUPER_L, 3, workspace, 3 -bind = SUPER_L, 4, workspace, 4 -bind = SUPER_L, 5, workspace, 5 -bind = SUPER_L, 6, workspace, 6 -bind = SUPER_L, 7, workspace, 7 -bind = SUPER_L, 8, workspace, 8 -bind = SUPER_L, 9, workspace, 9 -bind = SUPER_L, 0, exec, hyprctl activewindow | workspace0 +bind = SUPER, 1, workspace, 1 +bind = SUPER, 2, workspace, 2 +bind = SUPER, 3, workspace, 3 +bind = SUPER, 4, workspace, 4 +bind = SUPER, 5, workspace, 5 +bind = SUPER, 6, workspace, 6 +bind = SUPER, 7, workspace, 7 +bind = SUPER, 8, workspace, 8 +bind = SUPER, 9, workspace, 9 +bind = SUPER, 0, exec, hyprctl activewindow | workspace0 bind = SUPER, apostrophe, hyprexpo:expo, toggle # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = SUPER_L SHIFT, 1, movetoworkspace, 1 -bind = SUPER_L SHIFT, 2, movetoworkspace, 2 -bind = SUPER_L SHIFT, 3, movetoworkspace, 3 -bind = SUPER_L SHIFT, 4, movetoworkspace, 4 -bind = SUPER_L SHIFT, 5, movetoworkspace, 5 -bind = SUPER_L SHIFT, 6, movetoworkspace, 6 -bind = SUPER_L SHIFT, 7, movetoworkspace, 7 -bind = SUPER_L SHIFT, 8, movetoworkspace, 8 -bind = SUPER_L SHIFT, 9, movetoworkspace, 9 -bind = SUPER_L SHIFT, 0, movetoworkspace, 10 +bind = SUPER SHIFT, 1, movetoworkspace, 1 +bind = SUPER SHIFT, 2, movetoworkspace, 2 +bind = SUPER SHIFT, 3, movetoworkspace, 3 +bind = SUPER SHIFT, 4, movetoworkspace, 4 +bind = SUPER SHIFT, 5, movetoworkspace, 5 +bind = SUPER SHIFT, 6, movetoworkspace, 6 +bind = SUPER SHIFT, 7, movetoworkspace, 7 +bind = SUPER SHIFT, 8, movetoworkspace, 8 +bind = SUPER SHIFT, 9, movetoworkspace, 9 +bind = SUPER SHIFT, 0, movetoworkspace, 10 # Manage special workspace (scratchpad) -bind = SUPER_L, V, togglespecialworkspace -bind = SUPER_L, Z, movetoworkspacesilent, special -bind = SUPER_L, W, movewindow, mon:current +bind = SUPER, V, togglespecialworkspace +bind = SUPER, W, movetoworkspacesilent, special +bind = SUPER, W, movewindow, mon:current # Move/resize windows -bindm = SUPER_L, mouse:272, movewindow -bindm = SUPER_L, mouse:273, resizewindow -bind = SUPER_L, SPACE, fullscreen +bindm = SUPER, mouse:272, movewindow +bindm = SUPER, mouse:273, resizewindow +bind = SUPER, F, fullscreen # Resize windows with super + arrow keys -bind = SUPER_L ALT, h, resizeactive, -50 0 -bind = SUPER_L ALT, t, resizeactive, 0 -50 -bind = SUPER_L ALT, n, resizeactive, 0 50 -bind = SUPER_L ALT, s, resizeactive, 50 0 +bind = SUPER ALT, H, resizeactive, -50 0 +bind = SUPER ALT, T, resizeactive, 0 -50 +bind = SUPER ALT, N, resizeactive, 0 50 +bind = SUPER ALT, S, resizeactive, 50 0 # Open favourites -bind = SUPER_L, G, exec, zen-browser -bind = SUPER_L, C, exec, spotify-launcher -bind = SUPER_L, R, exec, secrets -bind = SUPER_L, L, exec, kitty +bind = SUPER, G, exec, zen-browser +bind = SUPER, C, exec, spotify-launcher +bind = SUPER, R, exec, secrets +bind = SUPER, L, exec, kitty # Adjust brightness bindle = , XF86MonBrightnessUp, exec, brillo -A 8% -q -u 500000 @@ -88,9 +88,9 @@ bind = , XF86AudioMicMute, exec, playerctl next bind = , XF86AudioMute, exec, playerctl play-pause # Screen capturing -bind = SUPER_L, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m region -bind = SUPER_L ALT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m window -bind = SUPER_L SHIFT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m active -m output -bind = SUPER_L, SEMICOLON, exec, ~/.config/scripts/zoom.sh +bind = SUPER, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m region +bind = SUPER ALT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m window +bind = SUPER SHIFT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m active -m output +bind = SUPER, SEMICOLON, exec, ~/.config/scripts/zoom.sh bind = , XF86Display, exec, ~/.config/scripts/vnc-toggle.sh bind = SHIFT, XF86Display, exec, killall gjs && ags run diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 64920eb..fa7f0ec 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,8 +1,4 @@ listener { timeout = 100 - on-timeout = notify-send -a 'Hummingbird' 'Hypridle' 'Suspending in 5 seconds...' -i gnome-suspend -t 1 -} -listener { - timeout = 105 - on-timeout = ~/.config/scripts/lock.sh + on-timeout = ~/.config/scripts/idle.sh } diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 44c345f..3706d1c 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -6,7 +6,7 @@ monitor = , addreserved, 36, 0, 0, 0 # Run stuff on launch env = PATH, $PATH:$HOME/.local/bin:$HOME/.cargo/bin -exec-once = hyprlock +# exec-once = hyprlock exec-once = hypridle exec-once = nextcloud exec-once = /lib/polkit-gnome/polkit-gnome-authentication-agent-1 @@ -19,7 +19,7 @@ exec-once = swww-daemon # Theming with envvars for some reason env = XCURSOR_SIZE, 22 env = XCURSOR_THEME, GoogleDot-Black -envd = GTK_THEME, catppuccin-mocha-blue-standard+default +envd = GTK_THEME, Materia-dark env = GTK_ICON_THEME, BeautyLine env = HYPRCURSOR_SIZE, 22 env = HYPRCURSOR_THEME, GoogleDot-Hypr @@ -92,8 +92,6 @@ animations { animation = zoomFactor , 1, 3, default } - - dwindle { preserve_split = true smart_split = false @@ -138,8 +136,8 @@ windowrule = float, class:(xdg-desktop-portal-gtk) windowrule = noblur, title:(Open File) windowrule = float, center, class:(eog) windowrule = fullscreen, class:steam_app* -windowrule = float, class:(mpv|loupe) -windowrule = size 95% 90%, class:(mpv|loupe) +windowrule = float, class:(mpv|loupe|org.gnome.eog) +windowrule = size 95% 90%, class:(mpv|loupe|org.gnome.eog) windowrule = center 1, floating:1 # Misc layer rules diff --git a/nvim/init.lua b/nvim/init.lua index b7201ed..b1c689c 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,10 +8,12 @@ vim.lsp.enable({ "csharp_ls", "lua_ls", "html", + "pylsp", + "pylint", "ts_ls", "css_ls", "tinymist", - "gopls" + "dartls" }) @@ -35,10 +37,8 @@ vim.cmd([[ no I A no k o no j J - no m q - no M Q - no q t - no Q T + no - t + no _ T no h no t @@ -56,8 +56,6 @@ vim.cmd([[ no : ino : cno - no + " - vn P v`[v`] no / nn :noh diff --git a/nvim/lua/plugins/typst.lua b/nvim/lua/plugins/typst.lua index 8bdc751..750274e 100644 --- a/nvim/lua/plugins/typst.lua +++ b/nvim/lua/plugins/typst.lua @@ -1,4 +1,8 @@ return { 'chomosuke/typst-preview.nvim', version = '1.*', + opts = { + invert_colors = 'always', + port = 8978, + }, }