Merge branch 'office' of git.nussnougate.net:sevi-kun/nvim into office

Change wrap indicator to 95 (company standards)

.gitignore

@@ -1,3 +1 @@
 plugin/packer_compiled.lua
-lazy-lock.json
-

.luarc.json

@@ -1,13 +0,0 @@
-{
-  "runtime.version": "LuaJIT",
-  "runtime.path": [
-    "lua/?.lua",
-    "lua/?/init.lua"
-  ],
-  "diagnostics.globals": ["vim"],
-  "workspace.checkThirdParty": false,
-  "workspace.library": [
-    "$VIMRUNTIME",
-    "./lua"
-  ]
-}

after/plugin/harpoon.lua

@@ -1,44 +1,11 @@
-local harpoon = require("harpoon")
+-- fast switching between files
+local mark = require("harpoon.mark")
+local ui = require("harpoon.ui")
 
--- REQUIRED
-harpoon:setup({})
--- REQUIRED
---
--- basic telescope configuration
-local conf = require("telescope.config").values
-local function toggle_telescope(harpoon_files)
-    local file_paths = {}
-    for _, item in ipairs(harpoon_files.items) do
-        table.insert(file_paths, item.value)
-    end
-
-    require("telescope.pickers").new({}, {
-        prompt_title = "Harpoon",
-        finder = require("telescope.finders").new_table({
-            results = file_paths,
-        }),
-        previewer = conf.file_previewer({}),
-        sorter = conf.generic_sorter({}),
-    }):find()
-end
-
-vim.keymap.set("n", "<leader>H", function() toggle_telescope(harpoon:list()) end,
-    { desc = "Open harpoon in telescope" })
-
-
-vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end,
-    { desc = "Harpoon: Add current buffer" })
-vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
-    { desc = "Harpoon: Toggle quick menu" })
-
-vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
-vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
-vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
-vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
-
--- Toggle previous & next buffers stored within Harpoon list
-vim.keymap.set("n", "<leader>hp", function() harpoon:list():prev() end,
-    { desc = "Harpoon: Previous buffer" })
-vim.keymap.set("n", "<leader>hn", function() harpoon:list():next() end,
-    { desc = "Harpoon: Next buffer" })
+vim.keymap.set("n", "<leader>a", mark.add_file)
+vim.keymap.set("n", "<leader>h", ui.toggle_quick_menu)
 
+vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+vim.keymap.set("n", "<C-j>", function() ui.nav_file(2) end)
+vim.keymap.set("n", "<C-k>", function() ui.nav_file(3) end)
+vim.keymap.set("n", "<C-l>", function() ui.nav_file(4) end)

after/plugin/lsp.lua

@@ -1,15 +1,11 @@
-local lsp_zero = require('lsp-zero')
+-- language server manager (via Mason)
+local lsp = require('lsp-zero').preset({})
 
-lsp_zero.on_attach(function(client, bufnr)
-    -- see :help lsp-zero-keybindings
-    -- to learn the available actions
-    lsp_zero.default_keymaps({buffer = bufnr})
+lsp.on_attach(function(client, bufnr)
+  lsp.default_keymaps({buffer = bufnr})
 end)
 
-require('mason').setup({})
-require('mason-lspconfig').setup({
-    ensure_installed = {},
-    handlers = {
-        lsp_zero.default_setup,
-    },
-})
+-- (Optional) Configure lua language server for neovim
+require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
+
+lsp.setup()

after/plugin/neorg.lua

@@ -0,0 +1,7 @@
+-- Note keymaps
+vim.keymap.set("n", "<leader>ni", ":Neorg index<CR>")
+vim.keymap.set("n", "<leader>nr", ":Neorg return<CR>")
+vim.keymap.set("n", "<leader>nj", ":Neorg journal custom<CR>")
+
+vim.keymap.set("n", "<leader>nim", ":Neorg inject-metadata<CR>")
+vim.keymap.set("n", "<leader>nis", ":Neorg inject-metadata<CR>")

after/plugin/telescope.lua

@@ -1,7 +1,7 @@
 -- finding files in working dir and repo
 local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fp', builtin.git_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
-vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
+vim.keymap.set('n', '<leader>pf', builtin.git_files, {})
+vim.keymap.set('n', '<leader>ps', function()
+	builtin.grep_string({ search = vim.fn.input("Grep > ") });
+end)

after/plugin/treesitter.lua

@@ -1,8 +1,8 @@
 -- parsing and highlighting
 require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
+  ensure_installed = { "python", "javascript", "typescript", "c", "rust", "bash", "lua", "vim", "vimdoc", "query" },
 
-  ensure_installed = 'all',
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
 
@@ -12,10 +12,12 @@ require'nvim-treesitter.configs'.setup {
 
   highlight = {
     enable = true,
-  },
 
-  -- Needed because treesitter highlight turns off autoindent for php files
-  indent = {
-      enable = true,
+
+    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+    -- Using this option may slow down your editor, and you may see some duplicate highlights.
+    -- Instead of true it can also be a list of languages
+    additional_vim_regex_highlighting = false,
   },
 }

init.lua

@@ -1,16 +1 @@
 require("sevi-kun")
-
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup("sevi-kun.plugins")

lua/sevi-kun/packer.lua

@@ -0,0 +1,142 @@
+-- This file can be loaded by calling `lua require('plugins')` from your init.vim
+
+-- Only required if you have packer configured as `opt`
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+    -- Packer can manage itself
+    use 'wbthomason/packer.nvim'
+
+
+    -- treesitter
+    use ('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
+    use ('nvim-treesitter/playground')
+    use ('nvim-treesitter/nvim-treesitter-context')
+
+
+    -- useful
+    use { 'rmagatti/auto-session' }
+
+    use {
+        'rmagatti/session-lens',
+        requires = {'rmagatti/auto-session', 'nvim-telescope/telescope.nvim'},
+    }
+
+    use {
+        'nvim-telescope/telescope.nvim', tag = '0.1.2',
+        requires = 'nvim-lua/plenary.nvim'
+    }
+
+    use {
+        'ThePrimeagen/harpoon',
+        requires = 'nvim-lua/plenary.nvim'
+    }
+
+    use {
+        'NeogitOrg/neogit',
+        requires = 'nvim-lua/plenary.nvim'
+    }
+
+    use { 'stevearc/oil.nvim' }
+
+    use {
+        "nvim-neorg/neorg",
+        tag = "*",
+        run = ":Neorg sync-parsers",
+        requires = "nvim-lua/plenary.nvim",
+        config = function ()
+            require('neorg').setup {
+                load = {
+                    ["core.defaults"] = {},
+                    ["core.concealer"] = {},
+                    ["core.summary"] = {},
+                    ["core.export"] = {},
+                    ["core.export.markdown"] = {},
+                    ["core.ui"] = {},
+                    ["core.ui.calendar"] = {},
+                    ["core.dirman"] = {
+                        config = {
+                            workspaces = {
+                                notes = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\Notes",
+                            },
+                            default_workspace = "notes",
+                        },
+                    },
+                },
+            }
+        end
+    }
+
+    use({
+        "kylechui/nvim-surround",
+        tag = "*", -- Use for stability; omit to use `main` branch for the latest features
+        config = function()
+            require("nvim-surround").setup()
+        end
+    })
+
+    use {
+        'numToStr/Comment.nvim',
+        config = function()
+            require('Comment').setup()
+        end
+    }
+
+    use ('mbbill/undotree')
+
+    use {
+        'm4xshen/autoclose.nvim',
+        config = function ()
+            require("autoclose").setup()
+        end
+    }
+
+
+    -- pretty
+    use {
+        "loctvl842/monokai-pro.nvim",
+        config = function()
+            require("monokai-pro").setup()
+            vim.cmd([[colorscheme monokai-pro]])
+        end
+    }
+
+    use { "lukas-reineke/indent-blankline.nvim" }
+
+    use {
+        "utilyre/barbecue.nvim", tag = "*",
+        requires = {
+            "SmiteshP/nvim-navic",
+            "nvim-tree/nvim-web-devicons", -- optional dependency
+        },
+        after = "nvim-web-devicons", -- keep this if you're using NvChad
+        config = function()
+            require("barbecue").setup()
+        end,
+    }
+
+
+    -- lsp
+    use ('github/copilot.vim')
+
+    use {
+        'VonHeikemen/lsp-zero.nvim',
+        branch = 'v2.x',
+        requires = {
+            -- LSP Support
+            {'neovim/nvim-lspconfig'},             -- Required
+            {                                      -- Optional
+            'williamboman/mason.nvim',
+            run = function()
+                pcall(vim.cmd, 'MasonUpdate')
+            end,
+        },
+        {'williamboman/mason-lspconfig.nvim'}, -- Optional
+
+        -- Autocompletion
+        {'hrsh7th/nvim-cmp'},     -- Required
+        {'hrsh7th/cmp-nvim-lsp'}, -- Required
+        {'L3MON4D3/LuaSnip'},     -- Required
+        }
+    }
+end)

lua/sevi-kun/plugins.lua

@@ -1,116 +0,0 @@
--- lazy.nvim plugins
-
-return {
-    -- treesitter
-    { "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate"
-    },
-    { "nvim-treesitter/playground" },
-    { "nvim-treesitter/nvim-treesitter-context" },
-
-
-    -- useful
-    { "rmagatti/session-lens",
-        dependencies = {
-            "rmagatti/auto-session",
-            "nvim-telescope/telescope.nvim"
-        }
-    },
-
-    { "nvim-telescope/telescope.nvim",
-        version = "0.1.x",
-        dependencies = { "nvim-lua/plenary.nvim" }
-    },
-
-    { "ThePrimeagen/harpoon",
-    	branch = "harpoon2",
-        dependencies = { "nvim-lua/plenary.nvim" },
-    },
-
-    { "NeogitOrg/neogit",
-        branch = "master",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-            "sindrets/diffview.nvim",
-            "nvim-telescope/telescope.nvim",
-        }
-    },
-
-    { "stevearc/oil.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" }
-    },
-
-    { "kylechui/nvim-surround",
-        version = "*",
-        event = "VeryLazy",
-        config = function()
-            require("nvim-surround").setup()
-        end
-    },
-
-    { "numToStr/Comment.nvim",
-        lazy = false,
-        config = function()
-            require("Comment").setup()
-        end
-    },
-
-    { "mbbill/undotree" },
-
-    { "m4xshen/autoclose.nvim",
-        config = function ()
-            require("autoclose").setup()
-        end
-    },
-
-
-    -- pretty
-
-    { "navarasu/onedark.nvim",
-        lazy = false,
-        priority = 1000,
-        config = function()
-            vim.cmd("colorscheme onedark")
-        end
-    },
-
-    { "lukas-reineke/indent-blankline.nvim",
-        lazy = false,
-        main = "ibl",
-        opts = {},
-        config = function()
-            require("ibl").setup({})
-        end
-    },
-
-    { "utilyre/barbecue.nvim",
-        lazy = false,
-        name = "barbecue",
-        version = "*",
-        dependencies = {
-            "SmiteshP/nvim-navic",
-            "nvim-tree/nvim-web-devicons",
-        },
-    },
-
-
-    -- lsp
-
-    {
-        "Exafunction/codeium.vim",
-        event = "BufEnter"
-    },
-
-    {"williamboman/mason.nvim",
-        config = function()
-            require("mason").setup({})
-        end
-    },
-    {"williamboman/mason-lspconfig.nvim"},
-
-    {"VonHeikemen/lsp-zero.nvim", branch = "v3.x"},
-    {"neovim/nvim-lspconfig"},
-    {"hrsh7th/cmp-nvim-lsp"},
-    {"hrsh7th/nvim-cmp"},
-    {"L3MON4D3/LuaSnip"},
-}

lua/sevi-kun/remap.lua

@@ -22,6 +22,3 @@ vim.keymap.set("v", "<leader>y", "\"+y")
 vim.keymap.set("n", "<leader>Y", "\"+Y")
 
 vim.keymap.set("n", "<F5>", ":make")
-
-vim.keymap.set("n", "<leader>vs", ":vs #<CR>")
-vim.keymap.set("n", "<leader>sp", ":sp #<CR>")

lua/sevi-kun/set.lua

@@ -3,7 +3,6 @@ vim.g.mapleader = " "
 vim.opt.nu = true
 vim.opt.relativenumber = true
 vim.opt.ignorecase = true
-vim.opt.cursorline = true
 
 vim.opt.tabstop =  4
 vim.opt.softtabstop = 4
@@ -12,11 +11,11 @@ vim.opt.expandtab = true
 
 vim.opt.smartindent = true
 
-vim.opt.wrap = false
+vim.opt.wrap = true
 
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
 vim.opt.undofile = true
 
 vim.opt.hlsearch = true
@@ -30,7 +29,7 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
-vim.opt.colorcolumn = "80"
+vim.opt.colorcolumn = "95"
 
 vim.g.netrw_preview   = 1
 vim.g.netrw_liststyle = 3