From 85cf9b60f7790cba3180fbc0010c7ecd93be043a Mon Sep 17 00:00:00 2001 From: Sergey Besedin Date: Sun, 21 Sep 2025 22:20:06 +0400 Subject: [PATCH] Update --- config/btop/btop.conf | 8 ++++---- config/i3/config | 4 ++-- config/nvim/init.vim | 30 ++++++++++++++++-------------- gitconfig | 9 +++++++-- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/config/btop/btop.conf b/config/btop/btop.conf index ee55869..9cefb9a 100644 --- a/config/btop/btop.conf +++ b/config/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.4.1 +#? Config file for btop v. 1.4.4 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -50,7 +50,7 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem net proc" +shown_boxes = "mem net proc cpu" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 1000 @@ -150,7 +150,7 @@ background_update = True custom_cpu_name = "" #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". -#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". +#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user" disks_filter = "" #* Show graphs instead of meters for memory values. @@ -202,7 +202,7 @@ net_download = 100 net_upload = 100 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = False +net_auto = True #* Sync the auto scaling for download and upload to whichever currently has the highest scale. net_sync = True diff --git a/config/i3/config b/config/i3/config index 6e31c5a..c743949 100644 --- a/config/i3/config +++ b/config/i3/config @@ -217,9 +217,9 @@ workspace $ws6 output primary workspace $ws7 output primary workspace $ws8 output primary # workspace $ws9 output HDMI-1-0 -workspace $ws9 output eDP +workspace $ws9 output HDMI-1-0 # workspace $ws10 output eDP -workspace $ws10 output eDP +workspace $ws10 output HDMI-1-0 # move focused container to workspace bindsym $mod+Shift+1 move container to workspace $ws1 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 0b24c3a..9559a00 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -213,7 +213,6 @@ require('telescope').setup{ } -- nvim-lspconfig -local nvim_lsp = require('lspconfig') local nlspsettings = require("nlspsettings") nlspsettings.setup({ @@ -290,23 +289,26 @@ local servers = { local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) +vim.lsp['*'] = { + flags = { + debounce_text_changes = 500, + }, + on_attach = on_attach, + capabilities = capabilities, + root_markers = { '.git' }, +} + for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - flags = { - debounce_text_changes = 1000, - }, - on_attach = on_attach, - capabilities = capabilities - } + vim.lsp.enable(lsp) end -nvim_lsp.elixirls.setup{ +vim.lsp['elixirls'] = { cmd = { "elixir-ls" }, on_attach = on_attach, capabilities = capabilities } --- nvim_lsp.rust_analyzer.setup({ +-- vim.lsp['rust_analyzer'] = { -- cmd = { "rust-analyzer" }, -- on_attach = on_attach, -- capabilities = capabilities, @@ -324,9 +326,9 @@ nvim_lsp.elixirls.setup{ -- }, -- } -- } --- }) +-- } -nvim_lsp.tailwindcss.setup({ +vim.lsp.config['tailwindcss'] = { on_attach = on_attach, capabilities = capabilities, settings = { @@ -334,7 +336,7 @@ nvim_lsp.tailwindcss.setup({ emmetCompletions = true, } } -}) +} -- require('rust-tools').setup({ -- tools = { -- rust-tools options @@ -410,7 +412,7 @@ local function setup_diagnostics(client, buffer) }) end --- nvim_lsp.ruby_lsp.setup({ +-- vim.lsp.config('ruby_lsp', { -- on_attach = function(client, buffer) -- setup_diagnostics(client, buffer) -- end, diff --git a/gitconfig b/gitconfig index 322f5f6..0e7c0be 100644 --- a/gitconfig +++ b/gitconfig @@ -45,8 +45,8 @@ [init] defaultBranch = main -[core] - hooksPath = /dev/null +# [core] +# hooksPath = /dev/null [diff] tool = kitty @@ -58,3 +58,8 @@ cmd = kitty +kitten diff $LOCAL $REMOTE [difftool "kitty.gui"] cmd = kitty kitty +kitten diff $LOCAL $REMOTE +[filter "lfs"] + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f