Just some updating

Thomashighbaugh · Nov 28, 2023 · 44b1068 · 44b1068
1 parent e173af2
commit 44b1068
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 47 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
   "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "9fb873af43568464f9a1936fc334dfa3d7a59418" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "54a4ea14b70cd3fc9db8217bb4ac9e1f78bfa390" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
   "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
@@ -38,40 +38,39 @@
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "llm.nvim": { "branch": "main", "commit": "7657d65adac2901b4712f73d81d5827d7c0494f4" },
   "lsp_signature.nvim": { "branch": "master", "commit": "4665921ff8e30601c7c1328625b3abc1427a6143" },
-  "lspsaga.nvim": { "branch": "main", "commit": "4d85d4ad3ef6ba9ad0fffe478f834c29b5bfa57c" },
+  "lspsaga.nvim": { "branch": "main", "commit": "d3dfaea0125315110ea720c337ab88aa451d75e7" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f522b5439bedac0225daf8d2fedb5039b59e83ee" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
-  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
+  "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" },
   "mini.indentscope": { "branch": "main", "commit": "c8fdafa7bf603d758986a27eb546c55a5c73b1a3" },
-  "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
+  "mini.pairs": { "branch": "main", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" },
   "monokai-pro.nvim": { "branch": "master", "commit": "70c384c43b9e19b59df3d6489b544ad4df155100" },
   "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
-  "neo-tree.nvim": { "branch": "main", "commit": "f053f09962819c1558cd93639aa80edf7c314c17" },
+  "neo-tree.nvim": { "branch": "main", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" },
   "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" },
+  "nix-develop.nvim": { "branch": "main", "commit": "afea026f5c478c000a8af8de87f7b711676387ab" },
   "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
   "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
   "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
   "nvim-lightbulb": { "branch": "master", "commit": "02aacd93b9b2367e6dbdd20f43b525f701faf834" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e4a56adbc51c55964253dce4505cec55c82c1c04" },
   "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" },
+  "nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" },
   "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "b8ff464f2afc2000f6c72fa331a8fc090cb46b39" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e034579da4d33e99230273e978527c01e5f0feca" },
   "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "quicknote.nvim": { "branch": "master", "commit": "530ee1f74b0ef191a3a8110b5f9d4bdffc7bfd6c" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "9515abd92ae0e42044d47716537f3997991a037b" },
-  "rnvimr": { "branch": "main", "commit": "4f4fbd29e2e0869bea9a8376e06fca4331de60c9" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "47404636a34580db1636dc0cf35027bdf77abba5" },
   "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
   "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" },
   "swenv.nvim": { "branch": "main", "commit": "08aea3e8809ab00dfcab3cebb466dcb8001ad162" },

diff --git a/lua/core/lazy.lua b/lua/core/lazy.lua
@@ -15,6 +15,7 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
   spec = {
     { import = "core.resources" },
+    { import = "core.resources.lang.nix", enabled = true },
     { import = "core.resources.lang.python", enabled = true },
     { import = "core.resources.lang.php", enabled = true },
     { import = "core.resources.lang.typescript", enabled = true },
@@ -28,16 +29,14 @@ require("lazy").setup({
     -- version = false, -- always use the latest git commit
     version = "*", -- try installing the latest stable version for plugins that support semver
   },
-  install = { colorscheme = {  "monokai-pro", "habamax" } },
-  checker = { enabled = false, notify = false },
+  install = { colorscheme = { "monokai-pro" } },
+  checker = { enabled = true, notify = false },
   performance = {
     rtp = {
       -- disable some rtp plugins
       disabled_plugins = {
         "gzip",
-        -- "matchit",
-        -- "matchparen",
-       "netrwPlugin",
+        "netrwPlugin",
         "tarPlugin",
         "tohtml",
         "tutor",

diff --git a/lua/core/resources/editor.lua b/lua/core/resources/editor.lua
@@ -58,15 +58,14 @@ return {
     opts = {
       {
         name = "Tech",
-        path = "/home/tlh/Dropbox/Wiki",
+        path = "/home/tlh/DB/Wiki/",
       },
       {
         name = "SanatanaDharma",
-        path = "/home/tlh/Dropbox/HinduismWiki",
+        path = "/home/tlh/DB/HinduismWiki",
       },
     },
     keys = {
-      { "<leader>ww", ':lua require("kiwi").open_wiki_index()<cr>', desc = "Open Wiki index" },
       {
         "<leader>wp",
         ':lua require("kiwi").open_wiki_index("Tech")<cr>',
@@ -264,15 +263,15 @@ return {
         ["f"] = { name = "Fold" },
         ["g"] = { name = "Goto" },
         ["s"] = { name = "Search" },
-        ["<leader>s"] = {name = "+LSP"}
+        ["<leader>s"] = { name = "+LSP" },
       }
       wk.register(keymaps)
       wk.register({
         C = {
           name = "Comment Box",
-b = {"<cmd>Bllbox5<cr>", "left aligned fixed size box"},
-r = { "<cmd>CBrrbox5<cr>", "right aligned fixed size box with left aligned text" },
-c ={ "<cmd>CBccbox5<cr>","center aligned fixed size box with center aligned text" },
+          b = { "<cmd>Bllbox5<cr>", "left aligned fixed size box" },
+          r = { "<cmd>CBrrbox5<cr>", "right aligned fixed size box with left aligned text" },
+          c = { "<cmd>CBccbox5<cr>", "center aligned fixed size box with center aligned text" },
         },
         x = {
           name = "Trouble",

diff --git a/lua/core/resources/lang/nix.lua b/lua/core/resources/lang/nix.lua
@@ -0,0 +1,3 @@
+return{
+  { 'figsoda/nix-develop.nvim'}
+}
diff --git a/lua/core/resources/lsp.lua b/lua/core/resources/lsp.lua
@@ -144,7 +144,27 @@ return {
     cmd = "Mason",
     opts = {
       ensure_installed = {
+        -- LSPs
+        "bash-language-server",
+        "dockerfile-language-server",
+        "json-lsp",
+        "marksman",
+        "typescript-language-server",
+        "texlab",
+        "ltex-ls",
+        "lua-language-server",
+        "pyright",
+        "terraform-ls",
+        "yaml-language-server",
+        -- Formatter
+        "black",
+        "prettier",
         "stylua",
+        "shfmt",
+        -- Linter
+        "shellcheck",
+        "tflint",
+        "yamllint",
       },
     },
     config = function(_, opts)
@@ -256,7 +276,7 @@ return {
           formatting.stylua.with(modifier.stylua_formatting),
           formatting.markdownlint,
           formatting.beautysh.with({ extra_args = { "--indent-size", "2" } }),
-          formatting.prettierd.with({
+          formatting.prettier.with({
             extra_args = { "--single-quote", "false" },
             filetypes = {
               "html",

diff --git a/lua/core/resources/tools.lua b/lua/core/resources/tools.lua
@@ -1,23 +1,4 @@
 return {
-  {
-    "kevinhwang91/rnvimr",
-    event = { "BufReadPost", "BufNewFile" },
-    keys = { { "<leader>r", "<cmd>RnvimrToggle<cr>", desc = "Open file manager" } },
-    init = function()
-      -- Make Ranger to be hidden after picking a file
-      vim.g.rnvimr_enable_picker = 1
-
-      -- Change the border's color
-      -- vim.g.rnvimr_border_attr = { fg = 31, bg = -1 }
-      vim.g.rnvimr_border_attr = { fg = 3, bg = -1 }
-
-      -- Draw border with both
-      vim.g.rnvimr_ranger_cmd = { "ranger", "--cmd=set draw_borders both" }
-
-      -- Add a shadow window, value is equal to 100 will disable shadow
-      vim.g.rnvimr_shadow_winblend = 90
-    end,
-  },
 
   {
     "mg979/vim-visual-multi",

diff --git a/lua/core/resources/ui.lua b/lua/core/resources/ui.lua
@@ -59,8 +59,8 @@ return {
       return {
         options = {
           diagnostics = "nvim_lsp", -- | "nvim_lsp" | "coc",
-          -- separator_style = "", -- | "thick" | "thin" | "slope" | { 'any', 'any' },
-          separator_style = { "", "" }, -- | "thick" | "thin" | { 'any', 'any' },
+          separator_style = "", -- | "thick" | "thin" | "slope" | { 'any', 'any' },
+          -- separator_style = { "thick", "thick" }, -- | "thick" | "thin" | { 'any', 'any' },
           -- separator_style = "slant", -- | "thick" | "thin" | { 'any', 'any' },
           indicator = {
             -- icon = " ",