Merge branch 'master' of ssh://server.zamudio.dev:30009/jozamudi/dotfiles

.gitignore

@@ -0,0 +1 @@
+./nvim/lazy-lock.json

nvim/lazy-lock.json

@@ -1,24 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" },
-  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "60f6805b12a12e8a912aeb2f975dec1794a8994e" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "neorg": { "branch": "main", "commit": "f3fce02055f8beec59926086c9fb5c25b5072679" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa199c5bbdbb7fd28b56212a89206f13db02799e" },
-  "nvim-treesitter": { "branch": "master", "commit": "ca46eb3ac96cd96e963895004589f0c9b2a44491" },
-  "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
-  "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
-  "vimtex": { "branch": "master", "commit": "9df79e15bf035d1cfb32c11fffed38dd7b6a0501" }
-}

nvim/lua/plugins/neorg.lua

@@ -1,26 +0,0 @@
-return {
-    "nvim-neorg/neorg",
-    build = ":Neorg sync-parsers",
-    dependencies = { "nvim-lua/plenary.nvim" },
-    config = function()
-        require("neorg").setup {
-            load = {
-                ["core.defaults"] = {}, -- Loads default behaviour
-                ["core.concealer"] = {}, -- Adds pretty icons to your documents
-                ["core.summary"] = {}, 
-                ["core.tempus"] = {}, 
-                ["core.dirman"] = {
-                    config = {
-                        workspaces = {
-                            work = "~/Documents/Slac/"
-                        },
-                    },
-                }, -- Manages Neorg workspaces
-                ["core.fs"] = {}, 
-                ["core.integrations.treesitter"] = {}, 
-                ["core.ui.calendar"] = {}, 
-            },
-
-        }
-    end
-}

nvim/lua/plugins/vimtex.lua

@@ -1,18 +0,0 @@
-return{
-    'lervag/vimtex',
-    config = function()
-        -- This is necessary for VimTeX to load properly. The "indent" is optional.
-        -- Note that most plugin managers will do this automatically.
-        vim.cmd("filetype plugin indent on")
-
-        -- This enables Vim's and neovim's syntax-related features. Without this, some
-        -- VimTeX features will not work (see ":help vimtex-requirements" for more
-        --info).
-        vim.cmd("syntax enable")
-
-        -- Viewer options: One may configure the viewer either by specifying a built-in
-        -- viewer method:
-        vim.cmd("let g:vimtex_view_method = 'zathura'")
-
-    end,
-}

nvim/settings.vim

@@ -63,9 +63,9 @@ map Q gq
 " Python settings.  With filetype detection on, these settings will be used
 " for all .py files.
 au FileType python
-    \ set tabstop=4
+    \ set tabstop=2
-    \     softtabstop=4
+    \     softtabstop=2
-    \     shiftwidth=4
+    \     shiftwidth=2
     \     textwidth=79
     \     expandtab
     \     autoindent
@@ -104,17 +104,6 @@ set mouse=
 
 set clipboard+=unnamedplus
 
-" set backup, undo, and swap?
-let &directory = expand('~/.vimdata/swap/')
-set backup
-let &backupdir = expand('~/.vimdata/backup/')
-set undofile
-let &undodir = expand('~/.vimdata/undo/')
-
-if !isdirectory(&undodir) | call mkdir(&undodir, "p") | endif
-if !isdirectory(&backupdir) | call mkdir(&backupdir, "p") | endif
-if !isdirectory(&directory) | call mkdir(&directory, "p") | endif
-
 set pumheight=20 " keep the autocomplete suggestion menu small
 set shortmess+=c " don't give ins-completion-menu messages