From 866037c41b1a3d4fc77e92d92f8a029dffbe192d Mon Sep 17 00:00:00 2001 From: chlorospingus Date: Mon, 13 Oct 2025 18:59:54 -0700 Subject: [PATCH] idek atp --- .gitignore | 1 + hypr/hyprbinds.conf | 6 ++--- hypr/hyprcolors.conf | 6 ++--- hypr/hyprland.conf | 3 ++- hypr/monitors.conf | 4 ++++ kitty/colors.conf | 52 ++++++++++++++++++++-------------------- kitty/kitty.conf | 4 ++++ nvim/init.lua | 14 +++++++---- nvim/lua/config/lazy.lua | 2 +- nvim/lua/plugins/cmp.lua | 7 ------ starship.toml | 16 ++++++------- 11 files changed, 61 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 6ab439b..e19e5a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ nvim/lazy-lock.json hypr/hardware.conf +hypr/monitors.conf diff --git a/hypr/hyprbinds.conf b/hypr/hyprbinds.conf index 9f4f35a..4634635 100644 --- a/hypr/hyprbinds.conf +++ b/hypr/hyprbinds.conf @@ -72,7 +72,7 @@ bind = SUPER ALT, S, resizeactive, 50 0 # Open favourites bind = SUPER, G, exec, zen-browser bind = SUPER, C, exec, spotify-launcher -bind = SUPER, R, exec, secrets +bind = SUPER, R, exec, keepassxc bind = SUPER, L, exec, kitty # Adjust brightness @@ -92,8 +92,8 @@ bind = SUPER, COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screenshots - 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 +bind = SHIFT, XF86Display, exec, ~/.config/scripts/vnc-toggle.sh +bind = , XF86Display, exec, killall gjs && ags run # MCSR # Thin macro diff --git a/hypr/hyprcolors.conf b/hypr/hyprcolors.conf index ed45eb1..be6d42a 100644 --- a/hypr/hyprcolors.conf +++ b/hypr/hyprcolors.conf @@ -1,3 +1,3 @@ -$primary = rgba(E7C2D4ff) -$primary_container = rgba(AE6179ff) -$background = rgba(1B1922ff) +$primary = rgba(C27DD6ff) +$primary_container = rgba(2D1C3Fff) +$background = rgba(262229ff) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index fa2bb11..d8177ca 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -61,7 +61,7 @@ decoration { new_optimizations = true ignore_opacity = true special = true - brightness = 0.4 + brightness = 0.3 xray = true; } } @@ -88,6 +88,7 @@ animations { animation = workspaces , 1, 3, easeOut, slide animation = specialWorkspace , 1, 3, default, slidevert animation = zoomFactor , 1, 3, default + animation = monitorAdded , 1, 3, default } dwindle { diff --git a/hypr/monitors.conf b/hypr/monitors.conf index 2bf931f..c2ba6ec 100644 --- a/hypr/monitors.conf +++ b/hypr/monitors.conf @@ -1,3 +1,7 @@ +<<<<<<< HEAD # Generated by nwg-displays on 2025-09-21 at 11:46:40. Do not edit manually. +======= +# Generated by nwg-displays on 2025-10-10 at 11:48:17. Do not edit manually. +>>>>>>> bc1e256 (idek atp) monitor=DP-1,2560x1440@143.97,0x0,1.0 diff --git a/kitty/colors.conf b/kitty/colors.conf index d06b5b3..c5805a0 100644 --- a/kitty/colors.conf +++ b/kitty/colors.conf @@ -1,30 +1,30 @@ -foreground #C2FDFD -background #1B1922 +foreground #ECE5F0 +background #262229 background_opacity -cursor #C0B28E +cursor #A795C1 -active_tab_foreground #1B1922 -active_tab_background #C2FDFD -inactive_tab_foreground #C2FDFD -inactive_tab_background #1B1922 +active_tab_foreground #262229 +active_tab_background #ECE5F0 +inactive_tab_foreground #ECE5F0 +inactive_tab_background #262229 -active_border_color #C2FDFD -inactive_border_color #1B1922 -bell_border_color #AE6179 +active_border_color #ECE5F0 +inactive_border_color #262229 +bell_border_color #2D1C3F -color0 #42404A -color8 #70AAAA -color1 #AE6179 -color9 #AE6179 -color2 #BD6720 -color10 #BD6720 -color3 #68A5D6 -color11 #68A5D6 -color4 #BAB695 -color12 #BAB695 -color5 #E7C2D4 -color13 #E7C2D4 -color6 #52F8F9 -color14 #52F8F9 -color7 #A0F3F4 -color15 #A0F3F4 +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 e5c0c33..a30c874 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -3,7 +3,11 @@ include colors.conf background_opacity 0 font_family ComicShannsMono Nerd Font +<<<<<<< HEAD font_size 18 +======= +font_size 14 +>>>>>>> bc1e256 (idek atp) cursor #cdf cursor_trail 1 diff --git a/nvim/init.lua b/nvim/init.lua index b1c689c..71c522d 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -35,10 +35,12 @@ vim.cmd([[ no i a no A I no I A - no k o no j J - no - t - no _ T + no J j + no f f + no F t + no k F + no K T no h no t @@ -56,6 +58,7 @@ vim.cmd([[ no : ino : cno + nn * o$ $ no / nn :noh @@ -73,5 +76,6 @@ vim.cmd([[ colorscheme catppuccin ]]) -vim.api.nvim_set_hl(0, "Pmenu", { bg = nil }) -vim.api.nvim_set_hl(0, "NormalFloat", { bg = nil }) +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/config/lazy.lua b/nvim/lua/config/lazy.lua index f5ee74c..a079dd4 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -31,5 +31,5 @@ require("lazy").setup({ -- colorscheme that will be used when installing plugins. install = { colorscheme = { "habamax" } }, -- automatically check for plugin updates - checker = { enabled = true }, + checker = { enabled = true, notify = false }, }) diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index a26a5dd..ae47e8a 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -39,13 +39,6 @@ return { "kind", } } }, - components = { - label = { - text = { - background = "#ffffff" - }, - } - } }, documentation = { auto_show = true, diff --git a/starship.toml b/starship.toml index 8e10d66..14d889e 100644 --- a/starship.toml +++ b/starship.toml @@ -25,19 +25,19 @@ success_symbol = "[](green bold)" error_symbol = "[](pink)" [directory] -style = "bg:none fg:#7A4455" -format = "[]($style)[󱗆 $path](bg:#7A4455 fg:#C2FDFD)[ ]($style)" +style = "bg:none fg:#20142C" +format = "[]($style)[󱗆 $path](bg:#20142C fg:#ECE5F0)[ ]($style)" truncation_length = 3 truncate_to_repo=false [git_branch] -style = "bg:none fg:#7A4455" -format = "[]($style)[[ ](bg:#7A4455 fg:#C2FDFD)$branch](bg:#7A4455 fg:#C2FDFD)[ ]($style)" +style = "bg:none fg:#20142C" +format = "[]($style)[[ ](bg:#20142C fg:#ECE5F0)$branch](bg:#20142C fg:#ECE5F0)[ ]($style)" [git_status] # $all status$ahead_behind -style = "bg:none fg:#7A4455" -format = "[]($style)[$all_status$ahead_behind](bg:#7A4455 fg:#C2FDFD)[ ]($style)" +style = "bg:none fg:#20142C" +format = "[]($style)[$all_status$ahead_behind](bg:#20142C fg:#ECE5F0)[ ]($style)" conflicted = "=" ahead = "⇡${count}" behind = "⇣${count}" @@ -53,8 +53,8 @@ deleted = "${count}" [cmd_duration] min_time = 1 # duration & style -style = "bg:none fg:#7A4455" -format = "[]($style)[$duration](bg:#7A4455 fg:#C2FDFD)[]($style)" +style = "bg:none fg:#20142C" +format = "[]($style)[$duration](bg:#20142C fg:#ECE5F0)[]($style)" disabled = false [palettes.catppuccin_mocha]