This commit is contained in:
2025-09-14 22:06:00 -07:00
parent 9fbf3bc8c1
commit 91fe229e59
8 changed files with 118 additions and 107 deletions

View File

@@ -1,5 +1,8 @@
font_family 'JetBrainsMono NF' font_family 'JetBrainsMono NF'
font_size 11.5 font_size 11.5
bold_font auto
italic_font auto
bold_italic_font auto
text_composition_strategy legacy text_composition_strategy legacy
modify_font cell_width 95% modify_font cell_width 95%
@@ -10,4 +13,6 @@ shell_integration no-cursor
cursor_trail_decay 0.01 0.15 cursor_trail_decay 0.01 0.15
cursor_shape block cursor_shape block
#include ~/.cache/wal/colors-kitty.conf linux_display_server wayland
wayland_enable_ime yes

View File

@@ -1,30 +1,30 @@
{ {
"LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" },
"async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" },
"auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" }, "auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
"copilot.vim": { "branch": "release", "commit": "3955014c503b0cd7b30bc56c86c56c0736ca0951" }, "copilot.vim": { "branch": "release", "commit": "dfe0a3a1c256167d181488a73ec6ccab8d8931a9" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "320d5913bc5a0b0f15537e32777331d2323ab7f8" }, "lsp-zero.nvim": { "branch": "v2.x", "commit": "e31028f1dba6f7b68a8b9dd3347c489ee4cd3026" },
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb30c422329e86fcaa4e4920181f6715d634e516" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" },
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
"mini.nvim": { "branch": "main", "commit": "3f5d06a6f710966cb93baaadc4897eeb6d6210e5" }, "mini.nvim": { "branch": "main", "commit": "48b924e4f3b37f62246873d237a4a89704d88948" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-lspconfig": { "branch": "master", "commit": "99d3a0f26bfe402f45257c1398287aef252cbe2d" }, "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"render-markdown.nvim": { "branch": "main", "commit": "76f7ce56ccb913632745714f160faa53164c5574" }, "render-markdown.nvim": { "branch": "main", "commit": "2c6cf127c577712bd29d38f6391b3045c5f0180a" },
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
"vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" },
"vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" } "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }
} }

View File

@@ -1,81 +1,80 @@
return { return {
'VonHeikemen/lsp-zero.nvim', 'VonHeikemen/lsp-zero.nvim',
branch = 'v2.x', branch = 'v2.x',
dependencies = { dependencies = {
-- LSP Support -- LSP Support
{'neovim/nvim-lspconfig'}, -- Required { 'neovim/nvim-lspconfig' }, -- Required
{'williamboman/mason.nvim'}, -- Optional { 'williamboman/mason.nvim' }, -- Optional
{'williamboman/mason-lspconfig.nvim'}, -- Optional { 'williamboman/mason-lspconfig.nvim' }, -- Optional
-- Autocompletion -- Autocompletion
{'hrsh7th/nvim-cmp'}, -- Required { 'hrsh7th/nvim-cmp' }, -- Required
{'hrsh7th/cmp-nvim-lsp'}, -- Required { 'hrsh7th/cmp-nvim-lsp' }, -- Required
{'hrsh7th/cmp-buffer'}, -- Optional { 'hrsh7th/cmp-buffer' }, -- Optional
{'hrsh7th/cmp-path'}, -- Optional { 'hrsh7th/cmp-path' }, -- Optional
{'saadparwaiz1/cmp_luasnip'}, -- Optional { 'saadparwaiz1/cmp_luasnip' }, -- Optional
{'hrsh7th/cmp-nvim-lua'}, -- Optional { 'hrsh7th/cmp-nvim-lua' }, -- Optional
-- snippets -- snippets
{'L3MON4D3/LuaSnip'}, -- Required { 'L3MON4D3/LuaSnip' }, -- Required
{'rafamadriz/friendly-snippets'}, -- Optional { 'rafamadriz/friendly-snippets' }, -- Optional
}, },
config = function() config = function()
local lsp = require('lsp-zero') local lsp = require('lsp-zero')
lsp.preset('recommended') lsp.preset('recommended')
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
local opts = {buffer = bufnr, remap = false} local opts = { buffer = bufnr, remap = false }
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts) vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<leader>ca", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "<leader>ca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>rr", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "<leader>rr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>rn", function() vim.lsp.buf.rename() end, opts) vim.keymap.set("n", "<leader>rn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
end)
end) local lspconfig = require('lspconfig')
local root_pattern = require('lspconfig.util').root_pattern
local lspconfig = require('lspconfig') lspconfig['jedi_language_server'].setup {
local root_pattern = require('lspconfig.util').root_pattern root_dir = root_pattern('.git', 'setup.py')
}
lspconfig['jedi_language_server'].setup{ lspconfig['lua_ls'].setup {
root_dir = root_pattern('.git', 'setup.py') settings = {
} Lua = {
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = { 'vim' },
},
},
},
}
lspconfig['lua_ls'].setup{ local cmp = require('cmp')
settings = { local cmp_action = require('lsp-zero').cmp_action()
Lua = { require('luasnip.loaders.from_vscode').lazy_load()
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = {'vim'},
},
},
},
}
local cmp = require('cmp') cmp.setup({
local cmp_action = require('lsp-zero').cmp_action() mapping = {
require('luasnip.loaders.from_vscode').lazy_load() ['<CR>'] = cmp.mapping.confirm({ select = false }),
['<C-f>'] = cmp_action.luasnip_jump_forward(),
['<C-b>'] = cmp_action.luasnip_jump_backward(),
},
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end
},
})
cmp.setup({ lsp.setup()
mapping = { end
['<CR>'] = cmp.mapping.confirm({select = false}),
['<C-f>'] = cmp_action.luasnip_jump_forward(),
['<C-b>'] = cmp_action.luasnip_jump_backward(),
},
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end
},
})
lsp.setup()
end
} }

View File

@@ -30,6 +30,7 @@ set ttyfast
set laststatus=1 set laststatus=1
set t_Co=256 set t_Co=256
set background=dark set background=dark
let &t_ut=''
set colorcolumn=81 set colorcolumn=81
hi ColorColumn ctermbg=lightgrey guibg=lightgrey hi ColorColumn ctermbg=lightgrey guibg=lightgrey
@@ -41,25 +42,24 @@ au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\
" File settings " File settings
au FileType * au FileType *
\ set tabstop=2 \ set tabstop=2
\ softtabstop=2 \ softtabstop=2
\ shiftwidth=2 \ shiftwidth=2
\ textwidth=79 \ textwidth=79
\ autoindent \ autoindent
\ smartindent \ smartindent
"Python Specific Config "Python Specific Config
au FileType python au FileType python
\ set fileformat=unix \ set fileformat=unix
\ tabstop=4 \ tabstop=4
\ softtabstop=4 \ softtabstop=4
\ shiftwidth=4 \ shiftwidth=4
\ encoding=utf-8 \ encoding=utf-8
au FileType markdown au FileType markdown,tex
\ set spell spelllang=en_us \ set spell spelllang=en_us
\ tabstop=4 \ tabstop=4
\ softtabstop=4 \ softtabstop=4
\ shiftwidth=4 \ shiftwidth=4

View File

@@ -19,10 +19,11 @@ set $laptop eDP-1
include ~/.config/sway/config.d/* include ~/.config/sway/config.d/*
### Output configuration ### Output configuration
# You can get the names of your outputs by running: swaymsg -t get_outputs # You can get the names of your outputs by running: swaymsg -t get_outputs
# https://gitlab.com/w0lff/shikane for multitple display handling # https://gitlab.com/w0lff/shikane for multitple display handling
output * bg /home/jozamudi/Downloads/samurai-cyberpunk-3840x2160-12877.png fill #output * bg /home/jozamudi/Downloads/samurai-cyberpunk-3840x2160-12877.png fill
output eDP-1 scale 1.8 output eDP-1 scale 1.8
#output 'BNQ BenQ PD3200U S2N01233019' scale 1.5 #output 'BNQ BenQ PD3200U S2N01233019' scale 1.5
@@ -32,12 +33,18 @@ bindswitch --reload --locked lid:on output $laptop disable
bindswitch --reload --locked lid:off output $laptop enable bindswitch --reload --locked lid:off output $laptop enable
exec_always --no-startup-id '/home/jozamudi/.config/sway/scripts/clamshell-mode.sh' exec_always --no-startup-id '/home/jozamudi/.config/sway/scripts/clamshell-mode.sh'
#input "1267:12792:ELAN067B:00_04F3:31F8_Touchpad" {
# dwt enabled
# tap enabled
# middle_emulation enabled
#}
### Idle configuration ### Idle configuration
exec swayidle -w \ exec swayidle -w \
timeout 300 'swaylock -f -c 000000' \ timeout 300 'swaylock -f -c 000000' \
timeout 600 'swaymsg "output * power off"' \ timeout 600 'swaymsg "output * power off"' \
resume 'swaymsg "output * power on"' \ resume 'swaymsg "output * power on"' \
before-sleep 'playerctl pause; swaymsg output $laptop power on; swaylock -f -c 000000' before-sleep 'swaylock -f -c 000000'
seat seat0 xcursor_theme Adwaita 25 seat seat0 xcursor_theme Adwaita 25

View File

@@ -90,15 +90,15 @@ mode "resize" {
# right will grow the containers width # right will grow the containers width
# up will shrink the containers height # up will shrink the containers height
# down will grow the containers height # down will grow the containers height
bindsym $right resize shrink width 10px bindsym $left resize shrink width 10px
bindsym $down resize grow height 10px bindsym $down resize grow height 10px
bindsym $up resize shrink height 10px bindsym $up resize shrink height 10px
bindsym $left resize grow width 10px bindsym $right resize grow width 10px
bindsym Shift+$right resize shrink width 40px bindsym Shift+$left resize shrink width 40px
bindsym Shift+$down resize grow height 40px bindsym Shift+$down resize grow height 40px
bindsym Shift+$up resize shrink height 40px bindsym Shift+$up resize shrink height 40px
bindsym Shift+$left resize grow width 40px bindsym Shift+$right resize grow width 40px
# Ditto, with arrow keys # Ditto, with arrow keys
bindsym Left resize shrink width 10px bindsym Left resize shrink width 10px
@@ -116,8 +116,8 @@ bindsym $mod+Shift+s sticky toggle
#bindsym $mod+Shift+o exec 'playerctl pause && swaylock -c 0x0000' #bindsym $mod+Shift+o exec 'playerctl pause && swaylock -c 0x0000'
# Toggle laptop display # Toggle laptop display
bindsym $mod+m output $laptop toggle bindsym $mod+shift+m output $laptop toggle
bindsym $mod+shift+m exec bash -c 'playerctl pause; swaymsg output $laptop power on; swaylock -f -c 000000' bindsym $mod+m exec bash -c 'playerctl pause; swaymsg output $laptop power on; swaylock -f -c 000000'
# play/pause media player # play/pause media player
#bindsym XF86Favorites exec playerctl play-pause #bindsym XF86Favorites exec playerctl play-pause

View File

@@ -4,10 +4,10 @@ clock
timestr=%R timestr=%R
datestr=%a, %e of %B datestr=%a, %e of %B
screenshots
fade-in=0.2 fade-in=0.2
#screenshots
effect-blur=20x2 effect-blur=20x2
#effect-greyscale #effect-greyscale
effect-scale=0.3 effect-scale=0.3

View File

@@ -29,8 +29,8 @@
//"sway/language", //"sway/language",
"battery", "battery",
//"battery#bat2", //"battery#bat2",
"clock" "clock",
//"tray" "tray"
//"custom/power" //"custom/power"
], ],
// Modules configuration // Modules configuration