From e9df39d7eae905dec81c032f45e1d997a474106f Mon Sep 17 00:00:00 2001 From: Josue Zamudio Date: Mon, 6 Oct 2025 21:30:57 -0700 Subject: [PATCH] tmux and nvim changes --- .config/nvim/init.lua | 5 +-- .config/nvim/lazy-lock.json | 34 ++++++++------------ .config/nvim/lua/plugins/lsp-config.lua | 4 ++- .config/nvim/lua/plugins/render-makdown.lua | 2 +- .config/nvim/lua/plugins/treesitter.lua | 9 +++--- .config/nvim/settings.vim | 23 +++++++------ .config/nvim/spell/en.utf-8.add | 2 ++ .config/nvim/spell/en.utf-8.add.spl | Bin 0 -> 61 bytes .config/tmux/tmux.conf | 6 +++- 9 files changed, 41 insertions(+), 44 deletions(-) create mode 100644 .config/nvim/spell/en.utf-8.add create mode 100644 .config/nvim/spell/en.utf-8.add.spl diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 08954f3..23734f4 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -30,15 +30,12 @@ local coq = require 'coq' require("mason").setup() -- used for automatically enabling lsp and coq require("mason-lspconfig").setup() - - -- Settings vim.cmd('source ~/.config/nvim/settings.vim') - - -- colorscheme vim.o.termguicolors = true +vim.opt.winborder = 'rounded' --vim.o.background = "dark" -- or "light" for light mode --vim.cmd("colorscheme gruvbox ") --vim.cmd("colorscheme retrobox") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 0e86e0f..66e03fe 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,30 +1,22 @@ { - "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, - "copilot.vim": { "branch": "release", "commit": "dfe0a3a1c256167d181488a73ec6ccab8d8931a9" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, + "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" }, + "black-metal-theme-neovim": { "branch": "main", "commit": "6d0207871387077f40d5396ab1ae90520e688d36" }, + "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" }, + "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" }, + "coq_nvim": { "branch": "coq", "commit": "d2aeb3221cb46bfd1c51afd1b247d092c52ec0d6" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "e31028f1dba6f7b68a8b9dd3347c489ee4cd3026" }, + "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "48b924e4f3b37f62246873d237a4a89704d88948" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, + "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "2c6cf127c577712bd29d38f6391b3045c5f0180a" }, + "render-markdown.nvim": { "branch": "main", "commit": "ea3678daff66656a9e1c20914d204b7c841c5030" }, "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, - "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" } + "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, + "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" } } diff --git a/.config/nvim/lua/plugins/lsp-config.lua b/.config/nvim/lua/plugins/lsp-config.lua index 2dfba42..fffe64b 100644 --- a/.config/nvim/lua/plugins/lsp-config.lua +++ b/.config/nvim/lua/plugins/lsp-config.lua @@ -5,6 +5,8 @@ return { "neovim/nvim-lspconfig", "ms-jpq/coq_nvim", -- Optional (auto complete) }, - condig = function() + config = function() + --vim.lsp.config('lua_ls',coq.lsp_ensure_capabilities()) + --vim.lsp.config('clangd',coq.lsp_ensure_capabilities()) end } diff --git a/.config/nvim/lua/plugins/render-makdown.lua b/.config/nvim/lua/plugins/render-makdown.lua index 8001d6c..dc0ecb2 100644 --- a/.config/nvim/lua/plugins/render-makdown.lua +++ b/.config/nvim/lua/plugins/render-makdown.lua @@ -1,6 +1,6 @@ return { 'MeanderingProgrammer/render-markdown.nvim', - dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons ---@module 'render-markdown' diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 5beadcf..648f979 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -4,7 +4,7 @@ return { config = function() require("nvim-treesitter.configs").setup { -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" }, + ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make", "markdown"}, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, @@ -14,7 +14,7 @@ return { auto_install = true, -- List of parsers to ignore installing (for "all") - ignore_install = { "javascript" }, + -- ignore_install = { "javascript" }, ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! @@ -40,7 +40,8 @@ return { -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). -- Using this option may slow down your editor, and you may see some duplicate highlights. -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, + -- additional_vim_regex_highlighting = false, }, } -end } +end +} diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim index e3d7b50..2a59797 100644 --- a/.config/nvim/settings.vim +++ b/.config/nvim/settings.vim @@ -1,8 +1,17 @@ set nocompatible syntax on -filetype plugin on -set autoread " Set to auto read when a file is changed from the outside +filetype plugin indent on +set number +set relativenumber +set expandtab +set shiftwidth=4 +set softtabstop=4 +set tabstop=4 +set smartindent +set backspace=indent,eol,start + +set autoread " Set to auto read when a file is changed from the outside set path+=** set wildmenu set showcmd @@ -38,16 +47,6 @@ set colorcolumn=81 "highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen "au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/ -" File settings -au FileType * - \ set tabstop=2 - \ softtabstop=2 - \ shiftwidth=2 - \ textwidth=79 - \ autoindent - \ smartindent - -"Python Specific Config au FileType python \ set fileformat=unix \ encoding=utf-8 diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add new file mode 100644 index 0000000..b03436c --- /dev/null +++ b/.config/nvim/spell/en.utf-8.add @@ -0,0 +1,2 @@ +Generative +ansible diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..2927c422be404d9af3bcc2411f21bbba843af07f GIT binary patch literal 61 zcmWIZ^erw(&B-zP&%nT-%9NPSn8#Smn8}#Ln8TRL$N