From da79f5375548eddaf6fb02a0576afb9143ccbf30 Mon Sep 17 00:00:00 2001 From: chlorospingus Date: Tue, 5 May 2026 18:48:08 -0700 Subject: [PATCH] made some changes --- LICENSE | 2 +- hypr/hyprbinds.conf | 45 ++++++----- hypr/hyprland.conf | 40 +++++----- hypr/monitors.conf | 4 - kitty/colors.conf | 6 +- nvim/init.lua | 32 +++++--- nvim/lua/plugins/cmp.lua | 8 +- nvim/lua/plugins/codesnap.lua | 16 ---- nvim/lua/plugins/lualine.lua | 77 ++++++++++--------- .../{presence.lua => presence.lua.bak} | 0 starship.toml | 12 +-- 11 files changed, 122 insertions(+), 120 deletions(-) delete mode 100644 hypr/monitors.conf delete mode 100644 nvim/lua/plugins/codesnap.lua rename nvim/lua/plugins/{presence.lua => presence.lua.bak} (100%) diff --git a/LICENSE b/LICENSE index 621d255..c3ba306 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 ProtoSharkk +Copyright (c) 2024 chlorospingus Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/hypr/hyprbinds.conf b/hypr/hyprbinds.conf index c4e4c42..799f3b5 100644 --- a/hypr/hyprbinds.conf +++ b/hypr/hyprbinds.conf @@ -1,29 +1,23 @@ # Window management -bind = SUPER_L, Q, killactive, -bind = SUPER_L, M, togglefloating, -bind = SUPER_L, M, centerwindow -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, hyprctl dispatch dpms on; quickshell ipc call lock open & sleep 2; systemctl suspend +bind = SUPER, Q, killactive, +bind = SUPER, M, togglefloating, +bind = SUPER, M, centerwindow +bind = SUPER, SPACE, global, quickshell:peek_bar +bind = SUPER, SUPER_L, exec, quickshell ipc call topbar toggle +bind = SUPER, K, layoutmsg, movetoroot +bind = SUPER, B, layoutmsg, togglesplit +bind = SUPER, x, layoutmsg, swapsplit $select = winsel - -# Move focus with mainMod + arrow keys 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, H, movewindow, l -bind = SUPER, T, movewindow, u -bind = SUPER, N, movewindow, d -bind = SUPER, S, movewindow, r +# Screen locking +bindl = SUPER, ESCAPE, exec, ~/.config/scripts/lock.sh +bind = , XF86Go, exec, ~/.config/scripts/idle-toggle.sh +bindl= ,switch:on:Lid Switch, exec, quickshell ipc call lock instalock; sleep 0.5; systemctl suspend # Navigate multiple monitors bind = SUPER, PERIOD, focusmonitor, -1 @@ -39,7 +33,10 @@ bind = SUPER, 6, workspace, 6 bind = SUPER, 7, workspace, 7 bind = SUPER, 8, workspace, 8 bind = SUPER, 9, workspace, 9 + bind = SUPER, apostrophe, hyprexpo:expo, toggle +# bind = SUPER SHIFT, apostrophe, hymission:open, forceall +# gesture = 3, vertical, dispatcher, hymission:toggle, forceall # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = SUPER SHIFT, 1, movetoworkspace, 1 @@ -55,8 +52,8 @@ bind = SUPER SHIFT, 0, movetoworkspace, 10 # Manage special workspace (scratchpad) bind = SUPER, V, togglespecialworkspace -bind = SUPER, W, movetoworkspacesilent, special bind = SUPER, W, movewindow, mon:current +bind = SUPER, W, movetoworkspacesilent, special # Move/resize windows bindm = SUPER, mouse:272, movewindow @@ -72,18 +69,20 @@ binde = SUPER ALT, S, resizeactive, 50 0 # Open favourites bind = SUPER, G, exec, zen-browser bind = SUPER, C, exec, vesktop -bind = SUPER, R, exec, flatpak run org.keepassxc.KeePassXC +bind = SUPER, R, exec, keepassxc bind = SUPER, L, exec, kitty # Adjust brightness -bindle = , XF86MonBrightnessUp, exec, brillo -A 5% -q -u 300000 -bindle = , XF86MonBrightnessDown, exec, brillo -U 5% -q -u 300000 +bindle = , XF86MonBrightnessUp, global, quickshell:increase_brightness +bindle = , XF86MonBrightnessDown, global, quickshell:decrease_brightness 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@ +1% bindle = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -1% +bindle = , XF86AudioRaiseVolume, exec, quickshell ipc call osd open +bindle = , XF86AudioLowerVolume, exec, quickshell ipc call osd open bind = , XF86AudioMicMute, exec, playerctl next bind = , XF86AudioMute, exec, playerctl play-pause @@ -93,7 +92,7 @@ bind = SUPER ALT, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshot 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 quickshell; quickshell 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/hyprland.conf b/hypr/hyprland.conf index 3c702f8..86ff4c5 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -2,9 +2,6 @@ source = ~/.config/hypr/hardware.conf source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/hyprcolors.conf # 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 @@ -13,15 +10,14 @@ exec-once = quickshell exec-once = hypridle 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 = kanshi # Theming with envvars for some reason env = XCURSOR_SIZE, 22 env = XCURSOR_THEME, GoogleDot-Black -envd = GTK_THEME, Graphite-green-Dark -# env = GTK_ICON_THEME, BeautyLine +envd = GTK_THEME, Graphite-Dark +env = GTK_ICON_THEME, YAMIS env = HYPRCURSOR_SIZE, 22 env = HYPRCURSOR_THEME, GoogleDot-hypr env = QT_QPA_PLATFORMTHEME, gtk3 @@ -56,17 +52,17 @@ decoration { # fullscreen_opacity = 1.0 blur { enabled = true - size = 2 - passes = 2 + size = 8 + passes = 3 new_optimizations = true ignore_opacity = true special = false brightness = 0.2 } shadow { - range = 12 - render_power = 3 - scale = 0.998 + range = 18 + render_power = 4 + scale = 0.9995 color = rgba(000000ff) } } @@ -90,8 +86,8 @@ animations { animation = layersOut , 1, 2, easeIn, slide animation = fadeLayersIn , 1, 3, easeOut animation = fadeLayersOut , 1, 2, easeIn - animation = workspaces , 1, 3, easeOut, slide - animation = specialWorkspace , 1, 3, default, slidevert + animation = workspaces , 1, 3, easeOut, slidefade 15% + animation = specialWorkspace , 1, 3, default, slidefadevert 10% animation = zoomFactor , 1, 3, default animation = monitorAdded , 1, 3, default } @@ -120,6 +116,13 @@ plugin { # function = linear # } #} + # hymission { + # outer_padding_top = 80 + # outer_padding_right = 80 + # outer_padding_left = 80 + # outer_padding_bottom = 80 + # expand_selected_window = true + # } } # Smart gaps @@ -141,10 +144,8 @@ 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 @@ -152,6 +153,7 @@ 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 picker, animation fade layerrule = match:namespace wayscriber, animation fade layerrule = match:namespace quickshell, no_anim on @@ -163,7 +165,6 @@ layerrule = match:namespace lazerpopup, order 2 layerrule = match:namespace notifpanel, order 3 layerrule = match:namespace notification, order 4 - source = ~/.config/hypr/hyprbinds.conf binds { @@ -172,16 +173,17 @@ binds { misc { disable_hyprland_logo = true - animate_manual_resizes = true disable_splash_rendering = false on_focus_under_fullscreen = 2 key_press_enables_dpms = true mouse_move_enables_dpms = true focus_on_activate = true - session_lock_xray = true + session_lock_xray = false animate_manual_resizes = true enable_anr_dialog = false - background_color = 0x222222 + background_color = 0x141414 + enable_swallow = true + swallow_regex = ^neovide$ } cursor { diff --git a/hypr/monitors.conf b/hypr/monitors.conf deleted file mode 100644 index 7b22e67..0000000 --- a/hypr/monitors.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Generated by nwg-displays on 2026-01-21 at 16:51:05. Do not edit manually. - -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 6ef34f1..7399e54 100644 --- a/kitty/colors.conf +++ b/kitty/colors.conf @@ -1,6 +1,7 @@ foreground #FFFFFF -background #111112 +background #111111 cursor #cccccc +background_opacity 1 active_tab_foreground #253742 active_tab_background #F4E4D8 @@ -11,6 +12,9 @@ active_border_color #F4E4D8 inactive_border_color #253742 bell_border_color #64ACE1 +selection_background #666666 +selection_foreground #ffffff + color0 #000000 color8 #888888 color1 #CD1D48 diff --git a/nvim/init.lua b/nvim/init.lua index 5fce061..c04661a 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -3,7 +3,6 @@ require('config.lazy') vim.lsp.enable({ "rust_analyzer", "jdtls", - "qmlls", "clangd", "csharp_ls", "lua_ls", @@ -14,7 +13,7 @@ vim.lsp.enable({ "css_ls", "tinymist", "bashls", - "dartls" + "kotlin_lsp" }) @@ -22,10 +21,17 @@ vim.keymap.set({'n', 'x', 'o'}, ',', vim.diagnostic.open_float) vim.keymap.set({'n', 'x', 'o', 'i'}, '', "up") if vim.g.neovide then - vim.g.neovide_padding_top = 6 - vim.g.neovide_padding_bottom = 6 - vim.g.neovide_padding_right = 6 - vim.g.neovide_padding_left = 6 + vim.o.guifont = "0xProto Nerd Font:h12" + vim.g.neovide_padding_top = 4 + vim.g.neovide_padding_bottom = 4 + vim.g.neovide_padding_right = 4 + vim.g.neovide_padding_left = 4 + + vim.g.neovide_floating_corner_radius = 0.4 + vim.g.neovide_floating_shadow = true + vim.g.neovide_floating_z_height = 2 + vim.g.neovide_light_angle_degrees = 45 + vim.g.neovide_light_radius = 8 end vim.cmd([[ @@ -73,11 +79,15 @@ vim.cmd([[ set shiftwidth=4 set cmdheight=0 set scrolloff=12 + set formatexpr=t - let g:vsnip_snippet_dir = '~/.config/nvim/vsnip' colorscheme catppuccin + hi Normal guibg=#111111 + hi Pmenu guibg=#181818 + hi BlinkCmpMenuBorder guibg=#181818 + hi BlinkCmpDoc guibg=#181818 + hi BlinkCmpDocSeparator guibg=#181818 + hi BlinkCmpDocBorder guibg=#181818 + hi BlinkCmpScrollbarThumb guibg=#181818 + hi BlinkCmpScrollbarGutter guibg=#181818 ]]) - -vim.api.nvim_set_hl(0, "Pmenu", { bg = nil, force = true }) -vim.api.nvim_set_hl(0, "FloatBorder", { bg = nil, force = true }) -vim.api.nvim_set_hl(0, "NormalFloat", { bg = nil, force = true }) diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index ae47e8a..805c8c2 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -28,9 +28,11 @@ return { completion = { menu = { - border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'}, + -- border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'}, -- border = {'╓', '─', '╖', '║', '╜', '─', '╙', '║'}, draw = { + padding = 0, + gap = 5, columns = { { "label", "label_description", @@ -44,8 +46,8 @@ return { auto_show = true, treesitter_highlighting = true, window = { - border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'}, - } + -- border = {'╭', '─', '╮', '│', '╯', '─', '╰', '│'}, + }, }, ghost_text = { enabled = true, diff --git a/nvim/lua/plugins/codesnap.lua b/nvim/lua/plugins/codesnap.lua deleted file mode 100644 index 30ffc20..0000000 --- a/nvim/lua/plugins/codesnap.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - 'mistricky/codesnap.nvim', - lazy = false, - build = 'make', - keys = { - {'', 'CodeSnap', mode = 'x'}, - }, - opts = { - bg_theme = "sea", - has_line_number = true, - bg_padding = 0, - code_font_family = "0xProto Nerd Font"; - mac_window_bar = false, - watermark = "" - } -} diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua index 8bb2b96..eb52574 100644 --- a/nvim/lua/plugins/lualine.lua +++ b/nvim/lua/plugins/lualine.lua @@ -1,38 +1,43 @@ return { - 'nvim-lualine/lualine.nvim', - dependencies = { - 'nvim-tree/nvim-web-devicons', - }, - opts = { - options = { - icons_enabled = true, - theme = 'auto', - component_separators = { left = '', right = ''}, - section_separators = { left = '', right = ''}, - disabled_filetypes = { - statusline = {}, - winbar = {}, - }, - ignore_focus = {}, - always_divide_middle = true, - globalstatus = false, - refresh = { - statusline = 1000, - tabline = 1000, - winbar = 1000, - } - }, - sections = { - lualine_a = {{'mode', separator = {left = '', right = ''}, padding = 0}}, - lualine_b = {'branch'}, - lualine_c = {'diagnostics'}, - lualine_x = {}, - lualine_y = {'filetype'}, - lualine_z = {{'filename', separator = {left = '', right = ''}, padding = 0}} - }, - tabline = {}, - winbar = {}, - inactive_winbar = {}, - extensions = {} - } + 'nvim-lualine/lualine.nvim', + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + opts = { + options = { + icons_enabled = true, + theme = 'auto', + section_separators = { left = '', right = '' }, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 5000, + tabline = 5000, + winbar = 5000, + } + }, + sections = { + lualine_a = { { 'mode', separator = { left = '', right = '' }, padding = 0 } }, + lualine_b = { 'branch' }, + lualine_c = { 'diagnostics' }, + lualine_x = {}, + lualine_y = { 'filetype' }, + lualine_z = {{ + 'filename', + path = 3, + separator = { left = '', right = '' }, + padding = 0, + shorting_target = 48 + }} + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {} + } } diff --git a/nvim/lua/plugins/presence.lua b/nvim/lua/plugins/presence.lua.bak similarity index 100% rename from nvim/lua/plugins/presence.lua rename to nvim/lua/plugins/presence.lua.bak diff --git a/starship.toml b/starship.toml index cc14048..abb3a7f 100644 --- a/starship.toml +++ b/starship.toml @@ -25,14 +25,14 @@ success_symbol = "[](green bold)" error_symbol = "[](pink)" [directory] -style = "bg:none fg:#5E3fba" -format = "[]($style)[󱗆 $path](bg:#5E3FBA fg:#ffffff)[ ]($style)" +style = "bg:none fg:#333333" +format = "[]($style)[󱗆 $path](bg:#333333 fg:#ffffff)[ ]($style)" truncation_length = 3 truncate_to_repo=false [git_branch] -style = "bg:none fg:#cd1d48" -format = "[]($style)[ $branch](bg:#cd1d48 fg:#ffffff)[ ]($style)" +style = "bg:none fg:#333333" +format = "[]($style)[ $branch](bg:#333333 fg:#ffffff)[ ]($style)" [git_status] # $all status$ahead_behind @@ -53,8 +53,8 @@ deleted = "${count}" [cmd_duration] min_time = 1 # duration & style -style = "bg:none fg:#46789E" -format = "[]($style)[$duration](bg:#46789E fg:#F4E4D8)[]($style)" +style = "bg:none fg:#333333" +format = "[]($style)[$duration](bg:#333333 fg:#ffffff)[]($style)" disabled = false [palettes.catppuccin_mocha]