nvim,sway,kitty,waybar

This commit is contained in:
Greg 2025-04-23 23:50:52 +03:00
parent e9c0cb5092
commit 5e294c4456
13 changed files with 157 additions and 149 deletions

View file

@ -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 --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 --export RANGER_LOAD_DEFAULT_RC:FALSE
SETUVAR Z_DATA_DIR:/home/foton/\x2elocal/share/z 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_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_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 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_param:eceff4
SETUVAR fish_color_quote:a3be8c SETUVAR fish_color_quote:a3be8c
SETUVAR fish_color_redirection:b48ead 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_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_status:red SETUVAR fish_color_status:red
SETUVAR fish_color_user:brgreen SETUVAR fish_color_user:brgreen

View file

@ -2,8 +2,9 @@ map ctrl+c copy_to_clipboard
map ctrl+v paste_from_clipboard map ctrl+v paste_from_clipboard
map ctrl+shift+c send_text all \x03 map ctrl+shift+c send_text all \x03
map ctrl+shift+s show_scrollback map ctrl+shift+s show_scrollback
font_size 12.0 font_size 11.0
font_family 0xProto Nerd Font Mono # font_family 0xProto Nerd Font Mono
font_family Iosevka Nerd Font Mono
touch_scroll_multiplier 5.0 touch_scroll_multiplier 5.0
scrollback_pager ~/.scripts/pager.sh +INPUT_LINE_NUMBER +CURSOR_LINE +CURSOR_COLUMN scrollback_pager ~/.scripts/pager.sh +INPUT_LINE_NUMBER +CURSOR_LINE +CURSOR_COLUMN
include ./nord.conf include ./nord.conf

View file

@ -14,6 +14,7 @@
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"smear-cursor.nvim": { "branch": "main", "commit": "a76711e1084b8732ff9f87856e4956c62b7e23ee" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"typescript-tools.nvim": { "branch": "master", "commit": "a4109c70e7d6a3a86f971cefea04ab6720582ba9" }, "typescript-tools.nvim": { "branch": "master", "commit": "a4109c70e7d6a3a86f971cefea04ab6720582ba9" },

View file

@ -21,14 +21,14 @@ return {
end, end,
desc = "Flash", desc = "Flash",
}, },
{ -- {
"S", -- "S",
mode = { "n", "x", "o" }, -- mode = { "n", "x", "o" },
function() -- function()
require("flash").treesitter() -- require("flash").treesitter()
end, -- end,
desc = "Flash Treesitter", -- desc = "Flash Treesitter",
}, -- },
{ {
"R", "R",
mode = { "o", "x" }, mode = { "o", "x" },
@ -36,6 +36,6 @@ return {
require("flash").treesitter_search() require("flash").treesitter_search()
end, end,
desc = "Treesitter Search", desc = "Treesitter Search",
} },
} },
} }

View file

@ -6,5 +6,9 @@ return {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
}, },
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
opts = {}, opts = {
virt_text = {
enabled = false, -- Enable virtual text display
},
},
} }

View file

@ -15,48 +15,48 @@ return {
}, },
}, },
marksman = {}, marksman = {},
-- vtsls = { vtsls = {
-- settings = { settings = {
-- complete_function_calls = true, complete_function_calls = true,
-- vtsls = { vtsls = {
-- enableMoveToFileCodeAction = true, enableMoveToFileCodeAction = true,
-- autoUseWorkspaceTsdk = true, autoUseWorkspaceTsdk = true,
-- experimental = { experimental = {
-- completion = { completion = {
-- enableServerSideFuzzyMatch = true, enableServerSideFuzzyMatch = true,
-- }, },
-- }, },
-- }, },
-- javascript = { javascript = {
-- updateImportsOnFileMove = { enabled = "always" }, updateImportsOnFileMove = { enabled = "always" },
-- suggest = { suggest = {
-- completeFunctionCalls = true, completeFunctionCalls = true,
-- }, },
-- inlayHints = { inlayHints = {
-- enumMemberValues = { enabled = true }, enumMemberValues = { enabled = true },
-- functionLikeReturnTypes = { enabled = true }, functionLikeReturnTypes = { enabled = true },
-- parameterNames = { enabled = "literals" }, parameterNames = { enabled = "literals" },
-- parameterTypes = { enabled = true }, parameterTypes = { enabled = true },
-- propertyDeclarationTypes = { enabled = true }, propertyDeclarationTypes = { enabled = true },
-- variableTypes = { enabled = false }, variableTypes = { enabled = false },
-- }, },
-- }, },
-- typescript = { typescript = {
-- updateImportsOnFileMove = { enabled = "always" }, updateImportsOnFileMove = { enabled = "always" },
-- suggest = { suggest = {
-- completeFunctionCalls = true, completeFunctionCalls = true,
-- }, },
-- inlayHints = { inlayHints = {
-- enumMemberValues = { enabled = true }, enumMemberValues = { enabled = true },
-- functionLikeReturnTypes = { enabled = true }, functionLikeReturnTypes = { enabled = true },
-- parameterNames = { enabled = "literals" }, parameterNames = { enabled = "literals" },
-- parameterTypes = { enabled = true }, parameterTypes = { enabled = true },
-- propertyDeclarationTypes = { enabled = true }, propertyDeclarationTypes = { enabled = true },
-- variableTypes = { enabled = false }, variableTypes = { enabled = false },
-- }, },
-- }, },
-- }, },
-- }, },
lua_ls = { lua_ls = {
settings = { settings = {
Lua = { Lua = {

View file

@ -0,0 +1,4 @@
return {
"sphamba/smear-cursor.nvim",
opts = {},
}

View file

@ -14,7 +14,7 @@ return {
}, },
picker = { enabled = true }, picker = { enabled = true },
quickfile = { enabled = true }, quickfile = { enabled = true },
scroll = { enabled = true }, scroll = { enabled = false },
statuscolumn = { enabled = true }, statuscolumn = { enabled = true },
words = { enabled = true }, words = { enabled = true },
styles = { styles = {

View file

@ -21,9 +21,10 @@ return {
"go", "go",
"typescript", "typescript",
"javascript", "javascript",
"tsx",
}, },
auto_install = true, auto_install = true,
sync_install = false, sync_install = true,
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
@ -33,8 +34,8 @@ return {
scope_incremental = "<CR>", scope_incremental = "<CR>",
node_incremental = "<TAB>", node_incremental = "<TAB>",
node_decremental = "<S-TAB>", node_decremental = "<S-TAB>",
} },
}, },
}) })
end end,
} }

View file

@ -1,12 +1,12 @@
return { return {
"pmizio/typescript-tools.nvim", -- "pmizio/typescript-tools.nvim",
dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, -- dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
opts = { -- opts = {
settings = { -- settings = {
jsx_close_tag = { -- jsx_close_tag = {
enable = true, -- enable = true,
filetypes = { "javascriptreact", "typescriptreact" }, -- filetypes = { "javascriptreact", "typescriptreact" },
}, -- },
}, -- },
}, -- },
} }

View file

@ -11,7 +11,7 @@ client.urgent #ebcb8b #ebcb8b #2e3440 #8fbcbb #ebcb8b
workspace_layout tabbed workspace_layout tabbed
# default_border normal # default_border normal
# default_floating_border none # default_floating_border none
# font pango:monospace 0.001 font "Iosevka NF" 10
# titlebar_padding 1 # titlebar_padding 1
# titlebar_border_thickness 1 # titlebar_border_thickness 1
# smart_borders off # smart_borders off

View file

@ -11,8 +11,6 @@
"pulseaudio", "pulseaudio",
"backlight", "backlight",
"network", "network",
//"cpu",
// "memory",
"battery", "battery",
"clock", "clock",
"tray", "tray",
@ -31,13 +29,6 @@
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": " {:%Y-%m-%d %H:%M}" "format": " {:%Y-%m-%d %H:%M}"
}, },
"cpu": {
"format": " {usage}%",
"tooltip": false
},
"memory": {
"format": " {}%"
},
"backlight": { "backlight": {
"format": "{icon} {percent}%", "format": "{icon} {percent}%",
"format-icons": [ "format-icons": [

View file

@ -5,7 +5,7 @@ window {
} }
* { * {
font-family: Cantarell; font-family: Iosevka NF;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
margin-top: 2px; margin-top: 2px;
@ -85,6 +85,12 @@ window {
background-color: @nord10; background-color: @nord10;
} }
#backlight,
#battery {
padding-left: 0px;
}
#pulseaudio.muted { #pulseaudio.muted {
background-color: @nord13; background-color: @nord13;
color: @nord3; color: @nord3;