Many changes

.config/nvim/lua/halfdan/debugger/elixir.lua

@@ -2,7 +2,7 @@ local dap = require('dap')
 
 dap.adapters.mix_task = {
   type = 'executable',
-  command = '/home/halfdan/opt/elixir-ls/bin/debugger.sh', -- debugger.bat for windows
+  command = '/usr/local/opt/elixir-ls/rel/debugger.sh', -- debugger.bat for windows
   args = {}
 }
 

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

@@ -1,21 +1,21 @@
-require("halfdan.settings")
 require("halfdan.packer")
 
+require("halfdan.settings")
+
 require("impatient")
 
 require("halfdan.neogit")
+require("halfdan.neorg")
 
 require('halfdan.globals')
 require('halfdan.keymap')
-
+require('halfdan.cmp')
+require('halfdan.luasnip')
 require('halfdan.colorscheme')
 require('halfdan.treesitter')
 require('halfdan.telescope')
-
 require('halfdan.lualine')
 
-require('halfdan.themes.nord')
-
 require('halfdan.autocmds')
 
 require('halfdan.debugger')

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

@@ -1,4 +1,4 @@
-require'lualine'.setup {
+require 'lualine'.setup {
   options = {
     icons_enabled = true,
     theme = 'gruvbox-baby',
@@ -7,18 +7,18 @@ require'lualine'.setup {
     disabled_filetypes = {}
   },
   sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch'},
-    lualine_c = { 'filename', 'diff' },
-    lualine_x = {"require'lsp-status'.status()", 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
+    lualine_a = { 'mode' },
+    lualine_b = { 'branch', 'diff', 'diagnostics' },
+    lualine_c = { 'filename' },
+    lualine_x = { "require'lsp-status'.status()", 'filetype' },
+    lualine_y = { 'progress' },
+    lualine_z = { 'location' }
   },
   inactive_sections = {
     lualine_a = {},
     lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
+    lualine_c = { 'filename' },
+    lualine_x = { 'location' },
     lualine_y = {},
     lualine_z = {}
   },
@@ -28,9 +28,12 @@ require'lualine'.setup {
     lualine_a = {
     },
     lualine_b = {},
-    lualine_c = {'filename' },
+    lualine_c = { 'filename' },
     lualine_x = {},
     lualine_y = {},
     lualine_z = {}
+  },
+  inactive_winbar = {
+    lualine_c = { 'filename' },
   }
 }

.config/nvim/lua/halfdan/neogit.lua

@@ -1,7 +1,11 @@
 local neogit = require('neogit')
 local nnoremap = require('halfdan.keymap').nnoremap
 
-neogit.setup {}
+neogit.setup {
+  integrations = {
+    diffview = true
+  }
+}
 
 nnoremap("<leader>gs", function()
     neogit.open({ })

.config/nvim/lua/halfdan/neorg.lua

@@ -1,32 +1,37 @@
 local neorg = require("neorg")
 
 neorg.setup({
-    load = {
-        ["core.defaults"] = {},
-        ["core.norg.dirman"] = {
-            config = {
-                workspaces = {
-                    work = "~/org/work",
-                    home = "~/org/home",
-                }
-            }
-        },
-        ["core.gtd.base"] = {
-            config = {
-              workspace = "work",
-            },
-        },
-        ["core.norg.completion"] = {
-            config = {
-              engine = "nvim-cmp",
-            },
-        },
-        ["core.norg.concealer"] = {},
-        ["core.norg.journal"] = {
-            config = {
-              strategy = "flat",
-            },
-        },
-        ["core.integrations.telescope"] = {},
-    }
+  load = {
+    ["core.defaults"] = {},
+    ["core.norg.dirman"] = {
+      config = {
+        workspaces = {
+          work = "~/org/work",
+          home = "~/org/home",
+        }
+      }
+    },
+    ["core.gtd.base"] = {
+      config = {
+        workspace = "work",
+      },
+    },
+    ["core.norg.completion"] = {
+      config = {
+        engine = "nvim-cmp",
+      },
+    },
+    ["core.norg.concealer"] = {},
+    ["core.norg.journal"] = {
+      config = {
+        strategy = "flat",
+      },
+    },
+    ["core.integrations.telescope"] = {},
+    ["core.norg.esupports.metagen"] = {
+      config = {
+        type = "auto",
+      },
+    },
+  }
 })

.config/nvim/lua/halfdan/packer.lua

@@ -37,7 +37,7 @@ return require("packer").startup({
 
     use 'lewis6991/impatient.nvim'
 
-    use {'TimUntersberger/neogit' }
+    use {'TimUntersberger/neogit', requires = {'sindrets/diffview.nvim' } }
     use {'airblade/vim-gitgutter'}
     -- use {'andymass/vim-matchup'}
 
@@ -52,7 +52,6 @@ return require("packer").startup({
     use {'tpope/vim-dispatch'}
 
     -- Treesitter
-    
     use {
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate',
@@ -86,15 +85,9 @@ return require("packer").startup({
 
     use {'rcarriga/nvim-notify'}
 
-    use {
-      "nvim-neorg/neorg",
-      event = "BufEnter",
-      after = "nvim-treesitter",
-      config = function()
-        require 'halfdan.neorg'
-      end
-    }
-    use {'nvim-neorg/neorg-telescope', after = "neorg"}
+    use { "nvim-neorg/neorg" }
+    use {'nvim-neorg/neorg-telescope'}
+    use{ "mickael-menu/zk-nvim" }
 
     use {'justinmk/vim-sneak'}
 
@@ -107,13 +100,7 @@ return require("packer").startup({
       'williamboman/nvim-lsp-installer',
     }
 
-    use {
-        'L3MON4D3/LuaSnip',
-        event = "InsertEnter",
-        config = function()
-          require 'halfdan.luasnip'
-        end,
-    }
+    use {'L3MON4D3/LuaSnip'}
     use {"rafamadriz/friendly-snippets", after="LuaSnip"}
 
     use {
@@ -127,12 +114,7 @@ return require("packer").startup({
         { 'saadparwaiz1/cmp_luasnip', after = 'nvim-cmp' },
         { 'hrsh7th/cmp-cmdline', after = 'nvim-cmp', event = 'CmdlineEnter' },
         {'tzachar/cmp-tabnine', run = './install.sh', after = 'nvim-cmp' }
-      },
-      config = function()
-        require 'halfdan.cmp'
-      end,
-      event = 'InsertEnter',
-      after = 'LuaSnip',
+      }
     }
 
     use {'glepnir/lspsaga.nvim'}
@@ -140,7 +122,7 @@ return require("packer").startup({
     -- Used to display LSP status in Lualine
     use {'nvim-lua/lsp-status.nvim'}
 
-    --use {'simrat39/symbols-outline.nvim'}
+    use {'simrat39/symbols-outline.nvim'}
     use {
       'numToStr/Comment.nvim',
       config = function()
@@ -150,11 +132,10 @@ return require("packer").startup({
     -- Telescope fuzzy find files/grep
     use {'nvim-lua/popup.nvim'}
     use {'nvim-lua/plenary.nvim'}
-    
     use {'nvim-telescope/telescope.nvim'}
-    
 
     use {'theprimeagen/git-worktree.nvim'}
+    use {'theprimeagen/harpoon'}
 
     -- Debugging
     use("mfussenegger/nvim-dap")
@@ -170,10 +151,12 @@ return require("packer").startup({
     -- vim.g.latex_to_unicode_auto = 1
 
     -- themes & colorschemes
-    use {'arcticicestudio/nord-vim'}
-    use {'joshdick/onedark.vim'}
     use {'gruvbox-community/gruvbox'}
     use {'luisiacc/gruvbox-baby'}
+    use {
+      'https://gitlab.com/__tpb/monokai-pro.nvim',
+      as = 'monokai-pro.nvim'
+    }
   end,
   config = {
     display = {

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

@@ -1,29 +1,26 @@
 vim.notify = require("notify")
 
-vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object"
-vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
-vim.cmd('set inccommand=split') -- Make substitution work in realtime
+vim.opt.iskeyword:append("-") -- treat dash separated words as a word text object"
+vim.opt.shortmess:append("c") -- Don't pass messages to |ins-completion-menu|.
+vim.opt.inccommand = "split" -- Make substitution work in realtime
 vim.o.hidden = true -- Required to keep multiple buffers open multiple buffers
 vim.o.title = true
-TERMINAL = vim.fn.expand('$TERMINAL')
-vim.cmd('let &titleold="'..TERMINAL..'"')
 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.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
+-- vim.cmd('syntax on') -- syntax highlighting
 vim.o.pumheight = 10 -- Makes popup menu smaller
 vim.o.fileencoding = "utf-8" -- The encoding written to file
 vim.o.cmdheight = 1 -- More space for displaying messages
-vim.cmd('set colorcolumn=99999') -- fix indentline for now
 vim.o.mouse = "a" -- Enable your mouse
 vim.o.splitbelow = true -- Horizontal splits will automatically be below
 vim.o.termguicolors = true -- set term gui colors most terminals support this
 vim.o.splitright = true -- Vertical splits will automatically be to the right
 vim.opt.conceallevel = 2
 vim.opt.concealcursor = 'nc'
-vim.cmd('set ts=2') -- Insert 4 spaces for a tab
-vim.cmd('set sw=2') -- Change the number of space characters inserted for indentation
-vim.cmd('set expandtab') -- Converts tabs to spaces
+vim.o.tabstop = 2 -- Insert 4 spaces for a tab
+vim.o.shiftwidth = 2 -- Change the number of space characters inserted for indentation
+vim.o.expandtab = true -- Converts tabs to spaces
 vim.bo.smartindent = false -- Makes indenting smart
 vim.wo.number = true -- set numbered lines
 vim.wo.relativenumber = true -- set relative number

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

@@ -5,10 +5,8 @@ require("telescope").load_extension("git_worktree")
 -- Global remapping
 require('telescope').setup {
   defaults = {
-    find_command = {'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case'},
-    file_ignore_patterns = {"_build", "node_modules", "deps" },
-    prompt_position = "bottom",
-    --prompt_prefix = " ",
+    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 = "  ",
@@ -16,9 +14,10 @@ require('telescope').setup {
     selection_strategy = "reset",
     sorting_strategy = "descending",
     layout_strategy = "horizontal",
-    layout_defaults = {horizontal = {mirror = false}, vertical = {mirror = false}},
-    file_sorter = require'telescope.sorters'.get_fuzzy_file,
-    generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter,
+    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,
@@ -26,15 +25,15 @@ require('telescope').setup {
     results_height = 1,
     results_width = 0.8,
     border = {},
-    borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'},
+    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,
+    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,
     -- Developer configurations: Not meant for general override
-    buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker,
+    buffer_previewer_maker = require 'telescope.previewers'.buffer_previewer_maker,
     mappings = {
       i = {
         ["<C-j>"] = actions.move_selection_next,
@@ -62,6 +61,18 @@ require('telescope').setup {
       }
     }
   },
+  pickers = {
+    buffers = {
+      mappings = {
+        n = {
+          ['d'] = actions.delete_buffer
+        }, -- n
+        i = {
+          ['<c-d>'] = actions.delete_buffer
+        },
+      }
+    }
+  },
   extensions = {
     fzy_native = {
       override_generic_sorter = false,

.config/nvim/lua/halfdan/themes/nord.lua

@@ -1,4 +0,0 @@
-vim.g.nord_cursor_line_number_background = 1
-vim.g.nord_bold = 1
-vim.g.nord_italic = 1
-vim.g.nord_italic_comments = 1

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

@@ -1,16 +1,14 @@
 require('nvim-treesitter.configs').setup({
-  ensure_installed = { "python", "go", "elixir", "rust", "gomod", "json", "lua", "ruby", "yaml", "org" },
+  ensure_installed = { "python", "go", "elixir", "rust", "gomod", "json", "lua", "ruby", "yaml", "norg", "query" },
   ignore_install = { "haskell" },
   highlight = {
     enable = true,
-    additional_vim_regex_highlighting = {'org'},
   },
   indent = {
     enable = true,
-    disable = { 'org' },
   },
   incremental_selection = {
-    enable = false,
+    enable = true,
     keymaps = {
       init_selection = "gnn",
       node_incremental = "grn",