diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf index 8809a22..3affb7e 100644 --- a/config/hypr/hypridle.conf +++ b/config/hypr/hypridle.conf @@ -21,13 +21,13 @@ listener { # Screen_off listener { - timeout = 780 + timeout = 1800 on-timeout = hyprctl dispatch dpms off on-resume = hyprctl dispatch dpms on } # Suspend listener { - timeout = 1200 + timeout = 2400 on-timeout = $suspend_cmd } diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 6d07adb..ca0ac77 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -5,6 +5,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,prefered,auto,auto monitor = desc:HKC OVERSEAS LIMITED 0x2160 0x00000001,1920x1080,auto,auto +monitor = eDP-1,prefered, auto, 1.5 ################### ### MY PROGRAMS ### ################### @@ -47,10 +48,10 @@ env = HYPRCURSOR_SIZE,24 # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 4 - gaps_out = 8 + gaps_in = 2 + gaps_out = 4 - border_size = 2 + border_size = 1 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg @@ -73,10 +74,10 @@ decoration { active_opacity = 1.0 inactive_opacity = 1.0 - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + #drop_shadow = true + #shadow_range = 4 + #shadow_render_power = 3 + #col.shadow = rgba(1a1a1aee) # https://wiki.hyprland.org/Configuring/Variables/#blur blur { @@ -164,15 +165,15 @@ device { # See https://wiki.hyprland.org/Configuring/Keywords/ $mainMod = SUPER # Sets "Windows" key as main modifier $shiftMod = SUPER_SHIFT - +$superEnter = SUPER_ENTER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, +bind = $mainMod, 36, exec, $terminal +bind = $mainMod, Q, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, L, exec, hyprlock bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu +bind = $mainMod, F2, exec, $menu bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 94920bf..1ef93f5 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -1,7 +1,7 @@ background { monitor = - path = $HOME/.config/hypr/lock.png # only *.png supported for now - color = rgba(25, 20, 20, 1.0) + path = $HOME/.config/hypr/wp.png # only *.png supported for now + color = rgba(20, 20, 20, 1.0) blur_passes = 4 # 0 disables blurring blur_size = 2 noise = 0.0117 diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf index 4d21b18..926a763 100644 --- a/config/hypr/hyprpaper.conf +++ b/config/hypr/hyprpaper.conf @@ -1,3 +1,3 @@ -preload = ~/.config/hypr/wp.jpg -wallpaper = , ~/.config/hypr/wp.jpg +preload = ~/.config/hypr/wp.png +wallpaper = , ~/.config/hypr/wp.png splash = true diff --git a/config/hypr/wp.jpg b/config/hypr/wp.jpg deleted file mode 100644 index 2047b40..0000000 Binary files a/config/hypr/wp.jpg and /dev/null differ diff --git a/config/hypr/lock.png b/config/hypr/wp.png similarity index 100% rename from config/hypr/lock.png rename to config/hypr/wp.png diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 4ef1dc9..f239799 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,6 +1,6 @@ font_size 10.0 background_opacity 1 -background #0e0e20 +background #030320 cursor_shape beam window_margin_width 4 confirm_os_window_close 0 diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index f17796d..ab1c147 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -2,21 +2,28 @@ "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, "apidocs.nvim": { "branch": "main", "commit": "d6a5c8436d183ab85d8cf8e365ebc79920caf506" }, "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" }, + "avante.nvim": { "branch": "main", "commit": "07b703dbd5257051e0223bf902efd949f09c1064" }, "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, - "codecompanion.nvim": { "branch": "main", "commit": "9edf22cb71711cd7fab7671a25ed5424011a379d" }, "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, + "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "fzf-lua": { "branch": "main", "commit": "3d4342120cf12f36b60a8161a8835b111ec5ec9a" }, "go.nvim": { "branch": "master", "commit": "a3455f48cff718a86275115523dcc735535a13aa" }, "goerr-nvim": { "branch": "main", "commit": "d30ba1cab652e78dbf6a644eb4823be57e9af203" }, "goimpl.nvim": { "branch": "main", "commit": "2548d42c4db0645dea14f27e67c4b19b7030f1cf" }, "guihua.lua": { "branch": "master", "commit": "87bea7b98429405caf2a0ce4d029b027bb017c70" }, "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, + "img-clip.nvim": { "branch": "main", "commit": "d8b6b030672f9f551a0e3526347699985a779d93" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" }, "lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "mini.pick": { "branch": "main", "commit": "ebe3dacb352bb054607e5ed0fd461e2251a7a280" }, "nightfly": { "branch": "master", "commit": "8c55003e89f321a48a8cd4bb426dd3e7c58f0646" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-dap": { "branch": "master", "commit": "40a8189b8a57664a1850b0823fdcb3ac95b9f635" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, @@ -30,7 +37,9 @@ "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "render-markdown.nvim": { "branch": "main", "commit": "24aacee83544ca113055564ed22be7852067c342" }, "smartcolumn.nvim": { "branch": "main", "commit": "92f3773af80d674f1eb61e112dca79e2fa449fd1" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todotxt.nvim": { "branch": "main", "commit": "225ac77fea10a9ad9a48d0247a8d3c23f33cb2ba" }, "zk-nvim": { "branch": "main", "commit": "8fdd7032633045ece559273370fc0ec75ee8ffce" } diff --git a/config/nvim/lua/commands.lua b/config/nvim/lua/commands.lua index 8a987b0..abba436 100644 --- a/config/nvim/lua/commands.lua +++ b/config/nvim/lua/commands.lua @@ -4,3 +4,10 @@ end, { force = true }) vim.api.nvim_create_user_command("Upper", function() vim.cmd([[normal! gUaw]]) end, { force = true }) +vim.api.nvim_create_user_command("GoTestDebug", function() + require('dap-go').debug_test() +end, { force = true }) +vim.api.nvim_create_user_command("GoTestDebugLast", function() + require('dap-go').debug_last_test() +end, { force = true }) + diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index 3ffa507..1031287 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -41,3 +41,9 @@ lspconfig.templ.setup(config({ filetypes = { "templ" }, root_markers = { "go.work", "go.mod", ".git" }, })) + +lspconfig.v_analyzer.setup(config({ + cmd = { "v-analyzer" }, + filetypes = { "v", "vv", "vsh" }, + root_markers = { "v.mod", ".git" }, +})) diff --git a/config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua index d113fd5..4de7052 100644 --- a/config/nvim/lua/plugins/cmp.lua +++ b/config/nvim/lua/plugins/cmp.lua @@ -35,6 +35,9 @@ return { opts = { keymap = { preset = "enter", + [""] = false, + [""] = { "snippet_forward", "fallback" }, + [""] = { "snippet_backward", "fallback" }, }, completion = { list = { @@ -61,7 +64,13 @@ return { signature = { enabled = true }, snippets = { preset = "luasnip" }, sources = { - default = { "lsp", "path", "snippets", "buffer", "codecompanion" }, + default = { + "lsp", + "path", + "snippets", + "buffer", + "codecompanion", + }, }, }, } diff --git a/config/nvim/lua/plugins/codecompanion.lua b/config/nvim/lua/plugins/codecompanion.lua index c4ad892..73a9b8a 100644 --- a/config/nvim/lua/plugins/codecompanion.lua +++ b/config/nvim/lua/plugins/codecompanion.lua @@ -25,7 +25,7 @@ return { }, schema = { model = { - default = "Qwen/Qwen2.5-Coder-14B-Instruct", + default = "Qwen/Qwen2.5-Coder-32B-Instruct-GPTQ-Int8", }, }, }) diff --git a/config/nvim/lua/plugins/dap_go.lua b/config/nvim/lua/plugins/dap_go.lua index 705fab7..262aef8 100644 --- a/config/nvim/lua/plugins/dap_go.lua +++ b/config/nvim/lua/plugins/dap_go.lua @@ -23,10 +23,9 @@ local function setup_go_configuration(dap, configs) name = "Debug", request = "launch", program = "${workspaceFolder}", - args = {}, - buildFlags = configs.delve.build_flags, - outputMode = configs.delve.output_mode, + outputMode = "remote", }, + } if dap.configurations.go == nil then diff --git a/config/nvim/lua/plugins/zk.lua b/config/nvim/lua/plugins/zk.lua index 1640b77..42889d5 100644 --- a/config/nvim/lua/plugins/zk.lua +++ b/config/nvim/lua/plugins/zk.lua @@ -6,16 +6,12 @@ return { picker = "telescope", lsp = { - -- `config` is passed to `vim.lsp.start(config)` config = { name = "zk", cmd = { "zk", "lsp" }, filetypes = { "markdown" }, - -- on_attach = ... - -- etc, see `:h vim.lsp.start()` }, - -- automatically attach buffers in a zk notebook that match the given filetypes auto_attach = { enabled = true, filetypes = { "markdown" }, -- moved to lsp.config above diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 66e648d..39e402e 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -69,9 +69,9 @@ "format": "{short}" }, "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon} {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})", + "format-disconnected": "Disconnected", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped", "unknown-tag": "N/A", "interval": 5, "consume-icons": { @@ -173,8 +173,8 @@ // "scroll-step": 1, // %, can be a float "format": "{volume}% {icon} {format_source}", "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", + "format-bluetooth-muted": "{icon} {format_source}", + "format-muted": "{format_source}", "format-source": "{volume}% ", "format-source-muted": "", "format-icons": { diff --git a/config/waybar/style.css b/config/waybar/style.css index b13d2dc..59fee8e 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -6,7 +6,7 @@ window#waybar { background-color: rgba(43, 48, 59, 0.5); - border-bottom: 2px solid rgba(51, 204, 256, 238); + border-bottom: 1px solid rgba(51, 204, 256, 238); color: #ffffff; transition-property: background-color; transition-duration: .5s; diff --git a/zsh/.zshrc b/zsh/.zshrc index 07065c3..c317674 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -33,7 +33,7 @@ export EDITOR="nvim" export ANDROID_HOME=$HOME/projects/android/ export PATH=$PATH:$ANDROID_HOME/emulator export PATH=$PATH:$ANDROID_HOME/platform-tools -export PATH=$PATH:~/.local/bin:~/go/bin:~/.cargo/bin +export PATH=$PATH:~/.local/bin:~/go/bin:~/.cargo/bin:~/.config/v-analyzer/bin export GOBIN=~/go/bin export GPG_TTY=$(tty) export LS_OPTIONS='--color=auto' @@ -157,7 +157,7 @@ bindkey "^z" foreground bindkey "^ " autosuggest-accept -bindkey "^k" clearscr +bindkey "^K" clearscr # }}} ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD