nvim,sway,wezterm

This commit is contained in:
Greg 2025-04-28 13:48:46 +03:00
parent 5e294c4456
commit a68d315a47
7 changed files with 66 additions and 19 deletions

View file

@ -51,4 +51,4 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_completion:\x1d
SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_description:\x1d
SETUVAR fish_pager_color_selected_prefix:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d
SETUVAR fish_user_paths:/opt/keymapp\x1e/opt/zen\x1e/home/foton/\x2ebin/stylua\x1e/home/foton/\x2ebin/lua\x2dlsp/bin\x1e/home/foton/\x2escripts\x1e/home/foton/\x2ebin\x1e/opt/Obsidian\x1e/home/foton/go/bin\x1e/home/foton/code/dart\x2dsdk/bin\x1e/home/greg/\x2elocal/bin\x1e/home/greg/\x2ebin\x1e/home/greg/\x2ecargo/bin\x1e/home/greg/go/bin\x1e/usr/local/go/bin SETUVAR fish_user_paths:/opt/ghostty\x1e/opt/keymapp\x1e/opt/zen\x1e/home/foton/\x2ebin/stylua\x1e/home/foton/\x2ebin/lua\x2dlsp/bin\x1e/home/foton/\x2escripts\x1e/home/foton/\x2ebin\x1e/opt/Obsidian\x1e/home/foton/go/bin\x1e/home/foton/code/dart\x2dsdk/bin\x1e/home/greg/\x2elocal/bin\x1e/home/greg/\x2ebin\x1e/home/greg/\x2ecargo/bin\x1e/home/greg/go/bin\x1e/usr/local/go/bin

View file

@ -1,22 +1,21 @@
{ {
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" }, "friendly-snippets": { "branch": "main", "commit": "fc8f183479a472df60aa86f00e295462f2308178" },
"js-i18n.nvim": { "branch": "main", "commit": "124f22f91d51e85641ba10e9a32f3b858394c2dd" }, "js-i18n.nvim": { "branch": "main", "commit": "124f22f91d51e85641ba10e9a32f3b858394c2dd" },
"lackluster.nvim": { "branch": "main", "commit": "d2519d14b2b6e9eef05752d5d4486ed5c48d6178" }, "lackluster.nvim": { "branch": "main", "commit": "d2519d14b2b6e9eef05752d5d4486ed5c48d6178" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
"nvim-lspconfig": { "branch": "master", "commit": "442e077e326ac467daf9cd63e72120fb450a850b" }, "nvim-lspconfig": { "branch": "master", "commit": "88d0824d85c0f74a012521d25678a5b01c76feb1" },
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"smear-cursor.nvim": { "branch": "main", "commit": "a76711e1084b8732ff9f87856e4956c62b7e23ee" }, "smear-cursor.nvim": { "branch": "main", "commit": "8820b313e49a018c7d56fc309c51363c0e9ae653" },
"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" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
} }

View file

@ -74,7 +74,6 @@ vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()" vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
vim.opt.foldtext = "" vim.opt.foldtext = ""
vim.opt.foldnestmax = 3 -- vim.opt.foldnestmax = 3
vim.opt.foldlevel = 99 vim.opt.foldlevel = 99
vim.opt.foldlevelstart = 99 vim.opt.foldlevelstart = 99

View file

@ -38,7 +38,7 @@ return {
parameterNames = { enabled = "literals" }, parameterNames = { enabled = "literals" },
parameterTypes = { enabled = true }, parameterTypes = { enabled = true },
propertyDeclarationTypes = { enabled = true }, propertyDeclarationTypes = { enabled = true },
variableTypes = { enabled = false }, variableTypes = { enabled = true },
}, },
}, },
typescript = { typescript = {
@ -52,7 +52,7 @@ return {
parameterNames = { enabled = "literals" }, parameterNames = { enabled = "literals" },
parameterTypes = { enabled = true }, parameterTypes = { enabled = true },
propertyDeclarationTypes = { enabled = true }, propertyDeclarationTypes = { enabled = true },
variableTypes = { enabled = false }, variableTypes = { enabled = true },
}, },
}, },
}, },
@ -76,12 +76,10 @@ return {
-- Special formatted fields cannot be set above -- Special formatted fields cannot be set above
-- servers.vtsls.settings["js/ts"] = { implicitProjectConfig = { checkJs = true } } -- servers.vtsls.settings["js/ts"] = { implicitProjectConfig = { checkJs = true } }
local ensure_installed = vim.tbl_keys(servers or {})
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = ensure_installed, ensure_installed = vim.tbl_keys(servers or {}),
automatic_installation = false, automatic_installation = false,
handlers = { handlers = {
function(server_name) function(server_name)

View file

@ -213,7 +213,26 @@ return {
{ {
"<leader>ss", "<leader>ss",
function() function()
Snacks.picker.lsp_symbols() Snacks.picker.lsp_symbols({
filter = {
default = {
"Class",
"Constructor",
"Enum",
"Field",
"Function",
"Interface",
"Method",
"Module",
"Namespace",
"Package",
"Property",
"Struct",
"Trait",
"Variable",
},
},
})
end, end,
desc = "LSP Symbols", desc = "LSP Symbols",
}, },

View file

@ -28,9 +28,10 @@ set $left h
set $down j set $down j
set $up k set $up k
set $right l set $right l
set $term kitty set $term wezterm
set $browser firefox set $browser firefox
set $menu fish -c 'rofi -show run -terminal $term' set $menu fish -c 'rofi -show run -terminal $term'
set $windows fish -c 'rofi -show window'
set $laptop eDP-1 set $laptop eDP-1
set $external DP-1 set $external DP-1
@ -103,7 +104,7 @@ input "type:keyboard" {
bindsym --to-code $mod+Return exec $term bindsym --to-code $mod+Return exec $term
bindsym --to-code $mod+Shift+q kill bindsym --to-code $mod+Shift+q kill
bindsym --to-code $mod+Space exec $menu bindsym --to-code $mod+Space exec $menu
bindsym --to-code $mod+Tab workspace next bindsym --to-code $mod+Tab exec $windows
bindsym --to-code $mod+Backspace exec ~/.scripts/kitty_shell.fish ~/.scripts/power.fish bindsym --to-code $mod+Backspace exec ~/.scripts/kitty_shell.fish ~/.scripts/power.fish
bindsym --to-code $mod+Slash exec ~/.scripts/kitty_shell.fish ~/.scripts/switcher.fish bindsym --to-code $mod+Slash exec ~/.scripts/kitty_shell.fish ~/.scripts/switcher.fish
bindsym --to-code $mod+grave exec ~/.scripts/shot.fish bindsym --to-code $mod+grave exec ~/.scripts/shot.fish

View file

@ -0,0 +1,31 @@
-- Pull in the wezterm API
local wezterm = require("wezterm")
-- This will hold the configuration.
local config = wezterm.config_builder()
-- This is where you actually apply your config choices
-- For example, changing the color scheme:
config.color_scheme = "Tokyo Night Storm"
config.font = wezterm.font("Iosevka Nerd Font")
config.use_fancy_tab_bar = false
config.hide_tab_bar_if_only_one_tab = true
config.window_padding = {
left = 0,
right = 0,
top = 0,
bottom = 0,
}
config.keys = {
{ key = "v", mods = "CTRL", action = wezterm.action.PasteFrom("Clipboard") },
{ key = "c", mods = "CTRL", action = wezterm.action.CopyTo("ClipboardAndPrimarySelection") },
{ key = "C", mods = "CTRL", action = wezterm.action.SendString("\x03") },
}
-- and finally, return the configuration to wezterm
return config