From 5e294c445671e28a6fd31886a03a58394e5a9c33 Mon Sep 17 00:00:00 2001 From: Greg Date: Wed, 23 Apr 2025 23:50:52 +0300 Subject: [PATCH] nvim,sway,kitty,waybar --- .config/fish/fish_variables | 4 +- .config/kitty/kitty.conf | 5 +- .config/nvim/lazy-lock.json | 1 + .config/nvim/lua/plugins/flash.lua | 78 ++++++++++----------- .config/nvim/lua/plugins/i18n.lua | 6 +- .config/nvim/lua/plugins/mason.lua | 84 +++++++++++------------ .config/nvim/lua/plugins/smear_cursor.lua | 4 ++ .config/nvim/lua/plugins/snacks.lua | 2 +- .config/nvim/lua/plugins/treesitter.lua | 73 ++++++++++---------- .config/nvim/lua/plugins/typescript.lua | 20 +++--- .config/sway/config | 2 +- .config/waybar/config | 19 ++--- .config/waybar/style.css | 8 ++- 13 files changed, 157 insertions(+), 149 deletions(-) create mode 100644 .config/nvim/lua/plugins/smear_cursor.lua diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index c954297..4ca2011 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -5,7 +5,7 @@ SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dwalker\x2dskip\x3d\x2esteam\x2c\x2evsc SETUVAR --export --path PATH:/usr/local/bin\x1e/usr/local/sbin\x1e/usr/bin\x1e/usr/sbin\x1e/usr/local/go/bin SETUVAR --export RANGER_LOAD_DEFAULT_RC:FALSE SETUVAR Z_DATA_DIR:/home/foton/\x2elocal/share/z -SETUVAR __fish_initialized:3400 +SETUVAR __fish_initialized:3800 SETUVAR _fisher_jhillyerd_2F_plugin_2D_git_files:\x7e/\x2econfig/fish/functions/__git\x2ebranch_has_wip\x2efish\x1e\x7e/\x2econfig/fish/functions/__git\x2ecurrent_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/__git\x2edefault_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/__git\x2edestroy\x2efish\x1e\x7e/\x2econfig/fish/functions/__git\x2einit\x2efish\x1e\x7e/\x2econfig/fish/functions/gbage\x2efish\x1e\x7e/\x2econfig/fish/functions/gbda\x2efish\x1e\x7e/\x2econfig/fish/functions/gdv\x2efish\x1e\x7e/\x2econfig/fish/functions/gignored\x2efish\x1e\x7e/\x2econfig/fish/functions/glp\x2efish\x1e\x7e/\x2econfig/fish/functions/grename\x2efish\x1e\x7e/\x2econfig/fish/functions/grt\x2efish\x1e\x7e/\x2econfig/fish/functions/gtest\x2efish\x1e\x7e/\x2econfig/fish/functions/gtl\x2efish\x1e\x7e/\x2econfig/fish/functions/gunwip\x2efish\x1e\x7e/\x2econfig/fish/functions/gwip\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/git\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish @@ -32,7 +32,7 @@ SETUVAR fish_color_option:\x1d SETUVAR fish_color_param:eceff4 SETUVAR fish_color_quote:a3be8c SETUVAR fish_color_redirection:b48ead -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 0e3cde5..fd8b3ed 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -2,8 +2,9 @@ map ctrl+c copy_to_clipboard map ctrl+v paste_from_clipboard map ctrl+shift+c send_text all \x03 map ctrl+shift+s show_scrollback -font_size 12.0 -font_family 0xProto Nerd Font Mono +font_size 11.0 +# font_family 0xProto Nerd Font Mono +font_family Iosevka Nerd Font Mono touch_scroll_multiplier 5.0 scrollback_pager ~/.scripts/pager.sh +INPUT_LINE_NUMBER +CURSOR_LINE +CURSOR_COLUMN include ./nord.conf diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 6d032f2..ac20c6d 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -14,6 +14,7 @@ "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "smear-cursor.nvim": { "branch": "main", "commit": "a76711e1084b8732ff9f87856e4956c62b7e23ee" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "typescript-tools.nvim": { "branch": "master", "commit": "a4109c70e7d6a3a86f971cefea04ab6720582ba9" }, diff --git a/.config/nvim/lua/plugins/flash.lua b/.config/nvim/lua/plugins/flash.lua index 6463830..15cdff8 100644 --- a/.config/nvim/lua/plugins/flash.lua +++ b/.config/nvim/lua/plugins/flash.lua @@ -1,41 +1,41 @@ return { - "folke/flash.nvim", - event = "VeryLazy", - opts = { - jump = { - autojump = true, - }, - label = { - before = true, - after = false, - min_pattern_length = 0, - style = "overlay", - }, - }, - keys = { - { - "s", - mode = { "n", "x", "o" }, - function() - require("flash").jump() - end, - desc = "Flash", - }, - { - "S", - mode = { "n", "x", "o" }, - function() - require("flash").treesitter() - end, - desc = "Flash Treesitter", - }, - { - "R", - mode = { "o", "x" }, - function() - require("flash").treesitter_search() - end, - desc = "Treesitter Search", - } - } + "folke/flash.nvim", + event = "VeryLazy", + opts = { + jump = { + autojump = true, + }, + label = { + before = true, + after = false, + min_pattern_length = 0, + style = "overlay", + }, + }, + keys = { + { + "s", + mode = { "n", "x", "o" }, + function() + require("flash").jump() + end, + desc = "Flash", + }, + -- { + -- "S", + -- mode = { "n", "x", "o" }, + -- function() + -- require("flash").treesitter() + -- end, + -- desc = "Flash Treesitter", + -- }, + { + "R", + mode = { "o", "x" }, + function() + require("flash").treesitter_search() + end, + desc = "Treesitter Search", + }, + }, } diff --git a/.config/nvim/lua/plugins/i18n.lua b/.config/nvim/lua/plugins/i18n.lua index 8b7c9e1..ca6c349 100644 --- a/.config/nvim/lua/plugins/i18n.lua +++ b/.config/nvim/lua/plugins/i18n.lua @@ -6,5 +6,9 @@ return { "nvim-lua/plenary.nvim", }, event = { "BufReadPre", "BufNewFile" }, - opts = {}, + opts = { + virt_text = { + enabled = false, -- Enable virtual text display + }, + }, } diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 444d5f8..c8082b8 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -15,48 +15,48 @@ return { }, }, marksman = {}, - -- vtsls = { - -- settings = { - -- complete_function_calls = true, - -- vtsls = { - -- enableMoveToFileCodeAction = true, - -- autoUseWorkspaceTsdk = true, - -- experimental = { - -- completion = { - -- enableServerSideFuzzyMatch = true, - -- }, - -- }, - -- }, - -- javascript = { - -- updateImportsOnFileMove = { enabled = "always" }, - -- suggest = { - -- completeFunctionCalls = true, - -- }, - -- inlayHints = { - -- enumMemberValues = { enabled = true }, - -- functionLikeReturnTypes = { enabled = true }, - -- parameterNames = { enabled = "literals" }, - -- parameterTypes = { enabled = true }, - -- propertyDeclarationTypes = { enabled = true }, - -- variableTypes = { enabled = false }, - -- }, - -- }, - -- typescript = { - -- updateImportsOnFileMove = { enabled = "always" }, - -- suggest = { - -- completeFunctionCalls = true, - -- }, - -- inlayHints = { - -- enumMemberValues = { enabled = true }, - -- functionLikeReturnTypes = { enabled = true }, - -- parameterNames = { enabled = "literals" }, - -- parameterTypes = { enabled = true }, - -- propertyDeclarationTypes = { enabled = true }, - -- variableTypes = { enabled = false }, - -- }, - -- }, - -- }, - -- }, + vtsls = { + settings = { + complete_function_calls = true, + vtsls = { + enableMoveToFileCodeAction = true, + autoUseWorkspaceTsdk = true, + experimental = { + completion = { + enableServerSideFuzzyMatch = true, + }, + }, + }, + javascript = { + updateImportsOnFileMove = { enabled = "always" }, + suggest = { + completeFunctionCalls = true, + }, + inlayHints = { + enumMemberValues = { enabled = true }, + functionLikeReturnTypes = { enabled = true }, + parameterNames = { enabled = "literals" }, + parameterTypes = { enabled = true }, + propertyDeclarationTypes = { enabled = true }, + variableTypes = { enabled = false }, + }, + }, + typescript = { + updateImportsOnFileMove = { enabled = "always" }, + suggest = { + completeFunctionCalls = true, + }, + inlayHints = { + enumMemberValues = { enabled = true }, + functionLikeReturnTypes = { enabled = true }, + parameterNames = { enabled = "literals" }, + parameterTypes = { enabled = true }, + propertyDeclarationTypes = { enabled = true }, + variableTypes = { enabled = false }, + }, + }, + }, + }, lua_ls = { settings = { Lua = { diff --git a/.config/nvim/lua/plugins/smear_cursor.lua b/.config/nvim/lua/plugins/smear_cursor.lua new file mode 100644 index 0000000..69fd054 --- /dev/null +++ b/.config/nvim/lua/plugins/smear_cursor.lua @@ -0,0 +1,4 @@ +return { + "sphamba/smear-cursor.nvim", + opts = {}, +} diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua index a563d1f..214b306 100644 --- a/.config/nvim/lua/plugins/snacks.lua +++ b/.config/nvim/lua/plugins/snacks.lua @@ -14,7 +14,7 @@ return { }, picker = { enabled = true }, quickfile = { enabled = true }, - scroll = { enabled = true }, + scroll = { enabled = false }, statuscolumn = { enabled = true }, words = { enabled = true }, styles = { diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 9c06639..a47ab28 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -1,40 +1,41 @@ -- Highlight, edit, and navigate code return { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function () - local configs = require("nvim-treesitter.configs") + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local configs = require("nvim-treesitter.configs") - configs.setup({ - ensure_installed = { - "bash", - "c", - "diff", - "html", - "lua", - "luadoc", - "markdown", - "markdown_inline", - "query", - "vim", - "vimdoc", - "go", - "typescript", - "javascript", - }, - auto_install = true, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - scope_incremental = "", - node_incremental = "", - node_decremental = "", - } - }, - }) - end + configs.setup({ + ensure_installed = { + "bash", + "c", + "diff", + "html", + "lua", + "luadoc", + "markdown", + "markdown_inline", + "query", + "vim", + "vimdoc", + "go", + "typescript", + "javascript", + "tsx", + }, + auto_install = true, + sync_install = true, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + scope_incremental = "", + node_incremental = "", + node_decremental = "", + }, + }, + }) + end, } diff --git a/.config/nvim/lua/plugins/typescript.lua b/.config/nvim/lua/plugins/typescript.lua index 6bd6c00..c3a85aa 100644 --- a/.config/nvim/lua/plugins/typescript.lua +++ b/.config/nvim/lua/plugins/typescript.lua @@ -1,12 +1,12 @@ return { - "pmizio/typescript-tools.nvim", - dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, - opts = { - settings = { - jsx_close_tag = { - enable = true, - filetypes = { "javascriptreact", "typescriptreact" }, - }, - }, - }, + -- "pmizio/typescript-tools.nvim", + -- dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + -- opts = { + -- settings = { + -- jsx_close_tag = { + -- enable = true, + -- filetypes = { "javascriptreact", "typescriptreact" }, + -- }, + -- }, + -- }, } diff --git a/.config/sway/config b/.config/sway/config index 8b24614..b637b79 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -11,7 +11,7 @@ client.urgent #ebcb8b #ebcb8b #2e3440 #8fbcbb #ebcb8b workspace_layout tabbed # default_border normal # default_floating_border none -# font pango:monospace 0.001 +font "Iosevka NF" 10 # titlebar_padding 1 # titlebar_border_thickness 1 # smart_borders off diff --git a/.config/waybar/config b/.config/waybar/config index 9e50c30..22d0fe7 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -11,8 +11,6 @@ "pulseaudio", "backlight", "network", - //"cpu", - // "memory", "battery", "clock", "tray", @@ -29,14 +27,7 @@ }, "clock": { "tooltip-format": "{:%Y %B}\n{calendar}", - "format": " {:%Y-%m-%d %H:%M}" - }, - "cpu": { - "format": " {usage}%", - "tooltip": false - }, - "memory": { - "format": " {}%" + "format": " {:%Y-%m-%d %H:%M}" }, "backlight": { "format": "{icon} {percent}%", @@ -69,10 +60,10 @@ "format-disconnected": "⚠ Disconnected" }, "pulseaudio": { - "format": "{icon} {volume}% {format_source}", + "format": "{icon} {volume}% {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": { @@ -96,7 +87,7 @@ }, "idle_inhibitor": { "start-activated": true, - "format": "{icon}", + "format": " {icon} ", "format-icons": { "activated": "", "deactivated": "" diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 5a505a1..e67486a 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -5,7 +5,7 @@ window { } * { - font-family: Cantarell; + font-family: Iosevka NF; font-size: 14px; font-weight: 600; margin-top: 2px; @@ -85,6 +85,12 @@ window { background-color: @nord10; } +#backlight, +#battery { + padding-left: 0px; +} + + #pulseaudio.muted { background-color: @nord13; color: @nord3;