More updates and cleanup to nvim config

.config/fish/conf.d/asdf.fish

@@ -1 +0,0 @@
-source ~/.asdf/asdf.fish

.config/fish/config.fish

@@ -1,5 +1,6 @@
 if status is-interactive
-    # Commands to run in interactive sessions can go here
+   # Commands to run in interactive sessions can go here
+   # atuin init fish | source 
 end
 function multicd
     echo cd (string repeat -n (math (string length -- $argv[1]) - 1) ../)
@@ -8,4 +9,27 @@ abbr --add dotdot --regex '^\.\.+$' --function multicd
 abbr -a -- gst 'git status'
 abbr -a -- gca 'git commit --amend'
 abbr -a -- gpf 'git push -f'
-abbr -a -- gp 'git pull'
+abbr -a -- gp 'git push'
+abbr -a -- gl 'git pull'
+abbr -a -- gl 'git rebase develop'
+abbr -a -- gcd 'git checkout develop'
+abbr -a -- gc- 'git checkout -'
+abbr -a -- gc 'git checkout'
+
+abbr -a -- api 'kubectl get pods -n backend | fzf | awk \'{print $1}\' | xargs -o -I {} kubectl exec -i -t -n backend {} --container api -- /opt/app/api/bin/api remote'
+
+
+function preview_shell
+  set PR $(gh pr status --json number | jq '.currentBranch.number')
+
+  kubectl get pods -n backend | awk '{print $1}' | grep "$PR-api" | head -1 | xargs -o -I {} kubectl exec -i -t -n backend {} --container api -- /opt/app/api/bin/api remote
+end
+
+
+function preview_db
+  gh pr status --json number | jq '.currentBranch.number' | xargs -o -I {} devops db connect frameio-pr-{}-cluster
+end
+
+function mix_test_changed
+  git status -s | awk '{print $2}' | grep '_test.exs' | xargs mix test
+end

.config/fish/fish_variables

@@ -1,14 +1,14 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:4c566a
+SETUVAR fish_color_autosuggestion:969896
 SETUVAR fish_color_cancel:\x2d\x2dreverse
-SETUVAR fish_color_command:81a1c1
+SETUVAR fish_color_command:b294bb
-SETUVAR fish_color_comment:434c5e
+SETUVAR fish_color_comment:f0c674
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:88c0d0
+SETUVAR fish_color_end:b294bb
-SETUVAR fish_color_error:ebcb8b
+SETUVAR fish_color_error:cc6666
 SETUVAR fish_color_escape:00a6b2
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
@@ -18,9 +18,9 @@ SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
 SETUVAR fish_color_normal:normal
 SETUVAR fish_color_operator:00a6b2
 SETUVAR fish_color_option:\x1d
-SETUVAR fish_color_param:eceff4
+SETUVAR fish_color_param:81a2be
-SETUVAR fish_color_quote:a3be8c
+SETUVAR fish_color_quote:b5bd68
-SETUVAR fish_color_redirection:b48ead
+SETUVAR fish_color_redirection:8abeb7
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red

.config/k9s/aliases.yaml

@@ -0,0 +1,9 @@
+aliases:
+  dp: deployments
+  sec: v1/secrets
+  jo: jobs
+  cr: clusterroles
+  crb: clusterrolebindings
+  ro: roles
+  rb: rolebindings
+  np: networkpolicies

.config/k9s/clusters/teleport.sharedservices.frame.io/teleport.sharedservices.frame.io-amazingduck-dev-use1/benchmarks.yaml

@@ -0,0 +1,4 @@
+benchmarks:
+  defaults:
+    concurrency: 2
+    requests: 200

.config/k9s/clusters/teleport.sharedservices.frame.io/teleport.sharedservices.frame.io-amazingduck-dev-use1/config.yaml

@@ -0,0 +1,13 @@
+k9s:
+  cluster: teleport.sharedservices.frame.io
+  namespace:
+    active: backend
+    lockFavorites: false
+    favorites:
+    - backend
+    - default
+  view:
+    active: po
+  featureGates:
+    nodeShell: false
+  portForwardAddress: localhost

.config/k9s/config.yaml

@@ -0,0 +1,8 @@
+k9s:
+  liveViewAutoRefresh: false
+
+  ui:
+    headless: false
+    logoless: true
+    crumbsless: true
+

.config/nvim/after/plugin/git-worktree.lua

@@ -1,129 +0,0 @@
-if vim.g.vscode then
-  return
-end
-
-local Worktree = require("git-worktree")
-local Job = require("plenary.job")
-local FTerm = require("FTerm")
-
-local function file_exists(name)
-   local f=io.open(name,"r")
-   if f~=nil then io.close(f) return true else return false end
-end
-
-local function schedule_notify(message, level)
-  vim.schedule(function()
-    vim.notify.notify(message, level or "info")
-  end)
-end
-
-local function is_elixir_project()
-  return file_exists(vim.loop.cwd() .. "/" .. "mix.exs")
-end
-
--- Run mix compile
-local compile_job = Job:new({
-  command = "mix",
-  args = { "compile" },
-  on_start = function()
-    schedule_notify("Compiling...", "debug")
-  end,
-  on_exit = function(_j, _return_val)
-    schedule_notify("Compiling done")
-  end
-})
-
--- Run mix deps.get
-local deps_job = Job:new({
-  command = "mix",
-  args = { "deps.get" },
-  on_start = function()
-    schedule_notify("Fetching dependencies...")
-  end,
-  on_exit = function(_j, _return_val)
-    schedule_notify("Fetched dependencies")
-  end
-})
-
-local function create_docker_up_job(path)
-  return Job:new({
-    command = "docker-compose",
-    args = { "up" },
-    cwd = path,
-    detached = true,
-    on_start = function ()
-      schedule_notify("Running docker in " .. path, "debug")
-    end,
-    on_exit = function (_j, return_val)
-      if return_val ~= 0 then
-        schedule_notify("Error running docker for " .. path, "error")
-      end
-    end
-  })
-end
-
-local function create_docker_down_job(path)
-  return Job:new({
-    command = "docker-compose",
-    args = { "down" },
-    cwd = path,
-    on_start = function ()
-      schedule_notify("Shutting down containers at " .. path, "debug")
-    end,
-    on_exit = function ()
-      schedule_notify("Shut down containers at " .. path, "debug")
-    end,
-  })
-end
-
-local iex = FTerm:new({
-  cmd = { "iex", "-S", "mix" },
-  dimensions = {
-    height = 0.9,
-    width = 0.9
-  }
-})
-
-vim.keymap.set('t', '<A-t>', function ()
-  iex:toggle()
-end)
-vim.keymap.set('n', '<A-t>', function ()
-  iex:toggle()
-end)
-
-Worktree.on_tree_change(function(op, metadata)
-  if op == Worktree.Operations.Create and is_elixir_project() then
-    deps_job:and_then(compile_job)
-    deps_job:start()
-  end
-
-  if op == Worktree.Operations.Switch and is_elixir_project() then
-    local docker_down = create_docker_down_job(metadata.prev_path)
-    local docker_up = create_docker_up_job(metadata.path)
-
-    docker_down:and_then(docker_up)
-    compile_job:start()
-    docker_down:start()
-
-    iex:close(true)
-  end
-end)
-
-local group = vim.api.nvim_create_augroup('MyCustomNeogitEvents', { clear = true })
-vim.api.nvim_create_autocmd('User', {
-  pattern = 'NeogitPullComplete',
-  group = group,
-  callback = function ()
-    deps_job:and_then(compile_job)
-    deps_job:start()
-  end,
-})
-
-vim.api.nvim_create_autocmd('User', {
-  pattern = 'NeogitBranchCheckout',
-  group = group,
-  callback = function ()
-    deps_job:and_then(compile_job)
-    deps_job:start()
-  end,
-})

.config/nvim/after/plugin/jira.lua

@@ -1,39 +0,0 @@
-if vim.g.vscode then
-  return
-end
-
-local nnoremap = require('halfdan.keymap').nnoremap
-local actions = require("telescope.actions")
-local action_state = require "telescope.actions.state"
-local worktree = require("git-worktree")
-
-local function create_workspace_for_issue()
-  require'telescope'.extensions.jira.live_search({
-    attach_mappings =function ()
-      actions.select_default:replace(
-        function ()
-          local selection = action_state.get_selected_entry()
-          local branch_name = "fb/" .. selection.key:lower()
-          vim.schedule(function ()
-            -- Create worktree
-            worktree.create_worktree(branch_name, branch_name, "origin")
-
-          end)
-        end
-      )
-      return true
-    end,
-    assignee = "fbecker@adobe.com",
-  })
-end
-
-
-nnoremap("<leader>jw", function ()
-  create_workspace_for_issue()
-end)
-
-nnoremap("<leader>js", function ()
-  require'telescope'.extensions.jira.live_search({
-    project="BES"
-  })
-end)

.config/nvim/after/plugin/keymappings.lua

@@ -105,15 +105,35 @@ nnoremap('<leader>a', ':A<CR>')
 -- Reload init.lua
 nnoremap('<leader>sv', ':source $MYVIMRC<CR>')
 
-nnoremap('<C-p>', ':Lspsaga diagnostic_jump_prev<CR>')
+local builtin = require("telescope.builtin")
-nnoremap('<C-y>', ':Lspsaga diagnostic_jump_next<CR>')
 
--- Harpoon
+nnoremap("<leader>gg", function()
-nnoremap("<leader>m", function() require("harpoon.mark").add_file() end)
+  -- builtin.live_grep()
-nnoremap("<C-e>", function() require("harpoon.ui").toggle_quick_menu() end)
+  require "telescope".extensions.egrepify.egrepify { sorting_strategy = 'ascending' }
+end)
+
+nnoremap("<C-p>", function()
+  builtin.find_files()
+end)
+
+nnoremap("<Leader>ff", function()
+  require('telescope').extensions.smart_open.smart_open({cwd_only = true})
+end)
+
+nnoremap("<Leader>fh", function()
+  builtin.find_files{cwd=vim.fn.expand('%:p:h')}
+end)
+
+nnoremap("<leader>gw", function()
+  builtin.grep_string { search = vim.fn.expand("<cword>") }
+end)
+
+nnoremap("<leader>fb", function()
+  builtin.buffers()
+end)
+
+nnoremap("<leader>gc", function()
+  builtin.git_branches()
+end)
 
-nnoremap("<C-h>", function() require("harpoon.ui").nav_file(1) end)
-nnoremap("<C-t>", function() require("harpoon.ui").nav_file(2) end)
-nnoremap("<C-n>", function() require("harpoon.ui").nav_file(3) end)
-nnoremap("<C-s>", function() require("harpoon.ui").nav_file(4) end)
 

.config/nvim/after/plugin/lsp.lua

@@ -6,10 +6,16 @@ local Remap = require("halfdan.keymap")
 local nnoremap = Remap.nnoremap
 local inoremap = Remap.inoremap
 
-vim.fn.sign_define("DiagnosticSignError",  {text = "", texthl = "DiagnosticSignError"})
+vim.diagnostic.config({
-vim.fn.sign_define("DiagnosticSignWarn",   {text = "", texthl = "DiagnosticSignWarn"})
+  signs = {
-vim.fn.sign_define("DiagnosticSignInfo",   {text = "", texthl = "DiagnosticSignInfo"})
+    text = {
--- vim.fn.sign_define("DiagnosticSignHint",   {text = "", texthl = "DiagnosticSignHint"})
+      [vim.diagnostic.severity.ERROR] = "",
+      [vim.diagnostic.severity.WARN]  = "",
+      [vim.diagnostic.severity.INFO]  = "",
+    },
+  },
+})
+
 
 -- Set Default Prefix.
 -- Note: You can set a prefix per lsp server in the lv-globals.lua file
@@ -80,15 +86,13 @@ vim.lsp.protocol.CompletionItemKind = {
 
 
 -- Diagnostic keymaps
-vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>Lspsaga show_line_diagnostics<CR>', { noremap = true, silent = true })
+-- Show Lspsaga line diagnostics
-vim.api.nvim_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>e', '<cmd>Lspsaga show_line_diagnostics<CR>', { noremap = true, silent = true })
 
--- LSP settings
+-- Send diagnostics to location list
-local lsp_status = require('lsp-status')
+vim.keymap.set('n', '<leader>q', function()
-lsp_status.register_progress()
+  vim.diagnostic.setloclist()
-
+end, { noremap = true, silent = true })
-local lspconfig = require 'lspconfig'
-local configs = require 'lspconfig.configs'
 
 -- Global mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
@@ -128,113 +132,53 @@ vim.api.nvim_create_autocmd('LspAttach', {
   end,
 })
 
-local on_attach = function(client, bufnr)
+vim.lsp.config("lua_ls", {
-  nnoremap("gd", "<cmd>Lspsaga peek_definition<CR>")
-  nnoremap("<leader>gd", function ()
-    vim.lsp.buf.definition()
-  end)
-  nnoremap("gD", function() vim.lsp.buf.declaration() end)
-  nnoremap("K", "<cmd>Lspsaga hover_doc<CR>")
-  nnoremap("gW", function() vim.lsp.buf.workspace_symbol() end)
-  nnoremap("<leader>vd", function() vim.diagnostic.open_float() end)
-  nnoremap("[d", "<cmd>Lspsaga diagnostic_jump_next<CR>")
-  nnoremap("]d", "<cmd>Lspsaga diagnostic_jump_prev<CR>")
-  nnoremap("<leader>ca", "<cmd>Lspsaga code_action<CR>")
-  nnoremap("gr", function() vim.lsp.buf.references() end)
-  nnoremap("<leader>rn", "<cmd>Lspsaga rename<CR>")
-  nnoremap("<leader>cl", function() vim.lsp.codelens.run() end)
-  nnoremap("<leader>fa", function() vim.lsp.buf.format{async = true} end)
-  inoremap("<C-h>", function() vim.lsp.buf.signature_help() end)
-
-  lsp_status.on_attach(client, bufnr)
-end
-
-local function config(_config)
-  _config = vim.tbl_deep_extend("force", {
-    log_level = vim.lsp.protocol.MessageType.Log,
-    message_level = vim.lsp.protocol.MessageType.Log,
-    capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-    on_attach = on_attach,
-  }, _config or {})
-
-  -- Set default client capabilities plus window/workDoneProgress
-  _config.capabilities = vim.tbl_extend('keep', _config.capabilities or {}, lsp_status.capabilities)
-
-  return _config
-end
-
--- Enable the following language servers
--- local servers = { 'gopls', 'julials', 'rust_analyzer', 'pyright' }
--- for _, lsp in ipairs(servers) do
---   lspconfig[lsp].setup(config())
--- end
-
-require'lspconfig'.lua_ls.setup {
   settings = {
     Lua = {
       runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+        -- Tell the language server which version of Lua you're using
-        version = 'LuaJIT',
+        version = "LuaJIT",
       },
       diagnostics = {
         -- Get the language server to recognize the `vim` global
-        globals = {'vim'},
+        globals = { "vim" },
       },
       workspace = {
         -- Make the server aware of Neovim runtime files
         library = vim.api.nvim_get_runtime_file("", true),
       },
-      -- Do not send telemetry data containing a randomized but unique identifier
       telemetry = {
+        -- Do not send telemetry data containing a randomized but unique identifier
         enable = false,
       },
     },
   },
-}
-
-require('rust-tools').setup({
-  tools = {
-    runnables = {
-      use_telescope = true,
-    },
-    inlay_hints = {
-      auto = true,
-      parameter_hints_prefix = "",
-      other_hints_prefix = "",
-    }
-  },
-  server = {
-    on_attach = on_attach,
-    settings = {
-      ["rust-analyzer"] = {
-        checkOnSave = {
-          command = "clippy",
-        },
-      },
-    },
-  },
 })
 
+-- Enable it
+vim.lsp.enable("lua_ls")
 
-local lexical_config = {
+vim.lsp.config('gopls', {
-  filetypes = { "elixir", "eelixir", "heex" },
+  cmd = { "gopls" },
-  cmd = { "/Users/fbecker/code/lexical/_build/dev/package/lexical/bin/start_lexical.sh" },
+  filetypes = { "go", "gomod", "gowork", "gotmpl" },
-  settings = {},
+  root_markers = { "go.work", "go.mod", ".git" },
-}
+  settings = {
-
+    gopls = {
-if not configs.lexical then
+      analyses = {
-  configs.lexical = {
+        unusedparams = true,
-    default_config = {
+        shadow = true,
-      filetypes = lexical_config.filetypes,
+      },
-      cmd = lexical_config.cmd,
+      staticcheck = true,
-      root_dir = function(fname)
-        return lspconfig.util.root_pattern("mix.exs", ".git")(fname) or vim.loop.os_homedir()
-      end,
-      -- optional settings
-      settings = lexical_config.settings,
     },
-  }
+  },
-end
+})
 
-lspconfig.lexical.setup({})
+vim.lsp.enable 'gopls'
 
+vim.lsp.config('expert', {
+  cmd = { 'expert' },
+  root_markers = { 'mix.exs', '.git' },
+  filetypes = { 'elixir', 'eelixir', 'heex' },
+})
+
+vim.lsp.enable 'expert'

.config/nvim/after/plugin/neotest.lua

@@ -4,6 +4,17 @@ end
 
 local nnoremap = require('halfdan.keymap').nnoremap
 local neotest = require('neotest')
+local neotest_ns = vim.api.nvim_create_namespace("neotest")
+
+vim.diagnostic.config({
+  virtual_text = {
+    format = function(diagnostic)
+      local message =
+        diagnostic.message:gsub("\n", " "):gsub("\t", " "):gsub("%s+", " "):gsub("^%s+", "")
+      return message
+    end,
+  },
+}, neotest_ns)
 
 neotest.setup({
   log_level = vim.log.levels.DEBUG,
@@ -14,6 +25,7 @@ neotest.setup({
     }),
     require("neotest-rust"),
     --    require("neotest-vim-test")({ allow_file_types = { "haskell"} }),
+    require("neotest-golang")
   },
 })
 

.config/nvim/after/plugin/null-ls.lua

@@ -1,16 +0,0 @@
-if vim.g.vscode then
-  return
-end
-
-local ok, nls = pcall(require, 'null-ls')
-
-if not ok then
-  return
-end
-
-nls.setup({
-    sources = {
-        nls.builtins.formatting.stylua,
-        nls.builtins.diagnostics.credo,
-    },
-})

.config/nvim/after/plugin/sneak.lua

@@ -2,11 +2,11 @@ if vim.g.vscode then
   return
 end
 
-vim.cmd([[
+-- Sneak
-    let g:sneak#label = 1
+vim.g["sneak#label"] = 1
-    let g:sneak#prompt = '🔎'
+vim.g["sneak#prompt"] = "🔎"
-    let g:sneak#s_next = 1
+vim.g["sneak#s_next"] = 1
 
-    let test#strategy = "neovim"
+-- Vim-Test
-    let test#neovim#term_position = "vert rightbelow 80"
+vim.g["test#strategy"] = "neovim"
-]])
+vim.g["test#neovim#term_position"] = "vert rightbelow 80"

.config/nvim/after/plugin/tagbar.lua

@@ -1 +0,0 @@
-vim.g.tagbar_ctags_bin = '/usr/local/bin/ctags'

.config/nvim/after/plugin/telescope.lua

@@ -1,50 +0,0 @@
-if vim.g.vscode then
-  return
-end
-
-local Remap = require("halfdan.keymap")
-local nnoremap = Remap.nnoremap
-local builtin = require("telescope.builtin")
-
-nnoremap("<leader>gg", function()
-  -- builtin.live_grep()
-  require "telescope".extensions.egrepify.egrepify { sorting_strategy = 'ascending' }
-end)
-nnoremap("<C-p>", function()
-  builtin.commands()
-end)
-
-nnoremap("<Leader>ff", function()
-  require('telescope').extensions.smart_open.smart_open({cwd_only = true})
-  -- builtin.find_files({
-  --   hidden=true,
-  -- })
-end)
-nnoremap("<Leader>fh", function()
-  builtin.find_files{cwd=vim.fn.expand('%:p:h')}
-end)
-
-nnoremap("<Leader>fs", function()
-  builtin.lsp_workspace_symbols()
-end)
-nnoremap("<leader>gw", function()
-  builtin.grep_string { search = vim.fn.expand("<cword>") }
-end)
-nnoremap("<leader>fb", function()
-  builtin.buffers()
-end)
-nnoremap("<leader>vh", function()
-  builtin.help_tags()
-end)
-
-nnoremap("<leader>wc", function()
-  require('telescope').extensions.git_worktree.create_git_worktree()
-end)
-nnoremap("<leader>ws", function()
-  require('telescope').extensions.git_worktree.git_worktrees()
-end)
-nnoremap("<leader>gc", function()
-  builtin.git_branches()
-end)
-
-

.config/nvim/lazy-lock.json

@@ -2,71 +2,67 @@
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
-  "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" },
+  "cmp-git": { "branch": "main", "commit": "b24309c386c9666c549a1abaedd4956541676d06" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
+  "editorconfig-vim": { "branch": "master", "commit": "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8" },
-  "elixir-tools.nvim": { "branch": "main", "commit": "5e7596be469be0800e9cbe3415de971f7286c3d0" },
+  "fzf-lua": { "branch": "main", "commit": "c2d9b8693792c6dd810162d9e8c90782cec19404" },
-  "fzf-lua": { "branch": "main", "commit": "8f9c3a2e308755c25630087f3c5d35786803cfd0" },
+  "git-blame.nvim": { "branch": "master", "commit": "9874ec1ec8bc53beb33b7cd82c092b85271a578b" },
-  "git-blame.nvim": { "branch": "master", "commit": "50543e3993f4b996eea01ff5ccc8fe2a354c5388" },
-  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
   "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "hardtime.nvim": { "branch": "main", "commit": "6d7664d5bdfaea44c5f50b29f5239fab7b00c273" },
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" },
+  "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" },
+  "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" },
-  "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" },
+  "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
-  "neorg-telescope": { "branch": "main", "commit": "ddb2556644cae922699a239bbb0fe16e25b084b7" },
+  "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" },
-  "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" },
+  "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
-  "neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" },
+  "neotest": { "branch": "master", "commit": "2cf3544fb55cdd428a9a1b7154aea9c9823426e8" },
-  "neotest-rust": { "branch": "main", "commit": "0418811e1e3499b2501593f2e131d02f5e6823d4" },
+  "neotest-elixir": { "branch": "master", "commit": "a242aebeaa6997c1c149138ff77f6cacbe33b6fc" },
+  "neotest-golang": { "branch": "main", "commit": "0ada81e50429a071cc7d349301762e4ee04dcb2a" },
+  "neotest-rust": { "branch": "main", "commit": "2c9941d4a358839918fac21d20fc8fef0e1ad05f" },
   "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
-  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-dap": { "branch": "master", "commit": "7523676a4be17644587aa47e4d42f6f7646d4727" },
-  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
+  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ad32182cc4a03c8826a64e9ced68046c575fdb7d" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
-  "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" },
+  "outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" },
+  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
-  "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "rose-pine": { "branch": "main", "commit": "cf8de969c49b1d879091ae9048715f4aacd4f9fb" },
+  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
-  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
-  "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" },
+  "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
-  "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
+  "smart-open.nvim": { "branch": "0.2.x", "commit": "560d8f16e17977c8303db6f9660db58a4415ca41" },
-  "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
+  "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
-  "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
+  "telescope-egrepify.nvim": { "branch": "master", "commit": "8da5e3ba5faf3bdd6bbfaccb3eb3b8e7ebf9b131" },
-  "telescope-egrepify.nvim": { "branch": "master", "commit": "a30396791c3f67b8f34d42dfc26db2f868ae9154" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "telescope.nvim": { "branch": "master", "commit": "68a6d8e8a0a8276ad56dc2a5bc29a4767a8eb5da" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
+  "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
-  "vim-dispatch": { "branch": "master", "commit": "4c695bc052cad2ae6b980aebbe48d046466e27ae" },
   "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
-  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
-  "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
+  "vim-gitgutter": { "branch": "main", "commit": "488c0555e47e2aabe273c635f7dd233e985311a6" },
-  "vim-highlightedyank": { "branch": "master", "commit": "afb0f262b490706c23e94012c2ab9fa67c0481ce" },
+  "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" },
-  "vim-projectionist": { "branch": "master", "commit": "3736bd4a5f23b30821cbb892385bb1f1b0088cfc" },
+  "vim-projectionist": { "branch": "master", "commit": "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296" },
-  "vim-sneak": { "branch": "master", "commit": "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd" },
+  "vim-sneak": { "branch": "master", "commit": "18b1faf020e6a66c1ce09b3ff5e6b6feb182973b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vim-test": { "branch": "master", "commit": "75b64f23c923d34b56e47846a026210feb57146a" }
+  "vim-test": { "branch": "master", "commit": "5ee3c0b3734eab612b9f70bbc8a4f69f17f8e8ef" }
 }

.config/nvim/lua/halfdan/cmp.lua

@@ -6,7 +6,6 @@ local source_mapping = {
   nvim_lsp = "[LSP]",
   nvim_lua = "[Lua]",
   path = "[Path]",
-  jira = "[Jira]",
 }
 
 local has_words_before = function()
@@ -21,23 +20,24 @@ cmp.setup({
   snippet = {
     expand = function(args)
       vim.snippet.expand(args.body)
-    end
+    end,
   },
   mapping = {
-    ['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 'c' }),
+    ["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-    ['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 'c' }),
+    ["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
+    ["<C-Space>"] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.close(),
+    ["<C-e>"] = cmp.mapping.close(),
-    ['<CR>'] = cmp.mapping.confirm {
+    ["<CR>"] = cmp.mapping.confirm {
       behavior = cmp.ConfirmBehavior.Replace,
-      select = false, -- only replace if explicitly selected
+      select = false, -- only confirm if explicitly selected
     },
+
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
-      elseif vim.snippet.jumpable(1) then
+      elseif vim.snippet.active({ direction = 1 }) then
         vim.snippet.jump(1)
       elseif has_words_before() then
         cmp.complete()
@@ -49,32 +49,33 @@ cmp.setup({
     ["<S-Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
-      elseif vim.snippet.jumpable(-1) then
+      elseif vim.snippet.active({ direction = -1 }) then
         vim.snippet.jump(-1)
       else
         fallback()
       end
-    end, { "i", "s" })
+    end, { "i", "s" }),
   },
+
   sources = cmp.config.sources({
-    { name = 'luasnip' },
+    { name = "nvim_lsp" },
-    { name = 'nvim_lsp' },
   }, {
-    { name = 'buffer'}
+    { name = "buffer" },
   }),
+
   formatting = {
     format = function(entry, vim_item)
       vim_item.kind = lspkind.presets.default[vim_item.kind]
       local menu = source_mapping[entry.source.name]
       vim_item.menu = menu
       return vim_item
-    end
+    end,
   },
-  experimental = {
-    ghost_text = false,
-  }
-})
 
+  experimental = {
+    ghost_text = true,
+  },
+})
 
 -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline({ '/', '?' }, {

.config/nvim/lua/halfdan/colorscheme.lua

@@ -1,5 +1,2 @@
-vim.cmd('let g:nvcode_termcolors=256')
+vim.g.nvcode_termcolors = 256
-
+vim.cmd.colorscheme("gruvbox-baby")
-vim.cmd('colorscheme rose-pine')
-
--- vim.cmd('highlight Normal guibg=NONE ctermbg=NONE')  

.config/nvim/lua/halfdan/init.lua

@@ -11,7 +11,6 @@ else
   -- require('halfdan.globals')
   require('halfdan.keymap')
   require('halfdan.cmp')
-  -- require('halfdan.luasnip')
   require('halfdan.colorscheme')
   require('halfdan.treesitter')
   require('halfdan.telescope')

.config/nvim/lua/halfdan/lazy.lua

@@ -31,6 +31,16 @@ require("lazy").setup({
     -- Load .editorconfig files
     {'editorconfig/editorconfig-vim'},
 
+    {
+       "m4xshen/hardtime.nvim",
+       lazy = false,
+       dependencies = { "MunifTanjim/nui.nvim" },
+       opts = {},
+    },
+    {
+      "karb94/neoscroll.nvim",
+      opts = {},
+    },
     {'junegunn/vim-easy-align'},
 
     -- Goodies
@@ -51,10 +61,12 @@ require("lazy").setup({
     {
       "nvim-neotest/neotest",
       dependencies = {
+        "nvim-neotest/nvim-nio",
         "nvim-lua/plenary.nvim",
         "nvim-treesitter/nvim-treesitter",
         "antoinemadec/FixCursorHold.nvim",
-
+        -- plugins
+        "fredrikaverpil/neotest-golang",
         "jfpedroza/neotest-elixir",
         "rouge8/neotest-rust",
       }
@@ -81,8 +93,6 @@ require("lazy").setup({
       })
     end},
 
-    {'preservim/tagbar'},
-
     {'f-person/git-blame.nvim'},
     -- Status Line and Bufferline
     {
@@ -146,20 +156,16 @@ require("lazy").setup({
 
       {'machakann/vim-highlightedyank'},
 
-      -- LSP / Language Server Protocol
-      {
-      'neovim/nvim-lspconfig',
-      'williamboman/nvim-lsp-installer',
-    },
-
     {
         'nvimdev/lspsaga.nvim',
         config = function()
             require('lspsaga').setup({
-
               symbol_in_winbar = {
                 enable = false,
               },
+              lightbulb = {
+                enable = false,
+              }
             })
         end,
         dependencies = {
@@ -184,16 +190,17 @@ require("lazy").setup({
     -- Used to display LSP status in Lualine
     {'nvim-lua/lsp-status.nvim'},
 
-    -- null-ls for a collection of LSP-like plugins
     {
-        "jose-elias-alvarez/null-ls.nvim",
+      "hedyhli/outline.nvim",
-        config = function()
+      lazy = true,
-            require("null-ls").setup()
+      cmd = { "Outline", "OutlineOpen" },
-        end,
+      keys = { -- Example mapping to toggle outline
-        dependencies = { "nvim-lua/plenary.nvim" },
+        { "<leader>o", "<cmd>Outline<CR>", desc = "Toggle outline" },
+      },
+      opts = {
+        -- Your setup opts here
+      },
     },
-
-    {'simrat39/symbols-outline.nvim', config=true},
     {
       'numToStr/Comment.nvim',
       config = function()
@@ -218,8 +225,6 @@ require("lazy").setup({
     },
 
     {'numToStr/FTerm.nvim'},
-    {'theprimeagen/git-worktree.nvim'},
-    {'theprimeagen/harpoon'},
 
     -- Debugging
     "mfussenegger/nvim-dap",
@@ -229,39 +234,14 @@ require("lazy").setup({
 
     -- => Language Support
     {'rust-lang/rust.vim'},
-    {'simrat39/rust-tools.nvim'},
     {
-      "elixir-tools/elixir-tools.nvim",
+      'mrcjkb/rustaceanvim',
-      version = "*",
+      version = '^6', -- Recommended
-      event = { "BufReadPre", "BufNewFile" },
+      lazy = false, -- This plugin is already lazy
-      config = function()
-        local elixir = require("elixir")
-        local elixirls = require("elixir.elixirls")
---
-        elixir.setup {
-          nextls = {enable = true},
-          credo = {},
-          elixirls = {
-            enable = false,
-            settings = elixirls.settings {
-              dialyzerEnabled = false,
-              enableTestLenses = false,
-            },
-            on_attach = function()
-              vim.keymap.set("n", "<space>fp", ":ElixirFromPipe<cr>", { buffer = true, noremap = true })
-              vim.keymap.set("n", "<space>tp", ":ElixirToPipe<cr>", { buffer = true, noremap = true })
-              vim.keymap.set("v", "<space>em", ":ElixirExpandMacro<cr>", { buffer = true, noremap = true })
-            end,
-          }
-        }
-      end,
-      dependencies = {
-        "nvim-lua/plenary.nvim",
-      },
     },
     {'tpope/vim-projectionist'},
+
     -- themes & colorschemes
-    -- {'gruvbox-community/gruvbox'},
     { "rose-pine/neovim", name = "rose-pine" },
     {'luisiacc/gruvbox-baby'},
     {'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons',

.config/nvim/lua/halfdan/lualine/init.lua

@@ -28,7 +28,7 @@ local function setup()
     sections = {
       lualine_a = { cpn.branch },
       lualine_b = { cpn.diagnostics },
-      lualine_c = {},
+      lualine_c = { "lsp_status" },
       lualine_x = { { git_blame.get_current_blame_text, cond = git_blame.is_blame_text_available }, cpn.diff },
       lualine_y = { cpn.position, cpn.filetype },
       lualine_z = { cpn.spaces, cpn.mode },

.config/nvim/lua/halfdan/luasnip.lua

@@ -1,6 +0,0 @@
--- local luasnip = require('luasnip')
-luasnip.config.set_config {
-  history = true,
-  updateevents = "TextChanged,TextChangedI"
-}
-

.config/nvim/lua/halfdan/settings.lua

@@ -7,8 +7,7 @@ vim.o.titlestring="%<%F%=%l/%L - nvim"
 vim.wo.wrap = false -- Display long lines as just one line
 -- vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
 -- vim.cmd('syntax on') -- syntax highlighting
-vim.o.foldmethod = "expr"
+vim.o.foldmethod = "manual"
-vim.o.foldexpr = "nvim_treesitter#foldexpr()"
 vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
 local fcs = vim.opt.fillchars:get()
 

.config/nvim/lua/halfdan/telescope.lua

@@ -61,7 +61,6 @@ require('telescope').setup {
   },
 }
 
-require("telescope").load_extension("git_worktree")
 require('telescope').load_extension("fzf")
 require('telescope').load_extension("dap")
 require('telescope').load_extension("smart_open")

.config/nvim/lua/halfdan/treesitter.lua

@@ -3,7 +3,7 @@ if vim.g.vscode then
 end
 
 require('nvim-treesitter.configs').setup({
-  ensure_installed = { "python", "go", "elixir", "heex", "rust", "gomod", "json", "lua", "yaml", "norg", "query", "markdown", "markdown_inline"},
+  ensure_installed = { "python", "go", "elixir", "heex", "rust", "gomod", "json", "lua", "yaml", "norg", "query", "markdown", "markdown_inline", "gleam", "zig", "odin"},
   ignore_install = { "haskell" },
   highlight = {
     enable = true,

.tool-versions

@@ -1,6 +1,8 @@
-elixir 1.14.4-otp-25
+elixir 1.18.2-otp-27
-golang 1.19.3
+golang 1.24.0
-erlang 25.3.2
+erlang 27.2.3
-python 3.11.0
+python 3.13.2
-neovim 0.9.4
+neovim 0.10.4
 java openjdk-19
+awscli 2.24.7
+nodejs 18.20.4

.zshrc

@@ -31,9 +31,3 @@ SAVEHIST=10000
 #compinit
 #setopt COMPLETE_ALIASES
 
-. $HOME/.asdf/asdf.sh
-. $HOME/.asdf/completions/asdf.bash
-
-# goodies
-eval "$(direnv hook zsh)"
-eval "$(starship init zsh)"