Nvim: further cleanup

.config/alacritty/alacritty.yml

@@ -911,7 +911,10 @@ key_bindings:
   # Highlight window damage information.
   #highlight_damage: false
 import:
+  # - ~/various/alacritty-theme/themes/Cobalt2.yaml
   # - ~/various/alacritty-theme/themes/afterglow.yaml
+  # - ~/various/alacritty-theme/themes/alabaster.yaml
+  # - ~/various/alacritty-theme/themes/alabaster_dark.yaml
   # - ~/various/alacritty-theme/themes/argonaut.yaml
   # - ~/various/alacritty-theme/themes/atom_one_light.yaml
   # - ~/various/alacritty-theme/themes/ayu_dark.yaml
@@ -921,9 +924,9 @@ import:
   # - ~/various/alacritty-theme/themes/bluish.yaml
   # - ~/various/alacritty-theme/themes/breeze.yaml
   # - ~/various/alacritty-theme/themes/campbell.yaml
+  # - ~/various/alacritty-theme/themes/carbonfox.yaml
   # - ~/various/alacritty-theme/themes/challenger_deep.yaml
   # - ~/various/alacritty-theme/themes/citylights.yaml
-  # - ~/various/alacritty-theme/themes/Cobalt2.yaml
   # - ~/various/alacritty-theme/themes/cyber_punk_neon.yaml
   # - ~/various/alacritty-theme/themes/darcula.yaml
   # - ~/various/alacritty-theme/themes/dark_pastels.yaml
@@ -944,7 +947,7 @@ import:
   # - ~/various/alacritty-theme/themes/gotham.yaml
   # - ~/various/alacritty-theme/themes/gruvbox_dark.yaml
   # - ~/various/alacritty-theme/themes/gruvbox_light.yaml
-  # - ~/various/alacritty-theme/themes/gruvbox_material.yaml
+  - ~/various/alacritty-theme/themes/gruvbox_material.yaml
   # - ~/various/alacritty-theme/themes/high_contrast.yaml
   # - ~/various/alacritty-theme/themes/horizon-dark.yaml
   # - ~/various/alacritty-theme/themes/hyper.yaml
@@ -976,7 +979,7 @@ import:
   # - ~/various/alacritty-theme/themes/snazzy.yaml
   # - ~/various/alacritty-theme/themes/solarized_dark.yaml
   # - ~/various/alacritty-theme/themes/solarized_light.yaml
-  - ~/various/alacritty-theme/themes/srcery.yaml
+  # - ~/various/alacritty-theme/themes/srcery.yaml
   # - ~/various/alacritty-theme/themes/taerminal.yaml
   # - ~/various/alacritty-theme/themes/tango_dark.yaml
   # - ~/various/alacritty-theme/themes/tender.yaml

.config/awesome/rc.lua

@@ -378,7 +378,7 @@ clientkeys = gears.table.join(
         {description = "toggle fullscreen", group = "client"}),
     awful.key({ modkey,           }, "q",      function (c) c:kill()                         end,
               {description = "close", group = "client"}),
-    awful.key({ modkey, "Control" }, "Space",  awful.client.floating.toggle                     ,
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
               {description = "toggle floating", group = "client"}),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
               {description = "move to master", group = "client"}),

.config/awesome/themes/srcery.lua

@@ -43,7 +43,7 @@ theme.fg_focus = srcery_colors.blue
 theme.fg_urgent = srcery_colors.magenta
 theme.fg_minimize = srcery_colors.white
 
-theme.useless_gap = dpi(0)
+theme.useless_gap = dpi(2)
 theme.border_width = dpi(2)
 theme.border_normal = srcery_colors.brightblack
 theme.border_focus = srcery_colors.white

.config/fish/config.fish

@@ -3,9 +3,10 @@ set -x PAGER less
 set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
 set -x fish_prompt_pwd_dir_length 1
 set -x fish_greeting ''
-set fish_complete_path $fish_complete_path /usr/share/fish/competions
+set fish_complete_path $fish_complete_path /usr/share/fish/completions
 set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 set -x JIRA_API_TOKEN NDE2ODEyOTM5OTI2Ontw1zkanbJ8sAFMDUI1Y0QxOH7d
+set -x PATH $PATH /home/kmcr/.codon
 
 # This file is run by all fish instances.
 # To include configuration only for login shells, use

.config/nvim/lua/plugins/femaco.lua

@@ -1,5 +1,4 @@
 return {
---require('femaco').setup()
   'AckslD/nvim-FeMaco.lua',
   config = true
 }

.config/nvim/lua/plugins/illuminate.lua

@@ -5,15 +5,23 @@ return {
     vim.api.nvim_create_augroup(HIGHLIGHT, { clear = true })
 
     require('murmur').setup {
-      cursor_rgb = 'darkgreen', -- default to '#393939'
+      cursor_rgb = {
+        --guibg = '#393939',
+        gui = "underdotted"
+      },
+      cursor_rgb_always_use_config = true,
       max_len = 80, -- maximum word-length to highlight
-      -- disable_on_lines = 2000, -- to prevent lagging on large files. Default to 2000 lines.
+      disable_on_lines = 2000, -- to prevent lagging on large files. Default to 2000 lines.
+      yank_blink = {
+        enabled = true,
+        on_yank = nil
+      },
       exclude_filetypes = {'log'},
       callbacks = {
         -- to trigger the close_events of vim.diagnostic.open_float.
         function ()
           -- Close floating diag. and make it triggerable again.
-          vim.cmd('doautocmd InsertEnter')
+          vim.api.nvim_exec_autocmds("User", { pattern = "MurmurDiagnostics"})
           vim.w.diag_shown = false
         end,
       }
@@ -27,23 +35,21 @@ return {
 
         -- open float-win when hovering on a cursor-word.
         if vim.w.cursor_word ~= '' then
-          vim.diagnostic.open_float(nil, {
-            focusable = true,
-            close_events = { 'InsertEnter' },
-            border = 'rounded',
-            source = 'always',
-            prefix = ' ',
+          vim.diagnostic.open_float({
             scope = 'cursor',
+            close_events = { "InsertEnter", "User MurmurDiagnostics" },
+          })
+          vim.api.nvim_create_autocmd("WinClosed", {
+            group = HIGHLIGHT,
+            buffer = buf,
+            once = true,
+            callback = function() vim.w.diag_shown = false end,
           })
           vim.w.diag_shown = true
+        else
+          vim.w.diag_shown = false
         end
       end
     })
   end
-  -- 'tzachar/local-highlight.nvim',
-  -- config = function()
-  --   require('local-highlight').setup({
-  --     file_types = {'python', 'cpp', 'rust', 'lua', 'cmake'}
-  --   })
-  -- end
 }

.config/nvim/lua/plugins/init.lua

@@ -16,6 +16,7 @@ return {{
 "MunifTanjim/nui.nvim",
 "nvim-lua/plenary.nvim",
 "nvim-lua/popup.nvim",
+"stevearc/dressing.nvim",
 "wellle/targets.vim",
 -- }}}
 
@@ -24,7 +25,7 @@ return {{
 -- }}}
 
 -- Support for random filetypes {{{
---"chrisbra/csv.vim",
+"chrisbra/csv.vim",
 --"iamcco/markdown-preview.nvim",, { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
 --"vim-pandoc/vim-pandoc",
 --"weirongxu/plantuml-previewer.vim", |
@@ -34,17 +35,10 @@ return {{
 
 -- Other plugins (external tools, etc) {{{
 --"JMcKiern/vim-shoot",
---"MortenStabenau/matlab-vim",
 --"junegunn/goyo.vim",
 "protex/better-digraphs.nvim",
 -- }}}
-
 -- Appearance {{{
---"jaredgorski/spacecamp",
---"lifepillar/vim-gruvbox8",
---"marko-cerovac/material.nvim",
---"srcery-colors/srcery-vim",
---"tanvirtin/monokai.nvim",
 {
   'anuvyklack/pretty-fold.nvim',
   config = function()
@@ -66,43 +60,6 @@ return {{
     })
   end
 },
-"stevearc/dressing.nvim",
---"wuelnerdotexe/vim-enfocado",
-{
-  "fenetikm/falcon",
-  lazy = false,
-  config = function()
-    --vim.cmd([[ colorscheme falcon]])
-  end
-},
-{
-  "casr/vim-colors-reference",
-  lazy = false,
-  config = function()
-    --vim.cmd([[ colorscheme reference]])
-  end
-},
-{
-  "blazkowolf/gruber-darker.nvim",
-  lazy = false,
-  config = function()
-    vim.cmd([[ colorscheme gruber-darker]])
-  end
-},
-{
-  "rebelot/kanagawa.nvim",
-  lazy = false,
-  config = function()
-    --vim.cmd([[ colorscheme kanagawa]])
-  end
-},
-{
-  "tommcdo/vim-lion",
-  keys = {
-    { "gl", desc = "align to specific character to the left" },
-    { "gL", desc = "align to specific character to the right" }
-  }
-},
 -- }}}
 
 -- Testing phase {{{
@@ -113,23 +70,20 @@ return {{
 --require('lsp_lines').setup()
 
 --"mfussenegger/nvim-dap",
---"narutoxy/silicon.lua",
 --"nguyenvukhang/nvim-toggler",
 --"rgroli/other.nvim", " Currently doesn't support C/C++
 --"smolovk/projector.nvim",
 "Pocco81/true-zen.nvim",
--- {'krivahtoo/silicon.nvim', build = './install.sh',
---   config = function()
---     require('silicon').setup({
---       font = 'DaddyTimeMono Nerd Font=16',
---       theme = 'Monokai Extended',
---     })
---   end
--- },
 "nullchilly/fsread.nvim",
 "ziontee113/icon-picker.nvim",
-"cbochs/grapple.nvim",
-"shortcuts/no-neck-pain.nvim",
+{
+  "cbochs/grapple.nvim",
+  enabled = false
+},
+{
+  "shortcuts/no-neck-pain.nvim",
+  enabled = false,
+},
 --'jinzhongjia/PS_manager.nvim',
 -- }}}
 }}

.config/nvim/lua/plugins/lspconfig.lua

@@ -121,6 +121,7 @@ return {
         capabilities = capabilities
       },
       inlay_hints = {
+        inline = false,
         max_len_align = true,
         max_len_align_padding = 3,
         right_align = true,
@@ -144,6 +145,28 @@ return {
       --on_publish_diagnostics = diagnostic_handler,
     })
 
+    nvim_lsp.matlab_ls.setup({
+      cmd = { "matlab-language-server", "--stdio"},
+      filetypes = { "matlab" },
+      handlers = { [ "workspace/configuration"] = function(_, _, ctx)
+        local client = vim.lsp.get_client_by_id(ctx.client_id)
+        return {client.config.settings.matlab}
+        end
+      },
+      root_dir = nvim_lsp.util.find_git_ancestor,
+      single_file_support = false,
+      settings = {
+        matlab = {
+          indexWorkspace = true,
+          installPath = "/home/kmcr/.local/usr/MATLAB/R2021b",
+          matlabConnectionTiming = "onStart",
+          telemetry = true,
+        },
+      },
+      on_attach = on_attach,
+      capabilities = capabilities
+    })
+
     -- Use a loop to conveniently call 'setup' on multiple servers and
     -- map buffer local keybindings when the language server attaches
     local servers = { "cmake", "rust_analyzer", "bashls", "marksman" }

.config/nvim/lua/plugins/neorg.lua

@@ -1,18 +0,0 @@
-return {
-  "nvim-neorg/neorg",
-  build = ":Neorg sync-parsers",
-  opts = {
-    load = {
-      ["core.defaults"] = {}, -- Loads default behaviour
-      ["core.concealer"] = {}, -- Adds pretty icons to your documents
-      ["core.dirman"] = { -- Manages Neorg workspaces
-        config = {
-          workspaces = {
-            notes = "~/notes",
-          },
-        },
-      },
-    },
-  },
-  dependencies = { { "nvim-lua/plenary.nvim" } },
-}

.config/nvim/lua/plugins/nvim-cmp.lua

@@ -1,23 +1,25 @@
 return {
   'hrsh7th/nvim-cmp',
   dependencies = {
-    'mstanciu552/cmp-matlab',
+    'dcampos/cmp-snippy',
+    --'mstanciu552/cmp-matlab',
     'petertriho/cmp-git',
     'hrsh7th/cmp-buffer',
     'hrsh7th/cmp-cmdline',
     'hrsh7th/cmp-nvim-lsp',
     'hrsh7th/cmp-path',
+    'hrsh7th/cmp-calc',
   },
   event = "InsertEnter",
   config = function()
     local cmp = require'cmp'
 
     cmp.setup({
-        snippet = {
-            expand = function(args)
-                require('snippy').expand_snippet(args.body)
-            end,
-        },
+        -- snippet = {
+        --     expand = function(args)
+        --         require('snippy').expand_snippet(args.body)
+        --     end,
+        -- },
         window = {
             completion = cmp.config.window.bordered(),
             documentation = cmp.config.window.bordered(),
@@ -34,7 +36,7 @@ return {
             { name = 'path' },
             { name = 'snippy' },
             { name = 'calc' },
-            { name = 'cmp_matlab' },
+            -- { name = 'cmp_matlab' },
             { name = 'cmp_git' },
         }, {
             { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 },

.config/nvim/lua/plugins/snippets.lua

@@ -9,8 +9,8 @@ return {
     require('snippy').setup({
       mappings = {
           is = {
-              ['<Tab>'] = 'expand_or_advance',
-              ['<S-Tab>'] = 'previous',
+              ['<cr>'] = 'expand_or_advance',
+              ['<S-cr>'] = 'previous',
           },
           nx = {
               ['<leader>x'] = 'cut_text',