Delete extra things that have been deleted

init.lua

@@ -13,7 +13,66 @@ if not vim.loop.fs_stat(lazypath) then
     }
 end
 vim.opt.rtp:prepend(lazypath)
-require("lazy").setup(require "config.lazy")
+require("lazy").setup {
+    root = vim.fn.stdpath "data" .. "/lazy",
+    spec = "plugins",
+    lockfile = vim.fn.stdpath "data" .. "/lazy-lock.json",
+    dev = { path = "~/Projects/lua/nvim" },
+    install = { colorscheme = { "catppuccin" } },
+    ui = {
+        border = "rounded",
+        icons = { lazy = " " },
+    },
+    diff = { cmd = "diffview.nvim" },
+    checker = { enabled = true, frequency = 3600 },
+    performance = {
+        rtp = {
+            disabled_plugins = {
+                "gzip",
+                "matchit",
+                "matchparen",
+                "netrwPlugin",
+                "tarPlugin",
+                "tohtml",
+                "tutor",
+                "zipPlugin",
+            },
+        },
+    },
+}
 
 -- Set vim options
-require "config"
+vim.opt.laststatus = 3
+vim.opt.showtabline = 1
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.listchars = { lead = ".", trail = ".", tab = ">-" }
+vim.opt.list = true
+vim.opt.splitbelow = true
+vim.opt.splitright = true
+
+-- Global
+vim.g.loaded_perl_provider = 0
+
+-- Common keymaps
+vim.keymap.set("i", "jk", "<esc>")
+vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
+
+vim.opt.winblend = 15
+vim.opt.pumblend = 15
+
+-- neovide
+if vim.g.neovide then
+    vim.g.neovide_padding_top = 5
+    vim.g.neovide_padding_bottom = 5
+    vim.g.neovide_padding_left = 5
+    vim.g.neovide_padding_right = 5
+
+    vim.g.neovide_floating_blur_amount_x = 2.0
+    vim.g.neovide_floating_blur_amount_y = 2.0
+
+    vim.g.neovide_hide_mouse_when_typing = false
+    vim.g.neovide_remember_window_size = false
+end

lua/config/aerial.lua

@@ -1,8 +0,0 @@
-return {
-    -- optionally use on_attach to set keymaps when aerial has attached to a buffer
-    on_attach = function(bufnr)
-        -- Jump forwards/backwards with '{' and '}'
-        vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
-        vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
-    end,
-}

lua/config/barbar.lua

@@ -1,6 +0,0 @@
-return {
-    auto_hide = false,
-    hide = { extensions = true },
-    modified = { button = "●" },
-    pinned = { button = "車", filename = true, separator = { right = "" } },
-}

lua/config/barbecue.lua

@@ -1 +0,0 @@
-return { theme = "catppuccin" }

lua/config/catppuccin.lua

@@ -1,41 +0,0 @@
-local M = {
-    flavour = "macchiato",
-    term_colors = true,
-    transparent_background = true,
-    integrations = {
-        barbar = true,
-        barbecue = {
-            dim_dirname = true,
-        },
-        dashboard = true,
-        gitsigns = true,
-        hop = true,
-        indent_blankline = {
-            enabled = true,
-            colored_indent_levels = true,
-        },
-        cmp = true,
-        mason = true,
-        native_lsp = {
-            enabled = true,
-        },
-        neogit = true,
-        notify = true,
-        nvimtree = true,
-        navic = {
-            enabled = false,
-            custom_bg = "NONE",
-        },
-        treesitter = true,
-        treesitter_context = true,
-        telescope = true,
-        lsp_trouble = true,
-        which_key = true,
-    },
-}
-
-if vim.g.neovide then
-    M.transparent_background = false
-end
-
-return M

lua/config/dashboard.lua

@@ -1,58 +0,0 @@
-return {
-    theme = "hyper",
-    config = {
-        week_header = {
-            enable = true,
-        },
-        shortcut = {
-            { icon = " ", desc = "Lazy", group = "@property", action = "Lazy", key = "l" },
-            {
-                icon = " ",
-                icon_hl = "@variable",
-                desc = "Files",
-                group = "Files",
-                action = "Telescope find_files",
-                key = "f",
-            },
-            {
-                icon = " ",
-                icon_hl = "@variable",
-                desc = "Projects",
-                group = "Files",
-                action = "Telescope projects",
-                key = "p",
-            },
-            {
-                icon = " ",
-                icon_hl = "@variable",
-                desc = "Terminal",
-                group = "Files",
-                action = "ToggleTerm",
-                key = "t",
-            },
-            {
-                icon = " ",
-                desc = "Neotree",
-                group = "Files",
-                action = "Neotree float reveal reveal_force_cwd",
-                key = "n",
-            },
-            {
-                icon = " ",
-                icon_hl = "@variable",
-                desc = "Neogit",
-                group = "Label",
-                action = "Neogit",
-                key = "g",
-            },
-            {
-                icon = " ",
-                icon_hl = "@variable",
-                desc = "Git commit",
-                group = "Label",
-                action = "Neogit commit",
-                key = "c",
-            },
-        },
-    },
-}

lua/config/diffview.lua

@@ -1,6 +0,0 @@
-return {
-    enhanced_diff_hl = true,
-    file_panel = {
-        listing_style = "list",
-    },
-}

lua/config/feline.lua

@@ -1,2 +0,0 @@
-local components = require("ui.feline_components").get()
-return { components = components }

lua/config/gitsigns.lua

@@ -1,45 +0,0 @@
-return {
-    signcolumn = true,
-    numhl = true,
-    linehl = false,
-    current_line_blame = true,
-    word_diff = false,
-    on_attach = function(bufnr)
-        local gs = package.loaded.gitsigns
-
-        local function map(mode, l, r, opts)
-            opts = opts or {}
-            opts.buffer = bufnr
-            vim.keymap.set(mode, l, r, opts)
-        end
-
-        -- Navigation
-        map("n", "]c", function()
-            if vim.wo.diff then return "]c" end
-            vim.schedule(function() gs.next_hunk() end)
-            return "<Ignore>"
-        end, { expr = true })
-
-        map("n", "[c", function()
-            if vim.wo.diff then return "[c" end
-            vim.schedule(function() gs.prev_hunk() end)
-            return "<Ignore>"
-        end, { expr = true })
-
-        -- Actions
-        map({ "n", "v" }, "<leader>hs", ":Gitsigns stage_hunk<CR>")
-        map({ "n", "v" }, "<leader>hr", ":Gitsigns reset_hunk<CR>")
-        map("n", "<leader>hS", gs.stage_buffer)
-        map("n", "<leader>hu", gs.undo_stage_hunk)
-        map("n", "<leader>hR", gs.reset_buffer)
-        map("n", "<leader>hp", gs.preview_hunk)
-        map("n", "<leader>hb", function() gs.blame_line { full = true } end)
-        map("n", "<leader>tb", gs.toggle_current_line_blame)
-        map("n", "<leader>hd", gs.diffthis)
-        map("n", "<leader>hD", function() gs.diffthis "~" end)
-        map("n", "<leader>td", gs.toggle_deleted)
-
-        -- Text object
-        map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>")
-    end,
-}

lua/config/indent_blankline.lua

@@ -1,4 +0,0 @@
-return {
-    show_current_context = true,
-    show_current_context_start = false,
-}

lua/config/init.lua

@@ -1,23 +0,0 @@
--- Opt
-vim.opt.laststatus = 3
-vim.opt.showtabline = 2
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-vim.opt.number = true
-vim.opt.relativenumber = true
-vim.opt.listchars = { lead = ".", trail = ".", tab = ">-" }
-vim.opt.list = true
-vim.opt.splitbelow = true
-vim.opt.splitright = true
-
-if vim.g.neovide then
-    require "config.neovide"
-end
-
--- Global
--- vim.g.python3_host_prog = vim.fn.stdpath "config" .. "/.venv/bin/python"
-vim.g.loaded_ruby_provider = 0
-vim.g.loaded_perl_provider = 0
-
--- Keymaps
-require "config.keymaps"

lua/config/keymaps.lua

@@ -1,102 +0,0 @@
-vim.keymap.set("i", "jk", "<esc>")
-vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
-vim.keymap.set("n", "<leader>m", "<cmd>Mason<CR>")
-vim.keymap.set("n", "<leader>s", "<cmd>Dashboard<CR>")
-vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>")
-vim.keymap.set("n", "<leader>gf", "<cmd>Neogit<CR>")
-vim.keymap.set("n", "<leader>gg", "<cmd>Neogit kind=split<CR>")
-vim.keymap.set("n", "<leader>cc", "<cmd>Neogit commit<CR>")
-vim.keymap.set("n", "<leader>gp", "<cmd>Neogit kind=split pull<CR>")
-vim.keymap.set("n", "<leader>gP", "<cmd>Neogit kind=split push<CR>")
-vim.keymap.set("n", "<leader>tt", "<cmd>ToggleTerm direction=horizontal<CR>")
-vim.keymap.set({ "n", "t" }, "<A-h>", "<CMD>NavigatorLeft<CR>")
-vim.keymap.set({ "n", "t" }, "<A-l>", "<CMD>NavigatorRight<CR>")
-vim.keymap.set({ "n", "t" }, "<A-k>", "<CMD>NavigatorUp<CR>")
-vim.keymap.set({ "n", "t" }, "<A-j>", "<CMD>NavigatorDown<CR>")
-vim.keymap.set({ "n", "t" }, "<A-p>", "<CMD>NavigatorPrevious<CR>")
-
--- Telescope
-vim.keymap.set("n", "<leader>;", "<cmd>Telescope builtin<cr>")
-vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>")
-vim.keymap.set("n", "<leader>fg", "<cmd>Telescope live_grep<cr>")
-vim.keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>")
-vim.keymap.set("n", "<leader>fl", "<cmd>Telescope lsp_document_symbols<cr>")
-vim.keymap.set("n", "<leader>fe", "<cmd>Telescope diagnostics<cr>")
-vim.keymap.set("n", "<leader>fs", "<cmd>Telescope treesitter<cr>")
-vim.keymap.set("n", "<leader>fz", "<cmd>Telescope current_buffer_fuzzy_find<cr>")
-vim.keymap.set("n", "<leader>fp", "<cmd>Telescope projects<cr>")
-
--- Hop
-vim.keymap.set("n", "<leader>hw", "<cmd>HopWord<cr>")
-vim.keymap.set("n", "<leader>hl", "<cmd>HopLine<cr>")
-
--- Neotree
-vim.keymap.set("n", "<leader>nn", "<cmd>Neotree float reveal reveal_force_cwd<cr>")
-vim.keymap.set("n", "<leader>nb", "<cmd>Neotree toggle show buffers right<cr>")
-vim.keymap.set("n", "<leader>ns", "<cmd>Neotree float git_status<cr>")
-
--- Aerial
-vim.keymap.set("n", "<leader>a", "<cmd>AerialToggle!<CR>")
-
--- Trouble
-vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>")
-vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>")
-vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>")
-vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>")
-vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>")
-
--- nvim-test
-vim.keymap.set("n", "<leader>ts", "<cmd>TestSuite<cr>")
-vim.keymap.set("n", "<leader>tf", "<cmd>TestFile<cr>")
-vim.keymap.set("n", "<leader>te", "<cmd>TestEdit<cr>")
-vim.keymap.set("n", "<leader>tn", "<cmd>TestNearest<cr>")
-vim.keymap.set("n", "<leader>tl", "<cmd>TestLast<cr>")
-vim.keymap.set("n", "<leader>tv", "<cmd>TestVisit<cr>")
-vim.keymap.set("n", "<leader>ti", "<cmd>TestInfo<cr>")
-
--- barbar
--- local map = vim.api.nvim_set_keymap
-local map = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
--- Move to previous/next
-map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
-map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
--- Re-order to previous/next
-map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
-map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
--- Goto buffer in position...
-map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
-map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
-map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
-map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
-map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
-map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
-map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
-map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
-map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
-map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
--- Pin/unpin buffer
-map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
--- Close buffer
-map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
-map('n', '<A-C>', '<Cmd>BufferCloseAllButCurrentOrPinned<CR>', opts)
--- Wipeout buffer
---                 :BufferWipeout
--- Close commands
---                 :BufferCloseAllButCurrent
---                 :BufferCloseAllButPinned
---                 :BufferCloseAllButCurrentOrPinned
---                 :BufferCloseBuffersLeft
---                 :BufferCloseBuffersRight
--- Magic buffer-picking mode
-map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
--- Sort automatically by...
-map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
-map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
-map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
-map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
-
--- Other:
--- :BarbarEnable - enables barbar (enabled by default)
--- :BarbarDisable - very bad command, should never be used

lua/config/lazy.lua

@@ -1,49 +0,0 @@
-return {
-    root = vim.fn.stdpath "data" .. "/lazy",
-    spec = "plugins",
-    lockfile = vim.fn.stdpath "data" .. "/lazy-lock.json",
-    dev = {
-        path = "~/Projects/lua/nvim",
-    },
-    install = {
-        colorscheme = { "catppuccin" },
-    },
-    ui = {
-        border = "rounded",
-        icons = {
-            cmd = "⌘",
-            config = "",
-            event = "",
-            ft = "",
-            init = "",
-            keys = "",
-            plugin = "",
-            runtime = "",
-            source = "",
-            start = "",
-            task = "",
-            lazy = " ",
-        },
-    },
-    diff = {
-        cmd = "diffview.nvim",
-    },
-    checker = {
-        enabled = true,
-        frequency = 3600,
-    },
-    performance = {
-        rtp = {
-            disabled_plugins = {
-                "gzip",
-                "matchit",
-                "matchparen",
-                "netrwPlugin",
-                "tarPlugin",
-                "tohtml",
-                "tutor",
-                "zipPlugin",
-            },
-        },
-    },
-}

lua/config/neogit.lua

@@ -1,6 +0,0 @@
-return {
-    kind = "floating",
-    integrations = {
-        diffview = true,
-    },
-}

lua/config/neotree.lua

@@ -1,29 +0,0 @@
-return {
-    close_if_last_window = true,
-    use_popups_for_input = false,
-    filesystem = {
-        window = {
-            mappings = {
-                ["Z"] = "expand_all_nodes",
-                ["<tab>"] = "toggle_node",
-            },
-        },
-        filtered_items = {
-            hide_dotfiles = false,
-        },
-        group_empty_dirs = true,
-        hijack_netrw_behavior = "open_current",
-    },
-    buffers = {
-        bind_to_cwd = true,
-        follow_current_file = true,
-        group_empty_dirs = true,
-    },
-    git_status = {
-        group_empty_dirs = true,
-    },
-    source_selector = {
-        winbar = true,
-        statusline = false,
-    },
-}

lua/config/neovide.lua

@@ -1,13 +0,0 @@
-vim.opt.winblend = 50
-vim.opt.pumblend = 50
-
-vim.g.neovide_padding_top = 5
-vim.g.neovide_padding_bottom = 5
-vim.g.neovide_padding_left = 5
-vim.g.neovide_padding_right = 5
-
-vim.g.neovide_floating_blur_amount_x = 2.0
-vim.g.neovide_floating_blur_amount_y = 2.0
-
-vim.g.neovide_hide_mouse_when_typing = true
-vim.g.neovide_remember_window_size = false

lua/config/notify.lua

@@ -1,5 +0,0 @@
-return {
-    background_colour = "#000000",
-    fps = 60,
-    render = "default", -- "minimal", "simple"
-}

lua/config/nvim-autopairs.lua

@@ -1,5 +0,0 @@
-return {
-    disable_in_macro = true,
-    disable_in_visualblock = true,
-    check_ts = true,
-}

lua/config/nvim-navic.lua

@@ -1 +0,0 @@
-return { highlight = true }

lua/config/nvim_test.lua

@@ -1,6 +0,0 @@
-return {
-    termOpts = {
-        direction = "horizontal",
-        keep_one = true,
-    },
-}

lua/config/project.lua

@@ -1,5 +0,0 @@
-return {
-    ignore_lsp = { "efm", "null-ls" },
-    show_hidden = true,
-    silent_chdir = true,
-}

lua/config/telescope.lua

@@ -1,18 +0,0 @@
-local trouble = require "trouble.providers.telescope"
-return {
-    defaults = {
-        layout_strategy = "flex",
-        mappings = {
-            i = { ["<c-t>"] = trouble.open_with_trouble },
-            n = { ["<c-t>"] = trouble.open_with_trouble },
-        },
-        winblend = vim.o.winblend,
-    },
-    extensions = {
-        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
-        },
-    },
-}

lua/config/treesitter.lua

@@ -1,32 +0,0 @@
-return {
-    highlight = {
-        enable = true,
-        additional_vim_regex_highlighting = false,
-    },
-    incremental_selection = {
-        enable = true,
-        keymaps = {
-            init_selection = "gnn",
-            node_incremental = "gnr",
-            scope_incremental = "gnc",
-            node_decremental = "gnm",
-        },
-    },
-    indent = {
-        enable = true,
-    },
-    refactor = {
-        smart_rename = {
-            enable = true,
-            keymaps = {
-                smart_rename = "grr",
-            },
-        },
-        navigation = {
-            enable = true,
-            keymaps = {
-                goto_definition_lsp_fallback = "gnd",
-            },
-        },
-    },
-}

lua/config/trouble.lua

@@ -1,7 +0,0 @@
-return {
-    mode = "workspace_diagnostics",
-    auto_open = false,
-    auto_close = false,
-    auto_preview = true,
-    auto_jump = { "lsp_definitions", "lsp_references", "lsp_implementations" },
-}

lua/config/twilight.lua

@@ -1,4 +0,0 @@
-return {
-    context = 10,
-    treesitter = true,
-}

lua/config/zen_mode.lua

@@ -1,23 +0,0 @@
-return {
-    window = {
-        options = {
-            signcolumn = "no", -- disable signcolumn
-            number = false, -- disable number column
-            relativenumber = false, -- disable relative numbers
-            cursorline = false, -- disable cursorline
-            cursorcolumn = false, -- disable cursor column
-            foldcolumn = "0", -- disable fold column
-            list = false, -- disable whitespace characters
-        },
-    },
-    plugins = {
-        options = {
-            enabled = true,
-        },
-        twilight = { enabled = true },
-        gitsigns = { enabled = true },
-        tmux = { enabled = true },
-    },
-    on_open = function(win) vim.wo.scrolloff = 999 end,
-    on_close = function(win) vim.wo.scrolloff = 0 end,
-}

lua/plugins/aerial.lua

@@ -1,17 +0,0 @@
-return {
-    "stevearc/aerial.nvim",
-    name = "aerial",
-    cmd = {
-        "AerialOpen",
-        "AerialOpenAll",
-        "AerialNext",
-        "AerialPrev",
-        "AerialGo",
-        "AerialInfo",
-        "AerialToggle",
-    },
-    config = function()
-        require("aerial").setup(require "config.aerial")
-        vim.keymap.set("n", "<leader>fa", "<cmd>Telescope aerial<cr>")
-    end,
-}

lua/plugins/barbar.lua

@@ -1,9 +0,0 @@
-return {
-    "romgrk/barbar.nvim",
-    dependencies = "nvim-tree/nvim-web-devicons",
-    event = { "BufReadPre", "BufNewFile" },
-    init = function() vim.g.barbar_auto_setup = false end,
-    config = true,
-    opts = require "config.barbar",
-    version = "^1.0.0", -- optional: only update when a new 1.x version is released
-}

lua/plugins/barbecue.lua

@@ -1,12 +0,0 @@
-return {
-    "utilyre/barbecue.nvim",
-    name = "barbecue",
-    version = "*",
-    dependencies = {
-        "SmiteshP/nvim-navic",
-        "nvim-tree/nvim-web-devicons",
-    },
-    event = { "BufReadPre", "BufNewFile" },
-    -- opts = require "config.barbecue",
-    config = function() require("barbecue").setup(require "config.barbecue") end,
-}

lua/plugins/feline.lua

@@ -1,6 +0,0 @@
-return {
-    "feline-nvim/feline.nvim",
-    dependencies = { require "plugins.catppuccin" },
-    event = { "BufReadPre", "BufNewFile" },
-    config = function() require("feline").setup(require "config.feline") end,
-}

lua/plugins/fugitive.lua

@@ -1,5 +0,0 @@
-return {
-    "tpope/vim-fugitive",
-    cmd = { "G", "Git" },
-    lazy = true,
-}