Severel changes.

2025-10-31 12:36:12 +00:00 · 2022-11-07 11:59:10 +01:00
parent 949811bf94
commit 2b3c42121a
16 changed files with 315 additions and 210 deletions
--- a/.config/nvim/after/plugin/jira.lua
+++ b/.config/nvim/after/plugin/jira.lua
@@ -0,0 +1,35 @@
+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)
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -5,16 +5,12 @@ local inoremap = Remap.inoremap
 vim.fn.sign_define("DiagnosticSignError",  {text = "", texthl = "DiagnosticSignError"})
 vim.fn.sign_define("DiagnosticSignWarn",   {text = "", texthl = "DiagnosticSignWarn"})
 vim.fn.sign_define("DiagnosticSignInfo",   {text = "", texthl = "DiagnosticSignInfo"})
-vim.fn.sign_define("DiagnosticSignHint",   {text = "", texthl = "DiagnosticSignHint"})
+-- vim.fn.sign_define("DiagnosticSignHint",   {text = "", texthl = "DiagnosticSignHint"})

 -- Set Default Prefix.
 -- Note: You can set a prefix per lsp server in the lv-globals.lua file
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
  vim.lsp.diagnostic.on_publish_diagnostics, {
-    -- virtual_text = {
-    --   prefix = "",
-    --   spacing = 1,
-    -- },
    signs = true,
    underline = true,
  }
@@ -42,6 +38,7 @@ local levels = {
  "DEBUG",
  [0] = "TRACE",
 }
+---@diagnostic disable-next-line: unused-vararg
 vim.lsp.handlers["window/showMessage"] = function(_, result, ...)
  if require("vim.lsp.log").should_log(convert_lsp_log_level_to_neovim_log_level(result.type)) then
    vim.notify(result.message, levels[result.type])
@@ -50,63 +47,36 @@ end

 -- symbols for autocomplete
 vim.lsp.protocol.CompletionItemKind = {
-    "   (Text) ",
-    "   (Method)",
-    "   (Function)",
-    "   (Constructor)",
-    " ﴲ  (Field)",
-    "[] (Variable)",
-    "   (Class)",
-    " ﰮ  (Interface)",
-    "   (Module)",
-    " 襁 (Property)",
-    "   (Unit)",
-    "   (Value)",
-    " 練 (Enum)",
-    "   (Keyword)",
-    "   (Snippet)",
-    "   (Color)",
-    "   (File)",
-    "   (Reference)",
-    "   (Folder)",
-    "   (EnumMember)",
-    " ﲀ  (Constant)",
-    " ﳤ  (Struct)",
-    "   (Event)",
-    "   (Operator)",
-    "   (TypeParameter)"
+  "   (Text) ",
+  "   (Method)",
+  "   (Function)",
+  "   (Constructor)",
+  " ﴲ  (Field)",
+  "[] (Variable)",
+  "   (Class)",
+  " ﰮ  (Interface)",
+  "   (Module)",
+  " 襁 (Property)",
+  "   (Unit)",
+  "   (Value)",
+  " 練 (Enum)",
+  "   (Keyword)",
+  "   (Snippet)",
+  "   (Color)",
+  "   (File)",
+  "   (Reference)",
+  "   (Folder)",
+  "   (EnumMember)",
+  " ﲀ  (Constant)",
+  " ﳤ  (Struct)",
+  "   (Event)",
+  "   (Operator)",
+  "   (TypeParameter)"
 }

-local function documentHighlight(client, bufnr)
-    -- Set autocommands conditional on server_capabilities
-    if client.resolved_capabilities.document_highlight then
-        vim.api.nvim_exec(
-            [[
-      hi LspReferenceRead cterm=bold ctermbg=red guibg=#464646
-      hi LspReferenceText cterm=bold ctermbg=red guibg=#464646
-      hi LspReferenceWrite cterm=bold ctermbg=red guibg=#464646
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
-    ]],
-            false
-        )
-    end
-end
-
-- -- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir)
-- vim.cmd([[
--   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
--   au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir
--   au BufRead,BufNewFile mix.lock set filetype=elixir
-- ]])
-
-

 -- Diagnostic keymaps
-vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>Lspsaga show_line_diagnostics<CR>', { noremap = true, silent = true })
 vim.api.nvim_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', { noremap = true, silent = true })

 -- LSP settings
@@ -116,16 +86,19 @@ lsp_status.register_progress()
 local lspconfig = require 'lspconfig'

 local on_attach = function(client, bufnr)
-  nnoremap("gd", function() vim.lsp.buf.definition() end)
+  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", function() vim.lsp.buf.hover() 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", function() vim.diagnostic.goto_next() end)
-  nnoremap("]d", function() vim.diagnostic.goto_prev() end)
-  nnoremap("<leader>ca", function() vim.lsp.buf.code_action() 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", function() vim.lsp.buf.rename() 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)
@@ -187,18 +160,26 @@ lspconfig.sumneko_lua.setup(config({
  }
 }))

-- Generic language server. Used to run credo
-lspconfig.efm.setup(config({
-  on_attach = on_attach,
-  filetypes = {"elixir"}
-}))
-
 require('rust-tools').setup({
-    tools = {
-        inlay_hints = {
-            parameter_hints_prefix = "← ",
-            other_hints_prefix = "➜ ",
-        }
+  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",
+        },
+      },
+    },
+  },
 })

--- a/.config/nvim/after/plugin/luasnip.lua
+++ b/.config/nvim/after/plugin/luasnip.lua
@@ -1 +1,3 @@
 require("luasnip/loaders/from_vscode").lazy_load()
+-- Load ows snippets 
+require("luasnip.loaders.from_vscode").lazy_load({ paths = { "./snippets" } })
--- a/.config/nvim/after/plugin/neotest.lua
+++ b/.config/nvim/after/plugin/neotest.lua
@@ -2,21 +2,28 @@ local nnoremap = require('halfdan.keymap').nnoremap
 local neotest = require('neotest')

 neotest.setup({
+  log_level = vim.log.levels.DEBUG,
  adapters = {
-    require("neotest-elixir"),
--    require("neotest-vim-test")({ allow_file_types = { "haskell"} }),
+    require("neotest-elixir")({
+      args = { "--trace" },
+    }),
+    require("neotest-rust"),
+    --    require("neotest-vim-test")({ allow_file_types = { "haskell"} }),
  },
 })

-nnoremap("<leader>nt", function ()
+nnoremap("<leader>nt", function()
  neotest.run.run()
 end)

-nnoremap("<leader>nf", function ()
+nnoremap("<leader>nf", function()
  neotest.run.run(vim.fn.expand("%"))
 end)

-nnoremap("<leader>nd", function ()
-  neotest.run.run({strategy = "dap"})
+nnoremap("<leader>nd", function()
+  neotest.run.run({ strategy = "dap" })
 end)

+nnoremap("<leader>ns", function()
+  neotest.summary.toggle()
+end)
--- a/.config/nvim/after/plugin/null-ls.lua
+++ b/.config/nvim/after/plugin/null-ls.lua
@@ -0,0 +1,12 @@
+local ok, nls = pcall(require, 'null-ls')
+
+if not ok then
+  return
+end
+
+nls.setup({
+    sources = {
+        nls.builtins.formatting.stylua,
+        nls.builtins.diagnostics.credo,
+    },
+})
--- a/.config/nvim/after/plugin/telescope.lua
+++ b/.config/nvim/after/plugin/telescope.lua
@@ -10,7 +10,12 @@ nnoremap("<C-p>", function()
 end)

 nnoremap("<Leader>ff", function()
-  builtin.find_files()
+  builtin.find_files({
+    hidden=true,
+  })
+end)
+nnoremap("<Leader>fh", function()
+  builtin.find_files{cwd=vim.fn.expand('%:p:h')}
 end)

 nnoremap("<Leader>fs", function()
--- a/.config/nvim/lua/halfdan/cmp.lua
+++ b/.config/nvim/lua/halfdan/cmp.lua
@@ -18,6 +18,7 @@ local has_words_before = function()
 end

 cmp.setup({
+  preselect = cmp.PreselectMode.None,
  snippet = {
    expand = function(args)
      require'luasnip'.lsp_expand(args.body)
--- a/.config/nvim/lua/halfdan/debugger/elixir.lua
+++ b/.config/nvim/lua/halfdan/debugger/elixir.lua
@@ -7,14 +7,29 @@ dap.adapters.mix_task = {
 }

 dap.configurations.elixir = {
-    {
-      type = 'mix_task',
-      name = 'mix test',
-      request = 'launch',
-      task = 'test',
-      taskArgs = { '--trace' },
-      startApps = true,
-      projectDir = "${workspaceFolder}",
-      requireFiles = { "test/**/test_helper.exs", "test/**/*_test.exs"}
+  {
+    type = 'mix_task',
+    name = 'mix test',
+    request = 'launch',
+    task = 'test',
+    taskArgs = { '--trace' },
+    startApps = false,
+    projectDir = "${workspaceFolder}",
+    requireFiles = { "test/**/test_helper.exs", "test/**/*_test.exs" }
+  },
+  {
+    name = "mix test focused",
+    type = "mix_task",
+    request = "launch",
+    taskArgs = {
+      "${relativeFile}:${lineNumber}",
+      "--color",
+      "--trace"
+    },
+    projectDir = "${workspaceRoot}",
+    requireFiles = {
+      "test/**/test_helper.exs",
+      "test/**/*_test.exs"
    }
+  }
 }
--- a/.config/nvim/lua/halfdan/globals.lua
+++ b/.config/nvim/lua/halfdan/globals.lua
@@ -1,25 +1,24 @@
 O = {
-    auto_close_tree = 0,
-    auto_complete = true,
-    background = dark,
-    ignorecase = smartcase,
-    clipboard = unnamedplus,
-    incsearch = true,
-    termguicolors = true,
-    colorscheme = 'gruvbox-baby',
-    hidden_files = true,
-    wrap_lines = false,
-    number = true,
-    relative_number = true,
-    shell = 'zsh',
-	timeoutlen = 500,
-    number = true,
-    scrolloff = 8,
-    noshowmode = true,
-    splitright = true,
-    splitbelow = true,
+  auto_close_tree = 0,
+  auto_complete = true,
+  background = 'dark',
+  ignorecase = 'smartcase',
+  clipboard = 'unnamedplus',
+  incsearch = true,
+  termguicolors = true,
+  colorscheme = 'monokaipro',
+  hidden_files = true,
+  wrap_lines = false,
+  number = true,
+  relative_number = true,
+  shell = 'zsh',
+  timeoutlen = 500,
+  scrolloff = 8,
+  noshowmode = true,
+  splitright = true,
+  splitbelow = true,

-    database = {save_location = '~/.config/nvcode_db', auto_execute = 1},
+  database = {save_location = '~/.config/nvcode_db', auto_execute = 1},
 }

 DATA_PATH = vim.fn.stdpath('data')
--- a/.config/nvim/lua/halfdan/lualine.lua
+++ b/.config/nvim/lua/halfdan/lualine.lua
@@ -9,7 +9,7 @@ end
 require 'lualine'.setup {
  options = {
    icons_enabled = true,
-    theme = 'gruvbox-baby',
+    theme = 'monokaipro',
    --component_separators = {'', ''},
    --section_separators = {'', ''},
    disabled_filetypes = {}
--- a/.config/nvim/lua/halfdan/packer.lua
+++ b/.config/nvim/lua/halfdan/packer.lua
@@ -69,7 +69,8 @@ return require("packer").startup({
        "nvim-treesitter/nvim-treesitter",
        "antoinemadec/FixCursorHold.nvim",

-        "jfpedroza/neotest-elixir"
+        "jfpedroza/neotest-elixir",
+        "rouge8/neotest-rust",
      }
    }
    use {"nvim-neotest/neotest-vim-test" }
@@ -124,6 +125,15 @@ return require("packer").startup({
    -- Used to display LSP status in Lualine
    use {'nvim-lua/lsp-status.nvim'}

+    -- null-ls for a collection of LSP-like plugins
+    use({
+        "jose-elias-alvarez/null-ls.nvim",
+        config = function()
+            require("null-ls").setup()
+        end,
+        requires = { "nvim-lua/plenary.nvim" },
+    })
+
    use {'simrat39/symbols-outline.nvim'}
    use {
      'numToStr/Comment.nvim',
@@ -137,6 +147,8 @@ return require("packer").startup({
    use {'nvim-lua/popup.nvim'}
    use {'nvim-lua/plenary.nvim'}
    use {'nvim-telescope/telescope.nvim'}
+    use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
+    use {'nvim-telescope/telescope-dap.nvim'}

    use {'theprimeagen/git-worktree.nvim'}
    use {'theprimeagen/harpoon'}
--- a/.config/nvim/lua/halfdan/settings.lua
+++ b/.config/nvim/lua/halfdan/settings.lua
@@ -31,7 +31,7 @@ vim.o.backup = false -- This is recommended by coc
 vim.o.writebackup = false -- This is recommended by coc
 vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
 vim.o.updatetime = 300 -- Faster completion
-vim.o.timeoutlen = 500 -- By default timeoutlen is 1000 ms
+vim.o.timeoutlen = 1000 -- By default timeoutlen is 1000 ms
 vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else
 vim.o.laststatus = 3 -- Set global status bar
 vim.b.did_ftplugin = 1
@@ -40,3 +40,8 @@ vim.g.gruvbox_baby_telescope_theme = 1
 vim.g.gruvbox_baby_background_color = "dark"

 vim.g.mapleader = ' '
+
+vim.g.netrw_preview = 1 -- Split preview vertically
+vim.g.netrw_alo = 1 -- Show preview window to the right
+vim.g.netrw_winsize = 30 -- Have the preview window take up 70%
+vim.g.netrw_liststyle = 3 -- Use tree style
--- a/.config/nvim/lua/halfdan/telescope.lua
+++ b/.config/nvim/lua/halfdan/telescope.lua
@@ -1,39 +1,15 @@
 local actions = require('telescope.actions')

-require("telescope").load_extension("git_worktree")
-
 -- Global remapping
 require('telescope').setup {
  defaults = {
-    find_command = { 'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case' },
+    -- find_command = { 'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case' },
    file_ignore_patterns = { "_build", "node_modules", "deps" },
    prompt_prefix = "  ",
    selection_caret = " ",
    entry_prefix = "  ",
-    initial_mode = "insert",
-    selection_strategy = "reset",
-    sorting_strategy = "descending",
-    layout_strategy = "horizontal",
-    layout_defaults = { horizontal = { mirror = false }, vertical = { mirror = false } },
-    layout_config = { prompt_position = "bottom" },
-    file_sorter = require 'telescope.sorters'.get_fuzzy_file,
-    generic_sorter = require 'telescope.sorters'.get_generic_fuzzy_sorter,
-    shorten_path = true,
-    winblend = 0,
-    width = 0.75,
-    preview_cutoff = 120,
-    results_height = 1,
-    results_width = 0.8,
-    border = {},
-    borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
-    color_devicons = true,
-    use_less = true,
-    set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
-    file_previewer = require 'telescope.previewers'.vim_buffer_cat.new,
-    grep_previewer = require 'telescope.previewers'.vim_buffer_vimgrep.new,
-    qflist_previewer = require 'telescope.previewers'.vim_buffer_qflist.new,
+    file_sorter = require 'telescope'.extensions.fzf.get_fzf_sorter,
    -- Developer configurations: Not meant for general override
-    buffer_previewer_maker = require 'telescope.previewers'.buffer_previewer_maker,
    mappings = {
      i = {
        ["<C-j>"] = actions.move_selection_next,
@@ -74,9 +50,16 @@ require('telescope').setup {
    }
  },
  extensions = {
-    fzy_native = {
-      override_generic_sorter = false,
-      override_file_sorter = true,
+    fzf = {
+      fuzzy = true,                    -- false will only do exact matching
+      override_generic_sorter = true,  -- override the generic sorter
+      override_file_sorter = true,     -- override the file sorter
+      case_mode = "smart_case",        -- or "ignore_case" or "respect_case"
+                                       -- the default case_mode is "smart_case"
    }
-  }
+  },
 }
+
+require("telescope").load_extension("git_worktree")
+require('telescope').load_extension("fzf")
+require('telescope').load_extension("dap")
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -80,41 +80,45 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/Comment.nvim",
    url = "https://github.com/numToStr/Comment.nvim"
  },
+  ["FTerm.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/FTerm.nvim",
+    url = "https://github.com/numToStr/FTerm.nvim"
+  },
  ["FixCursorHold.nvim"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/FixCursorHold.nvim",
    url = "https://github.com/antoinemadec/FixCursorHold.nvim"
  },
  LuaSnip = {
-    after = { "friendly-snippets", "nvim-cmp" },
-    config = { "\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20halfdan.luasnip\frequire\0" },
-    loaded = false,
-    needs_bufread = true,
-    only_cond = false,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/LuaSnip",
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/LuaSnip",
    url = "https://github.com/L3MON4D3/LuaSnip"
  },
  ["cmp-buffer"] = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-buffer/after/plugin/cmp_buffer.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-buffer",
    url = "https://github.com/hrsh7th/cmp-buffer"
  },
  ["cmp-cmdline"] = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-cmdline/after/plugin/cmp_cmdline.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
+    load_after = {},
    loaded = false,
    needs_bufread = false,
    only_cond = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-cmdline",
    url = "https://github.com/hrsh7th/cmp-cmdline"
  },
+  ["cmp-git"] = {
+    load_after = {},
+    loaded = true,
+    needs_bufread = false,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-git",
+    url = "https://github.com/petertriho/cmp-git"
+  },
  ["cmp-nvim-lsp"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
@@ -122,44 +126,41 @@ _G.packer_plugins = {
  },
  ["cmp-nvim-lua"] = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lua/after/plugin/cmp_nvim_lua.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lua",
    url = "https://github.com/hrsh7th/cmp-nvim-lua"
  },
  ["cmp-path"] = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-path/after/plugin/cmp_path.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-path",
    url = "https://github.com/hrsh7th/cmp-path"
  },
  ["cmp-tabnine"] = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-tabnine/after/plugin/cmp-tabnine.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp-tabnine",
    url = "https://github.com/tzachar/cmp-tabnine"
  },
  cmp_luasnip = {
    after_files = { "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp_luasnip/after/plugin/cmp_luasnip.lua" },
-    load_after = {
-      ["nvim-cmp"] = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/cmp_luasnip",
    url = "https://github.com/saadparwaiz1/cmp_luasnip"
  },
+  ["diffview.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/diffview.nvim",
+    url = "https://github.com/sindrets/diffview.nvim"
+  },
  ["editorconfig-vim"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/editorconfig-vim",
@@ -171,10 +172,8 @@ _G.packer_plugins = {
    url = "https://github.com/mhanberg/elixir.nvim"
  },
  ["friendly-snippets"] = {
-    load_after = {
-      LuaSnip = true
-    },
-    loaded = false,
+    load_after = {},
+    loaded = true,
    needs_bufread = false,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/friendly-snippets",
    url = "https://github.com/rafamadriz/friendly-snippets"
@@ -194,6 +193,11 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/gruvbox-baby",
    url = "https://github.com/luisiacc/gruvbox-baby"
  },
+  harpoon = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/harpoon",
+    url = "https://github.com/theprimeagen/harpoon"
+  },
  ["impatient.nvim"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/impatient.nvim",
@@ -219,28 +223,24 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/lualine.nvim",
    url = "https://github.com/nvim-lualine/lualine.nvim"
  },
+  ["monokai-pro.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/monokai-pro.nvim",
+    url = "https://gitlab.com/__tpb/monokai-pro.nvim"
+  },
  neogit = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neogit",
    url = "https://github.com/TimUntersberger/neogit"
  },
  neorg = {
-    after = { "neorg-telescope" },
-    config = { "\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18halfdan.neorg\frequire\0" },
-    load_after = {},
-    loaded = false,
-    needs_bufread = true,
-    only_cond = false,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/neorg",
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neorg",
    url = "https://github.com/nvim-neorg/neorg"
  },
  ["neorg-telescope"] = {
-    load_after = {
-      neorg = true
-    },
-    loaded = false,
-    needs_bufread = false,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/neorg-telescope",
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neorg-telescope",
    url = "https://github.com/nvim-neorg/neorg-telescope"
  },
  neotest = {
@@ -253,26 +253,25 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neotest-elixir",
    url = "https://github.com/jfpedroza/neotest-elixir"
  },
+  ["neotest-rust"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neotest-rust",
+    url = "https://github.com/rouge8/neotest-rust"
+  },
  ["neotest-vim-test"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/neotest-vim-test",
    url = "https://github.com/nvim-neotest/neotest-vim-test"
  },
-  ["nord-vim"] = {
+  ["null-ls.nvim"] = {
+    config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fnull-ls\frequire\0" },
    loaded = true,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/nord-vim",
-    url = "https://github.com/arcticicestudio/nord-vim"
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
+    url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
  },
  ["nvim-cmp"] = {
-    after = { "cmp-buffer", "cmp-nvim-lua", "cmp-tabnine", "cmp-path", "cmp_luasnip", "cmp-cmdline" },
-    config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16halfdan.cmp\frequire\0" },
-    load_after = {
-      LuaSnip = true
-    },
-    loaded = false,
-    needs_bufread = false,
-    only_cond = false,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/opt/nvim-cmp",
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/nvim-cmp",
    url = "https://github.com/hrsh7th/nvim-cmp"
  },
  ["nvim-dap"] = {
@@ -322,11 +321,6 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
    url = "https://github.com/kyazdani42/nvim-web-devicons"
  },
-  ["onedark.vim"] = {
-    loaded = true,
-    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/onedark.vim",
-    url = "https://github.com/joshdick/onedark.vim"
-  },
  ["packer.nvim"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/packer.nvim",
@@ -359,11 +353,26 @@ _G.packer_plugins = {
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/rust.vim",
    url = "https://github.com/rust-lang/rust.vim"
  },
+  ["symbols-outline.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim",
+    url = "https://github.com/simrat39/symbols-outline.nvim"
+  },
  tagbar = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/tagbar",
    url = "https://github.com/preservim/tagbar"
  },
+  ["telescope-dap.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/telescope-dap.nvim",
+    url = "https://github.com/nvim-telescope/telescope-dap.nvim"
+  },
+  ["telescope-fzf-native.nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
+    url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
+  },
  ["telescope.nvim"] = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/telescope.nvim",
@@ -413,10 +422,19 @@ _G.packer_plugins = {
    loaded = true,
    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/vim-test",
    url = "https://github.com/vim-test/vim-test"
+  },
+  ["zk-nvim"] = {
+    loaded = true,
+    path = "/Users/matthiasnienaber/.local/share/nvim/site/pack/packer/start/zk-nvim",
+    url = "https://github.com/mickael-menu/zk-nvim"
  }
 }

 time([[Defining packer_plugins]], false)
+-- Config for: null-ls.nvim
+time([[Config for null-ls.nvim]], true)
+try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fnull-ls\frequire\0", "config", "null-ls.nvim")
+time([[Config for null-ls.nvim]], false)
 -- Config for: Comment.nvim
 time([[Config for Comment.nvim]], true)
 try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
@@ -424,16 +442,23 @@ time([[Config for Comment.nvim]], false)
 -- Load plugins in order defined by `after`
 time([[Sequenced loading]], true)
 vim.cmd [[ packadd nvim-treesitter ]]
-vim.cmd [[ packadd nvim-treesitter-textobjects ]]
 vim.cmd [[ packadd playground ]]
+vim.cmd [[ packadd nvim-treesitter-textobjects ]]
+vim.cmd [[ packadd nvim-cmp ]]
+vim.cmd [[ packadd cmp-git ]]
+vim.cmd [[ packadd cmp-tabnine ]]
+vim.cmd [[ packadd cmp_luasnip ]]
+vim.cmd [[ packadd cmp-nvim-lua ]]
+vim.cmd [[ packadd cmp-buffer ]]
+vim.cmd [[ packadd cmp-path ]]
+vim.cmd [[ packadd LuaSnip ]]
+vim.cmd [[ packadd friendly-snippets ]]
 time([[Sequenced loading]], false)
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]
  -- Event lazy-loads
 time([[Defining lazy-load event autocommands]], true)
 vim.cmd [[au CmdlineEnter * ++once lua require("packer.load")({'cmp-cmdline'}, { event = "CmdlineEnter *" }, _G.packer_plugins)]]
-vim.cmd [[au BufEnter * ++once lua require("packer.load")({'neorg'}, { event = "BufEnter *" }, _G.packer_plugins)]]
-vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'LuaSnip', 'nvim-cmp'}, { event = "InsertEnter *" }, _G.packer_plugins)]]
 time([[Defining lazy-load event autocommands]], false)
 vim.cmd("augroup END")

--- a/.config/nvim/snippets/lua.json
+++ b/.config/nvim/snippets/lua.json
@@ -0,0 +1,10 @@
+{
+    "anonymous-function": {
+        "prefix": "fn",
+        "body": [
+            "function($1)",
+            "\t${0:-- code}",
+            "end"
+        ]
+    }
+}
--- a/.config/nvim/snippets/package.json
+++ b/.config/nvim/snippets/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "halfdans-collection",
+  "engines": {
+    "vscode": "^1.11.0"
+  },
+  "contributes": {
+    "snippets": [
+      {
+        "language": "lua",
+        "path": "./snippets/lua.json"
+      }
+  }
+}