diff --git a/hypr/hyprbinds.conf b/hypr/hyprbinds.conf index f6f245d..c4e4c42 100644 --- a/hypr/hyprbinds.conf +++ b/hypr/hyprbinds.conf @@ -2,13 +2,14 @@ bind = SUPER_L, Q, killactive, bind = SUPER_L, M, togglefloating, bind = SUPER_L, M, centerwindow -bindr = SUPER, SUPER_L, exec, killall rofi || rofi -show drun +bindr = SUPER, SUPER_L, exec, pgrep quickshell && { quickshell ipc call launcher toggle; } || { quickshell; } +# bindr = SUPER, SUPER_L, exec, pkill -x rofi || rofi -show drun bind = SUPER_L, B, togglesplit # Screen locking 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) & sleep 1; systemctl suspend +bindl= ,switch:on:Lid Switch, exec, hyprctl dispatch dpms on; quickshell ipc call lock open & sleep 2; systemctl suspend $select = winsel @@ -63,15 +64,15 @@ bindm = SUPER, mouse:273, resizewindow bind = SUPER, F, fullscreen # Resize windows with super + arrow keys -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 +binde = SUPER ALT, H, resizeactive, -50 0 +binde = SUPER ALT, T, resizeactive, 0 -50 +binde = SUPER ALT, N, resizeactive, 0 50 +binde = SUPER ALT, S, resizeactive, 50 0 # Open favourites bind = SUPER, G, exec, zen-browser -bind = SUPER, C, exec, steam -bind = SUPER, R, exec, keepassxc +bind = SUPER, C, exec, vesktop +bind = SUPER, R, exec, flatpak run org.keepassxc.KeePassXC bind = SUPER, L, exec, kitty # Adjust brightness @@ -81,17 +82,18 @@ bindle = SHIFT, XF86MonBrightnessDown, exec, brillo -S 0% -q -u 1000000 bind = , Cancel, exec, ~/.config/scripts/sunset-toggle.sh # Adjust volume and media -bindle = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% -bindle = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +bindle = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1% +bindle = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -1% bind = , XF86AudioMicMute, exec, playerctl next bind = , XF86AudioMute, exec, playerctl play-pause # Screen capturing 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 SHIFT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots -z -s -m active -m output bind = SUPER, SEMICOLON, exec, ~/.config/scripts/zoom.sh bind = SHIFT, XF86Display, exec, ~/.config/scripts/vnc-toggle.sh -bind = , XF86Display, exec, killall gjs && ags run --gtk 3 +bind = , XF86Display, exec, killall gjs; ags run --gtk 3 bind = ALT, XF86Display, exec, sleep 0.5 && hyprctl dispatch dpms off bind = SUPER, D, exec, wayscriber --active +bind = SUPER SHIFT, D, exec, wl-paste | satty -f - diff --git a/hypr/hyprcolors.conf b/hypr/hyprcolors.conf index be6d42a..4160ca8 100644 --- a/hypr/hyprcolors.conf +++ b/hypr/hyprcolors.conf @@ -1,3 +1,2 @@ -$primary = rgba(C27DD6ff) -$primary_container = rgba(2D1C3Fff) -$background = rgba(262229ff) +$primary = rgba(00FFAAFF) +$primary_container = rgba(555555ff) diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 23eec2c..999d300 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,9 +1,9 @@ listener { timeout = 100 - on-timeout = hyprctl dispatch dpms off + on-timeout = notify-send -t 5000 "Hypridle" "System will suspend in 5 seconds..." } listener { timeout = 105 - on-timeout = pgrep -x hyprlock || hyprlock & sleep 0.5; systemctl suspend + on-timeout = ~/.config/scripts/lock.sh } diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 3134e34..3c702f8 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,26 +1,27 @@ source = ~/.config/hypr/hardware.conf source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/hyprcolors.conf -monitor = , preferred, auto, 1.0 -monitor = , addreserved, 36, 0, 0, 0 +# monitor = , preferred, auto, 1.0 +monitor = eDP-1, addreserved, 36, 0, 0, 0 +monitor = HDMI-A-1, addreserved, 36, 0, 0, 0 +monitor = HEADLESS, addreserved, 36, 0, 0, 0 # Run stuff on launch env = PATH, $PATH:$HOME/.local/bin:$HOME/.cargo/bin # exec-once = hyprlock +exec-once = quickshell exec-once = hypridle -exec-once = nextcloud exec-once = /lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = keyd-application-mapper -d exec-once = ags run --gtk 3 exec-once = hyprpm reload -exec-once = swww-daemon exec-once = kanshi # Theming with envvars for some reason env = XCURSOR_SIZE, 22 env = XCURSOR_THEME, GoogleDot-Black -envd = GTK_THEME, Graphite-purple-Dark -env = GTK_ICON_THEME, BeautyLine +envd = GTK_THEME, Graphite-green-Dark +# env = GTK_ICON_THEME, BeautyLine env = HYPRCURSOR_SIZE, 22 env = HYPRCURSOR_THEME, GoogleDot-hypr env = QT_QPA_PLATFORMTHEME, gtk3 @@ -39,30 +40,34 @@ input { } general { - gaps_in = 3 + gaps_in = 4 gaps_out = 6 - col.active_border = $primary - col.inactive_border = $primary_container - border_size = 2 + border_size = 0 layout = dwindle no_focus_fallback = true } decoration { - rounding = 10 + rounding = 12 + rounding_power = 2 # active_opacity = 0.9 # inactive_opacity = 0.92 # fullscreen_opacity = 1.0 blur { enabled = true - size = 6 - passes = 4 + size = 2 + passes = 2 new_optimizations = true ignore_opacity = true - special = true - brightness = 0.3 - xray = true; + special = false + brightness = 0.2 + } + shadow { + range = 12 + render_power = 3 + scale = 0.998 + color = rgba(000000ff) } } @@ -105,7 +110,6 @@ plugin { bg_col = rgb(111111) workspace_method = first 1 # [center/first] [workspace] e.g. first 1 or center m+1 - enable_gesture = false skip_empty = false } #dynamic-cursors { @@ -119,40 +123,45 @@ plugin { } # Smart gaps -workspace = w[tv1] s[false], gapsout:0, gapsin:0 -workspace = s[true], gapsout:64, gapsin:32 -windowrule = bordersize 0, floating:0, onworkspace:w[tv1] -windowrule = rounding 0, floating:0, onworkspace:w[tv1] s[false] +workspace = w[tv1]s[false], gapsout:0, gapsin:0 +workspace = f[1]s[false], gapsout:0, gapsin:0 +windowrule = border_size 0, match:float 0, match:workspace w[tv1]s[false] +windowrule = rounding 0, match:float 0, match:workspace w[tv1]s[false] +windowrule = border_size 0, match:float 0, match:workspace f[1]s[false] +windowrule = rounding 0, match:float 0, match:workspace f[1]s[false] # The bell doesn't fullscreen you, I do. -windowrulev2 = suppressevent fullscreen, class:.* +windowrule = match:class .*, suppress_event fullscreen # Misc window rules -windowrule = float, title:(Write:) -windowrule = float, class:(xdg-desktop-portal-gtk) -windowrule = noblur, title:(Open File) -windowrule = float, center, class:(eog) -windowrule = fullscreen, class:steam_app.* -windowrule = workspace 5, class:steam_app.* -windowrule = workspace special, class:steam -windowrule = float, class:(mpv|loupe) -windowrule = size 95% 90%, class:(mpv|loupe) -windowrule = center 1, floating:1 +windowrule = match:title (Write:), float on +windowrule = match:class xdg-desktop-portal-gtk, float on +windowrule = match:title (Open File), no_blur on +windowrule = match:class (Xdg-desktop-portal-gtk), no_blur on +windowrule = match:class (eog), float on, center on +windowrule = match:class steam_app.*, fullscreen on +windowrule = match:class steam_app.*, workspace 5 +windowrule = match:class steam, workspace special +windowrule = match:class (mpv|loupe|com.gabm.satty), float on +windowrule = match:class (mpv|loupe|com.gabm.satty), size 90% 95% +windowrule = match:class chromium-browser, no_shadow on +# windowrule = center 1, floating:1 # Misc layer rules -layerrule = animation slide, bar -layerrule = animation popin, swww-daemon -layerrule = animation fade, selection -layerrule = animation fade, hyprpicker -layerrule = animation fade, wayscriber +layerrule = match:namespace bar, animation slide +layerrule = match:namespace swww-daemon, animation popin +layerrule = match:namespace selection, animation fade +layerrule = match:namespace hyprpicker, animation fade +layerrule = match:namespace wayscriber, animation fade +layerrule = match:namespace quickshell, no_anim on -layerrule = animation popin 40%, lazerpopup -layerrule = noanim, notification -layerrule = dimaround, notifpanel -layerrule = order 1, bar -layerrule = order 2, lazerpopup -layerrule = order 3, notifpanel -layerrule = order 4, notification +layerrule = match:namespace lazerpopup, animation popin 40% +layerrule = match:namespace notification, no_anim on +layerrule = match:namespace notifpanel, dim_around on +layerrule = match:namespace bar, order 1 +layerrule = match:namespace lazerpopup, order 2 +layerrule = match:namespace notifpanel, order 3 +layerrule = match:namespace notification, order 4 source = ~/.config/hypr/hyprbinds.conf @@ -165,13 +174,14 @@ misc { disable_hyprland_logo = true animate_manual_resizes = true disable_splash_rendering = false - new_window_takes_over_fullscreen = 2 + on_focus_under_fullscreen = 2 key_press_enables_dpms = true mouse_move_enables_dpms = true focus_on_activate = true session_lock_xray = true animate_manual_resizes = true enable_anr_dialog = false + background_color = 0x222222 } cursor { diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 98dc419..97f66c7 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -8,9 +8,7 @@ general { auth { pam { enabled = true - } - fingerprint { - enabled = true + module = system-auth } } @@ -23,10 +21,8 @@ animations { } background { - monitor = - path = ~/Pictures/Wallpapers/endcity.png - color = rgba(181825aa) - blur_strength = 2 + path = /tmp/lockbg.png + blur_strength = 4 blur_passes = 2 brightness = 0.8 contrast = 0.8 diff --git a/hypr/monitors.conf b/hypr/monitors.conf index 8c9d0da..7b22e67 100644 --- a/hypr/monitors.conf +++ b/hypr/monitors.conf @@ -1,4 +1,4 @@ -# Generated by nwg-displays on 2025-10-30 at 14:31:04. Do not edit manually. +# Generated by nwg-displays on 2026-01-21 at 16:51:05. Do not edit manually. -monitor=eDP-1,1920x1200@60.0,0x1080,1.0 -monitor=HDMI-A-1,preferred,0x0,1.0 +monitor=eDP-1,1920x1200@60.0,0x1120,1.0 +monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0 diff --git a/kitty/colors.conf b/kitty/colors.conf index c23b8e7..6ef34f1 100644 --- a/kitty/colors.conf +++ b/kitty/colors.conf @@ -1,30 +1,30 @@ -foreground #ECE5F0 -background #262229 -background_opacity 0 -cursor #A795C1 +foreground #FFFFFF +background #111112 +cursor #cccccc -active_tab_foreground #262229 -active_tab_background #ECE5F0 -inactive_tab_foreground #ECE5F0 -inactive_tab_background #262229 +active_tab_foreground #253742 +active_tab_background #F4E4D8 +inactive_tab_foreground #F4E4D8 +inactive_tab_background #253742 -active_border_color #ECE5F0 -inactive_border_color #262229 -bell_border_color #2D1C3F +active_border_color #F4E4D8 +inactive_border_color #253742 +bell_border_color #64ACE1 + +color0 #000000 +color8 #888888 +color1 #CD1D48 +color9 #CD1D48 +color2 #00FFAA +color10 #00FFAA +color3 #EEAA00 +color11 #EEAA00 +color4 #FF5580 +color12 #FF5580 +color5 #6644CC +color13 #6644CC +color6 #00FFAA +color14 #00FFAA +color7 #FFFFFF +color15 #FFFFFF -color0 #4C4850 -color8 #9A939E -# color1 #2D1C3F -# color9 #2D1C3F -color2 #624591 -color10 #624591 -color3 #837197 -color11 #837197 -color4 #B2868D -color12 #B2868D -color5 #C27DD6 -color13 #C27DD6 -color6 #C9B6D5 -color14 #C9B6D5 -color7 #DCD2E2 -color15 #DCD2E2 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 51af290..8a7a1a6 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,7 +1,5 @@ include colors.conf -background_opacity 0 - font_family 0xProto Nerd Font font_size 12 diff --git a/nvim/init.lua b/nvim/init.lua index 24cdd5f..5fce061 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -13,7 +13,8 @@ vim.lsp.enable({ "ts_ls", "css_ls", "tinymist", - "bashls" + "bashls", + "dartls" }) diff --git a/starship.toml b/starship.toml index 14d889e..cc14048 100644 --- a/starship.toml +++ b/starship.toml @@ -25,19 +25,19 @@ success_symbol = "[](green bold)" error_symbol = "[](pink)" [directory] -style = "bg:none fg:#20142C" -format = "[]($style)[󱗆 $path](bg:#20142C fg:#ECE5F0)[ ]($style)" +style = "bg:none fg:#5E3fba" +format = "[]($style)[󱗆 $path](bg:#5E3FBA fg:#ffffff)[ ]($style)" truncation_length = 3 truncate_to_repo=false [git_branch] -style = "bg:none fg:#20142C" -format = "[]($style)[[ ](bg:#20142C fg:#ECE5F0)$branch](bg:#20142C fg:#ECE5F0)[ ]($style)" +style = "bg:none fg:#cd1d48" +format = "[]($style)[ $branch](bg:#cd1d48 fg:#ffffff)[ ]($style)" [git_status] # $all status$ahead_behind -style = "bg:none fg:#20142C" -format = "[]($style)[$all_status$ahead_behind](bg:#20142C fg:#ECE5F0)[ ]($style)" +style = "bg:none fg:#46789E" +format = "[]($style)[$all_status$ahead_behind](bg:#46789E fg:#F4E4D8)[ ]($style)" conflicted = "=" ahead = "⇡${count}" behind = "⇣${count}" @@ -53,8 +53,8 @@ deleted = "${count}" [cmd_duration] min_time = 1 # duration & style -style = "bg:none fg:#20142C" -format = "[]($style)[$duration](bg:#20142C fg:#ECE5F0)[]($style)" +style = "bg:none fg:#46789E" +format = "[]($style)[$duration](bg:#46789E fg:#F4E4D8)[]($style)" disabled = false [palettes.catppuccin_mocha]