revert

dots/.nvim-environments/primary/config/lua/plugins/configs/_cmp.lua

@@ -1,53 +1,49 @@
-local loaded, cmp = pcall(require, "cmp")
+local cmp = require('cmp')
-if not loaded then
+local types = require('cmp.types')
-    return
+local str = require('cmp.utils.str')
-end
-
-local types = require("cmp.types")
-local str = require("cmp.utils.str")
 local compare = cmp.config.compare
-local luasnip = require("luasnip")
+local luasnip = require('luasnip')
 
 local kind_icons = {
-    Text = "",
+    Text = '',
-    Method = "",
+    Method = '',
-    Function = "",
+    Function = '',
-    Constructor = "",
+    Constructor = '',
-    Field = "",
+    Field = '',
-    Variable = "",
+    Variable = '',
-    Class = "ﴯ",
+    Class = 'ﴯ',
-    Interface = "",
+    Interface = '',
-    Module = "",
+    Module = '',
-    Property = "ﰠ",
+    Property = 'ﰠ',
-    Unit = "",
+    Unit = '',
-    Value = "",
+    Value = '',
-    Enum = "",
+    Enum = '',
-    Keyword = "",
+    Keyword = '',
-    Snippet = "",
+    Snippet = '',
-    Color = "",
+    Color = '',
-    File = "",
+    File = '',
-    Reference = "",
+    Reference = '',
-    Folder = "",
+    Folder = '',
-    EnumMember = "",
+    EnumMember = '',
-    Constant = "",
+    Constant = '',
-    Struct = "",
+    Struct = '',
-    Event = "",
+    Event = '',
-    Operator = "",
+    Operator = '',
-    TypeParameter = "",
+    TypeParameter = '',
 }
 
 -- Load Snippets
-require("luasnip.loaders.from_vscode").lazy_load()
+require('luasnip.loaders.from_vscode').lazy_load()
 
 local border = {
-    { "╭", "CmpBorder" },
+    { '╭', 'CmpBorder' },
-    { "─", "CmpBorder" },
+    { '─', 'CmpBorder' },
-    { "╮", "CmpBorder" },
+    { '╮', 'CmpBorder' },
-    { "│", "CmpBorder" },
+    { '│', 'CmpBorder' },
-    { "╯", "CmpBorder" },
+    { '╯', 'CmpBorder' },
-    { "─", "CmpBorder" },
+    { '─', 'CmpBorder' },
-    { "╰", "CmpBorder" },
+    { '╰', 'CmpBorder' },
-    { "│", "CmpBorder" },
+    { '│', 'CmpBorder' },
 }
 
 cmp.setup({
@@ -69,33 +65,32 @@ cmp.setup({
             local max = 50
             if string.len(word) >= max then
                 local before = string.sub(word, 1, math.floor((max - 3) / 2))
-                word = before .. "..."
+                word = before .. '...'
             end
 
-            if
+            if entry.completion_item.insertTextFormat == types.lsp.InsertTextFormat.Snippet
-                entry.completion_item.insertTextFormat == types.lsp.InsertTextFormat.Snippet
+                and string.sub(vim_item.abbr, -1, -1) == '~'
-                and string.sub(vim_item.abbr, -1, -1) == "~"
             then
-                word = word .. "~"
+                word = word .. '~'
             end
             vim_item.abbr = word
             -- Kind icons
-            vim_item.kind = string.format("%s %s", kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind
+            vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind
             -- Source
             vim_item.menu = ({
-                fuzzy_buffer = "[Buffer]",
+                fuzzy_buffer = '[Buffer]',
-                nvim_lsp = "[Lsp]",
+                nvim_lsp = '[Lsp]',
-                luasnip = "[LuaSnip]",
+                luasnip = '[LuaSnip]',
-                path = "[Path]",
+                path = '[Path]',
-                calc = "[Calculator]",
+                calc = '[Calculator]',
-                neorg = "[Neorg]",
+                neorg = '[Neorg]',
-                emoji = "[Emoji]",
+                emoji = '[Emoji]',
-                zsh = "[Zsh]",
+                zsh = '[Zsh]',
-                crates = "[Crates]",
+                crates = '[Crates]',
-                cmdline_history = "[Cmd History]",
+                cmdline_history = '[Cmd History]',
-                rg = "[Ripgrep]",
+                rg = '[Ripgrep]',
-                npm = "[Npm],",
+                npm = '[Npm],',
-                conventionalcommits = "[Commit]",
+                conventionalcommits = '[Commit]',
             })[entry.source.name]
             return vim_item
         end,
@@ -115,41 +110,41 @@ cmp.setup({
     snippet = {
         -- REQUIRED - you must specify a snippet engine
         expand = function(args)
-            require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
+            require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
         end,
     },
     mapping = {
-        ["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
+        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-        ["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
+        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
-        ["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
+        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-        ["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+        ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
-        ["<C-e>"] = cmp.mapping({
+        ['<C-e>'] = cmp.mapping({
             i = cmp.mapping.abort(),
             c = cmp.mapping.close(),
         }),
-        ["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        ["<C-Tab>"] = cmp.mapping(function(fallback)
+        ['<C-Tab>'] = cmp.mapping(function(fallback)
             if luasnip.expand_or_jumpable() then
                 luasnip.expand_or_jump()
             else
                 fallback()
             end
-        end, { "i", "s" }),
+        end, { 'i', 's' }),
-        ["<C-S-Tab>"] = cmp.mapping(function(fallback)
+        ['<C-S-Tab>'] = cmp.mapping(function(fallback)
             if luasnip.jumpable(-1) then
                 luasnip.jump(-1)
             else
                 fallback()
             end
-        end, { "i", "s" }),
+        end, { 'i', 's' }),
-        ["<Tab>"] = cmp.mapping(function(fallback)
+        ['<Tab>'] = cmp.mapping(function(fallback)
             if cmp.visible() then
                 cmp.select_next_item()
             else
                 fallback()
             end
-        end, { "i", "s" }),
+        end, { 'i', 's' }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
+        ['<S-Tab>'] = cmp.mapping(function(fallback)
             if cmp.visible() then
                 cmp.select_prev_item()
             elseif luasnip.jumpable(-1) then
@@ -157,21 +152,21 @@ cmp.setup({
             else
                 fallback()
             end
-        end, { "i", "s" }),
+        end, { 'i', 's' }),
     },
     sources = cmp.config.sources({
-        { name = "nvim_lsp", priority = 10 },
+        { name = 'nvim_lsp', priority = 10 },
-        { name = "luasnip", priority = 9 }, -- For luasnip users.
+        { name = 'luasnip', priority = 9 }, -- For luasnip users.
-        { name = "fuzzy_buffer", priority = 8 },
+        { name = 'fuzzy_buffer', priority = 8 },
-        { name = "rg", priority = 7 },
+        { name = 'rg', priority = 7 },
-        { name = "path", priority = 6 },
+        { name = 'path', priority = 6 },
-        { name = "zsh", priority = 5 },
+        { name = 'zsh', priority = 5 },
-        { name = "emoji", keyword_length = 2 },
+        { name = 'emoji', keyword_length = 2 },
-        { name = "neorg" },
+        { name = 'neorg' },
-        { name = "calc" },
+        { name = 'calc' },
-        { name = "npm", keyword_length = 2 },
+        { name = 'npm', keyword_length = 2 },
         {
-            name = "dictionary",
+            name = 'dictionary',
             keyword_length = 2,
         },
     }),
@@ -181,7 +176,7 @@ cmp.setup({
             compare.offset,
             compare.recently_used,
             compare.exact,
-            require("cmp_fuzzy_buffer.compare"),
+            require('cmp_fuzzy_buffer.compare'),
             compare.kind,
             compare.sort_text,
             compare.length,
@@ -191,55 +186,55 @@ cmp.setup({
 })
 
 -- Git Commit Completions
-cmp.setup.filetype("gitcommit", {
+cmp.setup.filetype('gitcommit', {
     sources = cmp.config.sources({
-        { name = "conventionalcommits", priority = 20 },
+        { name = 'conventionalcommits', priority = 20 },
     }),
 })
 
-cmp.setup.filetype("NeogitCommitMesssage", {
+cmp.setup.filetype('NeogitCommitMesssage', {
     sources = cmp.config.sources({
-        { name = "conventionalcommits", priority = 20 },
+        { name = 'conventionalcommits', priority = 20 },
     }),
 })
 
-cmp.setup.filetype("toml", {
+cmp.setup.filetype('toml', {
     sources = cmp.config.sources({
-        { name = "crates" },
+        { name = 'crates' },
     }),
 })
 
 -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline("/", {
+cmp.setup.cmdline('/', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
-        { name = "fuzzy_buffer" },
+        { name = 'fuzzy_buffer' },
-        { name = "cmdline_history" },
+        { name = 'cmdline_history' },
     }),
 })
 
-cmp.setup.cmdline("?", {
+cmp.setup.cmdline('?', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
-        { name = "fuzzy_buffer" },
+        { name = 'fuzzy_buffer' },
-        { name = "cmdline_history" },
+        { name = 'cmdline_history' },
     }),
 })
 
-cmp.setup.cmdline("@", {
+cmp.setup.cmdline('@', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
-        { name = "fuzzy_buffer" },
+        { name = 'fuzzy_buffer' },
-        { name = "cmdline_history" },
+        { name = 'cmdline_history' },
     }),
 })
 
 -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline(":", {
+cmp.setup.cmdline(':', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
-        { name = "path" },
+        { name = 'path' },
-        { name = "cmdline" },
+        { name = 'cmdline' },
-        { name = "cmdline_history" },
+        { name = 'cmdline_history' },
     }),
 })

dots/.nvim-environments/primary/config/lua/plugins/configs/_dap.lua

@@ -1,44 +1,41 @@
-local loaded, dap = pcall(require, "dap")
+local dap = require('dap')
-if not loaded then
+local async = require('plenary.async')
-    return
-end
-local async = require("plenary.async")
 
 --- Gets a path for a given program in the environment
 ---@param program @The string of a program in the PATH
 ---@return @The full path to the program if found, or nil if not
 local function get_program_path(program)
-    local home = os.getenv("HOME")
+    local home = os.getenv('HOME')
-    local program_path = home .. "/.local/share/nvim/mason/packages/" .. program .. "/" .. program
+    local program_path = home .. '/.local/share/nvim/mason/packages/' .. program .. '/' .. program
     return program_path
 end
 
-local lldb_path = get_program_path("lldb-vscode")
+local lldb_path = get_program_path('lldb-vscode')
 -- Adapaters
 dap.adapters.lldb = {
-    type = "executable",
+    type = 'executable',
     command = lldb_path,
-    name = "lldb",
+    name = 'lldb',
 }
 
 dap.adapters.coreclr = {
-    type = "executable",
+    type = 'executable',
-    command = get_program_path("netcoredbg"),
+    command = get_program_path('netcoredbg'),
-    args = { "--interpreter=vscode" },
+    args = { '--interpreter=vscode' },
 }
 
 -- configurations
 dap.configurations.cpp = {
     {
-        name = "Launch",
+        name = 'Launch',
-        type = "lldb",
+        type = 'lldb',
-        request = "launch",
+        request = 'launch',
         program = function()
-            return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+            return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
         end,
-        cwd = "${workspaceFolder}",
+        cwd = '${workspaceFolder}',
         stopOnEntry = false,
-        targetArchitecture = "arm64",
+        targetArchitecture = 'arm64',
         args = {},
 
         -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting:
@@ -60,11 +57,11 @@ dap.configurations.rust = dap.configurations.cpp
 
 dap.configurations.cs = {
     {
-        type = "coreclr",
+        type = 'coreclr',
-        name = "launch - netcoredbg",
+        name = 'launch - netcoredbg',
-        request = "launch",
+        request = 'launch',
         program = function()
-            return vim.fn.input("Path to dll: ", vim.fn.getcwd() .. "/bin/Debug/", "file")
+            return vim.fn.input('Path to dll: ', vim.fn.getcwd() .. '/bin/Debug/', 'file')
         end,
     },
 }

dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua

@@ -1,7 +1,17 @@
+<<<<<<< HEAD
 local loaded, neoclip = pcall(require, "neoclip")
 if not loaded then
     return
 end
 neoclip.setup({
+||||||| b136610 (feat(nvim): use loaded, plugin format)
+local neoclip = pcall(require, "neoclip")
+if not neoclip then
+    return
+end
+neoclip.setup({
+=======
+require('neoclip').setup({
+>>>>>>> parent of b136610 (feat(nvim): use loaded, plugin format)
     enable_persistent_history = true,
 })

dots/.nvim-environments/primary/config/lua/plugins/configs/_neorg.lua

@@ -1,52 +1,49 @@
-local loaded, neorg = pcall(require, "neorg")
+local neorg = require('neorg')
-if not loaded then
-    return
-end
 
 neorg.setup({
     load = {
-        ["core.defaults"] = {},
+        ['core.defaults'] = {},
-        ["core.norg.concealer"] = {},
+        ['core.norg.concealer'] = {},
-        ["core.norg.esupports.metagen"] = {
+        ['core.norg.esupports.metagen'] = {
             config = {
-                type = "auto",
+                type = 'auto',
             },
         },
-        ["core.integrations.nvim-cmp"] = {
+        ['core.integrations.nvim-cmp'] = {
             config = {},
         },
-        ["core.norg.completion"] = {
+        ['core.norg.completion'] = {
             config = {
-                engine = "nvim-cmp",
+                engine = 'nvim-cmp',
             },
         },
-        ["core.keybinds"] = {
+        ['core.keybinds'] = {
             config = {
                 default_keybinds = true,
                 -- norg_leader = "-"
             },
         },
-        ["core.norg.dirman"] = {
+        ['core.norg.dirman'] = {
             config = {
                 workspaces = {
-                    default = "~/.notes", -- Format: <name_of_workspace> = <path_to_workspace_root>
+                    default = '~/.notes', -- Format: <name_of_workspace> = <path_to_workspace_root>
                 },
                 autochdir = true, -- Automatically change the directory to the current workspace's root every time
-                index = "index.norg", -- The name of the main (root) .norg file
+                index = 'index.norg', -- The name of the main (root) .norg file
-                last_workspace = vim.fn.stdpath("cache") .. "/neorg_last_workspace.txt", -- The location to write and read the workspace cache file
+                last_workspace = vim.fn.stdpath('cache') .. '/neorg_last_workspace.txt', -- The location to write and read the workspace cache file
             },
         },
-        ["core.integrations.telescope"] = {},
+        ['core.integrations.telescope'] = {},
-        ["core.norg.qol.toc"] = {},
+        ['core.norg.qol.toc'] = {},
-        ["core.gtd.base"] = {
+        ['core.gtd.base'] = {
             config = {
-                workspace = "default",
+                workspace = 'default',
             },
         },
-        ["core.gtd.ui"] = {
+        ['core.gtd.ui'] = {
             config = {},
         },
-        ["core.gtd.helpers"] = {
+        ['core.gtd.helpers'] = {
             config = {},
         },
     },

dots/.nvim-environments/primary/config/lua/plugins/configs/_stabilize.lua

@@ -1,22 +1,18 @@
-local loaded, stabilize = pcall(require, "stabilize")
+require('stabilize').setup({
-if not loaded then
-    return
-end
-stabilize.setup({
     -- stabilize window even when current cursor position will be hidden behind new window
     force = true,
     -- set context mark to register on force event which can be jumped to with '<forcemark>
     forcemark = nil,
     -- do not manage windows matching these file/buftypes
     ignore = {
-        filetype = { "packer", "Dashboard", "Trouble", "TelescopePrompt" },
+        filetype = { 'packer', 'Dashboard', 'Trouble', 'TelescopePrompt' },
         buftype = {
-            "packer",
+            'packer',
-            "Dashboard",
+            'Dashboard',
-            "terminal",
+            'terminal',
-            "quickfix",
+            'quickfix',
-            "loclist",
+            'loclist',
-            "LspInstall",
+            'LspInstall',
         },
     },
     -- comma-separated list of autocmds that wil trigger the plugins window restore function

dots/.nvim-environments/primary/config/lua/plugins/configs/_windline.lua

@@ -0,0 +1,7 @@
+-- Load Animations
+require('wlanimation')
+-- Load a line (these include setup)
+require('wlsample.bubble2')
+
+-- In the future I may want to implement
+-- my own, for now much too lazy for that

dots/.nvim-environments/primary/config/lua/plugins/configs/alpha.lua

@@ -1,82 +1,79 @@
-local loaded, alpha = pcall(require, "alpha")
+local alpha = require('alpha')
-if not loaded then
+local startify = require('alpha.themes.startify')
-    return
+local dashboard = require('alpha.themes.dashboard')
-end
-local startify = require("alpha.themes.startify")
-local dashboard = require("alpha.themes.dashboard")
 
 -- Set header
 local header = {
-    type = "text",
+    type = 'text',
     val = {
-        "                                   ",
+        '                                   ',
-        "                                   ",
+        '                                   ',
-        "                                   ",
+        '                                   ',
-        "   ⣴⣶⣤⡤⠦⣤⣀⣤⠆     ⣈⣭⣿⣶⣿⣦⣼⣆          ",
+        '   ⣴⣶⣤⡤⠦⣤⣀⣤⠆     ⣈⣭⣿⣶⣿⣦⣼⣆          ',
-        "    ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦       ",
+        '    ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦       ',
-        "          ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷    ⠻⠿⢿⣿⣧⣄     ",
+        '          ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷    ⠻⠿⢿⣿⣧⣄     ',
-        "           ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄    ",
+        '           ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄    ',
-        "          ⢠⣿⣿⣿⠈    ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀   ",
+        '          ⢠⣿⣿⣿⠈    ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀   ',
-        "   ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘  ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄  ",
+        '   ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘  ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄  ',
-        "  ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷   ⢊⣿⣿⡏  ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄   ",
+        '  ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷   ⢊⣿⣿⡏  ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄   ',
-        " ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄  ",
+        ' ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄  ',
-        " ⠙⠃   ⣼⣿⡟  ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ ",
+        ' ⠙⠃   ⣼⣿⡟  ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ ',
-        "      ⢻⣿⣿⣄   ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆     ",
+        '      ⢻⣿⣿⣄   ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆     ',
-        "       ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃     ",
+        '       ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃     ',
-        "                                   ",
+        '                                   ',
     },
     opts = {
-        position = "center",
+        position = 'center',
-        hl = "Function",
+        hl = 'Function',
     },
 }
 
 -- Subheader, plugin count
 local get_plugins = function()
-    local num_plugins_loaded = #vim.fn.globpath(vim.fn.stdpath("data") .. "/site/pack/packer/start", "*", 0, 1)
+    local num_plugins_loaded = #vim.fn.globpath(vim.fn.stdpath('data') .. '/site/pack/packer/start', '*', 0, 1)
     local num_plugins_total = #vim.tbl_keys(packer_plugins)
     if num_plugins_total <= 1 then
-        return num_plugins_loaded .. " / " .. num_plugins_total .. " plugin  loaded"
+        return num_plugins_loaded .. ' / ' .. num_plugins_total .. ' plugin  loaded'
     else
-        return num_plugins_loaded .. " / " .. num_plugins_total .. " plugins  loaded"
+        return num_plugins_loaded .. ' / ' .. num_plugins_total .. ' plugins  loaded'
     end
 end
 
 local plugin_count = {
-    type = "text",
+    type = 'text',
     val = {
         get_plugins(),
     },
     opts = {
-        hl = "Comment",
+        hl = 'Comment',
-        position = "center",
+        position = 'center',
     },
 }
 
 -- Menu
 local button = function(sc, txt, keybind)
-    local sc_ = sc:gsub("%s", ""):gsub("SPC", "<leader>")
+    local sc_ = sc:gsub('%s', ''):gsub('SPC', '<leader>')
 
     local opts = {
-        position = "center",
+        position = 'center',
         text = txt,
         shortcut = sc,
         cursor = 4,
         width = 30,
-        align_shortcut = "right",
+        align_shortcut = 'right',
-        hl_shortcut = "Number",
+        hl_shortcut = 'Number',
-        hl = "Function",
+        hl = 'Function',
     }
     if keybind then
-        opts.keymap = { "n", sc_, keybind, { noremap = true, silent = true } }
+        opts.keymap = { 'n', sc_, keybind, { noremap = true, silent = true } }
     end
 
     return {
-        type = "button",
+        type = 'button',
         val = txt,
         on_press = function()
             local key = vim.api.nvim_replace_termcodes(sc_, true, false, true)
-            vim.api.nvim_feedkeys(key, "normal", false)
+            vim.api.nvim_feedkeys(key, 'normal', false)
         end,
         opts = opts,
     }
@@ -84,14 +81,14 @@ end
 
 -- Set menu
 local buttons = {
-    type = "group",
+    type = 'group',
     val = {
-        button("e", "  New File", ":ene <BAR> startinsert <CR>"),
+        button('e', '  New File', ':ene <BAR> startinsert <CR>'),
-        button("f", "  Find File", ":Telescope find_files<CR>"),
+        button('f', '  Find File', ':Telescope find_files<CR>'),
-        button("r", "  Recent", ":Telescope oldfiles<CR>"),
+        button('r', '  Recent', ':Telescope oldfiles<CR>'),
-        button("s", "  Settings", ":e ~/.config/nvim/<CR>"),
+        button('s', '  Settings', ':e ~/.config/nvim/<CR>'),
-        button("u", "  Update Plugins", ":PackerSync<CR>"),
+        button('u', '  Update Plugins', ':PackerSync<CR>'),
-        button("q", "  Quit", ":qa<CR>"),
+        button('q', '  Quit', ':qa<CR>'),
     },
     opts = {
         spacing = 0,
@@ -100,16 +97,16 @@ local buttons = {
 
 -- Footer 2, fortune
 local fortune = {
-    type = "text",
+    type = 'text',
-    val = require("alpha.fortune")(),
+    val = require('alpha.fortune')(),
     opts = {
-        position = "center",
+        position = 'center',
-        hl = "Comment",
+        hl = 'Comment',
     },
 }
 
 local padding = function()
-    return { type = "padding", val = 4 }
+    return { type = 'padding', val = 4 }
 end
 local opts = {
     layout = {
@@ -129,8 +126,8 @@ local opts = {
 -- Send config to alpha
 alpha.setup(opts)
 
-vim.api.nvim_create_autocmd("FileType", {
+vim.api.nvim_create_autocmd('FileType', {
-    pattern = "alpha",
+    pattern = 'alpha',
     callback = function()
         vim.opt_local.cursorline = false
     end,

dots/.nvim-environments/primary/config/lua/plugins/configs/bufferline.lua

@@ -1,20 +1,17 @@
-local loaded, bufferline = pcall(require, "bufferline")
+local bufferline = require('bufferline')
-if not loaded then
-    return
-end
 
 bufferline.setup({
     options = {
         numbers = function(opts)
-            return string.format("%s", opts.id)
+            return string.format('%s', opts.id)
         end,
-        diagnostics = "nvim_lsp",
+        diagnostics = 'nvim_lsp',
         offsets = {
             {
-                filetype = "NvimTree",
+                filetype = 'NvimTree',
-                text = "File Explorer",
+                text = 'File Explorer',
-                highlight = "Directory",
+                highlight = 'Directory',
-                text_align = "left",
+                text_align = 'left',
             },
         },
     },

dots/.nvim-environments/primary/config/lua/plugins/configs/coq.lua

@@ -0,0 +1,10 @@
+-- Alias for vim.g
+local g = vim.g
+
+-- Run COQ on open
+g.coq_settings = {
+    auto_start = 'shut-up',
+    limits = {
+        completion_manual_timeout = 2000,
+    },
+}

dots/.nvim-environments/primary/config/lua/plugins/configs/dap-ui.lua

@@ -1,13 +1,9 @@
 local fn = vim.fn
 
-local loaded, dapui = pcall(require, "dapui")
+require('dapui').setup({})
-if not loaded then
-    return
-end
-dapui.setup({})
 
-fn.sign_define("DapBreakpoint", { text = "● ", texthl = "DiagnosticSignError", linehl = "", numhl = "" })
+fn.sign_define('DapBreakpoint', { text = '● ', texthl = 'DiagnosticSignError', linehl = '', numhl = '' })
-fn.sign_define("DapBreakpointCondition", { text = "● ", texthl = "DiagnosticSignWarn", linehl = "", numhl = "" })
+fn.sign_define('DapBreakpointCondition', { text = '● ', texthl = 'DiagnosticSignWarn', linehl = '', numhl = '' })
-fn.sign_define("DapLogPoint", { text = "● ", texthl = "DiagnosticSignInfo", linehl = "", numhl = "" })
+fn.sign_define('DapLogPoint', { text = '● ', texthl = 'DiagnosticSignInfo', linehl = '', numhl = '' })
-fn.sign_define("DapStopped", { text = "→ ", texthl = "DiagnosticSignWarn", linehl = "", numhl = "" })
+fn.sign_define('DapStopped', { text = '→ ', texthl = 'DiagnosticSignWarn', linehl = '', numhl = '' })
-fn.sign_define("DapBreakpointReject", { text = "●", texthl = "DiagnosticSignHint", linehl = "", numhl = "" })
+fn.sign_define('DapBreakpointReject', { text = '●', texthl = 'DiagnosticSignHint', linehl = '', numhl = '' })

dots/.nvim-environments/primary/config/lua/plugins/configs/diag-scrollbar.lua

@@ -1,13 +1,5 @@
-local loaded, colors = pcall(require, "kanagawa.colors")
+local colors = require('tokyonight.colors').setup()
-if not loaded then
+require('scrollbar').setup({
-    return
-end
-local loaded, scrollbar = pcall(require, "scrollbar")
-if not loaded then
-    return
-end
-
-scrollbar.setup({
     handle = {
         color = colors.bg_highlight,
     },

dots/.nvim-environments/primary/config/lua/plugins/configs/fidget-spinner.lua

@@ -1,11 +1,8 @@
-local loaded, fidget = pcall(require, "fidget")
+local fidget = require('fidget')
-if not loaded then
-    return
-end
 
 fidget.setup({
     text = {
-        spinner = "dots",
+        spinner = 'dots',
     },
     window = {
         blend = 0,

dots/.nvim-environments/primary/config/lua/plugins/configs/file-explorer.lua

@@ -1,7 +1,4 @@
-local loaded, nvim_tree = pcall(require, "nvim-tree.configs")
+local nvim_tree = require('nvim-tree.configs')
-if not loaded then
-    return
-end
 
 nvim_tree.setup({
     highlight = {
@@ -9,7 +6,7 @@ nvim_tree.setup({
         additional_vim_regex_highlighting = true,
         disable = {
             -- Ansible support reasons
-            "ansible.yaml",
+            'ansible.yaml',
         },
     },
     matchup = {

dots/.nvim-environments/primary/config/lua/plugins/configs/hydra.lua

@@ -1,29 +1,26 @@
-local loaded, hydra = pcall(require, "hydra")
+local hydra = require('hydra')
-if not loaded then
-    return
-end
 
 -- Side Scroll
 hydra({
-    name = "Side scroll",
+    name = 'Side scroll',
     config = {
         {
-            position = "bottom-right",
+            position = 'bottom-right',
-            border = "rounded",
+            border = 'rounded',
         },
     },
-    mode = "n",
+    mode = 'n',
-    body = "z",
+    body = 'z',
     heads = {
-        { "h", "5zh" },
+        { 'h', '5zh' },
-        { "l", "5zl", { desc = "←/→" } },
+        { 'l', '5zl', { desc = '←/→' } },
-        { "H", "zH" },
+        { 'H', 'zH' },
-        { "L", "zL", { desc = "half screen ←/→" } },
+        { 'L', 'zL', { desc = 'half screen ←/→' } },
     },
 })
 
 -- Git Integration
-local gitsigns = require("gitsigns")
+local gitsigns = require('gitsigns')
 
 local hint = [[
  _J_: next hunk   _s_: stage hunk        _d_: show deleted   _b_: blame line
@@ -36,11 +33,11 @@ local hint = [[
 hydra({
     hint = hint,
     config = {
-        color = "pink",
+        color = 'pink',
         invoke_on_body = true,
         hint = {
-            position = "bottom-right",
+            position = 'bottom-right',
-            border = "rounded",
+            border = 'rounded',
         },
         on_enter = function()
             vim.bo.modifiable = false
@@ -53,68 +50,68 @@ hydra({
             gitsigns.toggle_deleted(false)
         end,
     },
-    mode = { "n", "x" },
+    mode = { 'n', 'x' },
-    body = "<leader>G",
+    body = '<leader>G',
     heads = {
         {
-            "J",
+            'J',
             function()
                 if vim.wo.diff then
-                    return "]c"
+                    return ']c'
                 end
                 vim.schedule(function()
                     gitsigns.next_hunk()
                 end)
-                return "<Ignore>"
+                return '<Ignore>'
             end,
             { expr = true },
         },
         {
-            "K",
+            'K',
             function()
                 if vim.wo.diff then
-                    return "[c"
+                    return '[c'
                 end
                 vim.schedule(function()
                     gitsigns.prev_hunk()
                 end)
-                return "<Ignore>"
+                return '<Ignore>'
             end,
             { expr = true },
         },
-        { "s", ":Gitsigns stage_hunk<CR>", { silent = true } },
+        { 's', ':Gitsigns stage_hunk<CR>', { silent = true } },
-        { "u", gitsigns.undo_stage_hunk },
+        { 'u', gitsigns.undo_stage_hunk },
-        { "S", gitsigns.stage_buffer },
+        { 'S', gitsigns.stage_buffer },
-        { "p", gitsigns.preview_hunk },
+        { 'p', gitsigns.preview_hunk },
-        { "d", gitsigns.toggle_deleted, { nowait = true } },
+        { 'd', gitsigns.toggle_deleted, { nowait = true } },
-        { "b", gitsigns.blame_line },
+        { 'b', gitsigns.blame_line },
         {
-            "B",
+            'B',
             function()
                 gitsigns.blame_line({ full = true })
             end,
         },
-        { "/", gitsigns.show, { exit = true } }, -- show the base of the file
+        { '/', gitsigns.show, { exit = true } }, -- show the base of the file
-        { "<Enter>", "<cmd>Neogit<CR>", { exit = true } },
+        { '<Enter>', '<cmd>Neogit<CR>', { exit = true } },
-        { "q", nil, { exit = true, nowait = true } },
+        { 'q', nil, { exit = true, nowait = true } },
     },
 })
 
 -- Hydra to repeat expanding windows
 hydra({
-    name = "Window Sizing",
+    name = 'Window Sizing',
-    mode = "n",
+    mode = 'n',
-    body = "<C-w>",
+    body = '<C-w>',
     config = {
         {
-            position = "bottom-right",
+            position = 'bottom-right',
-            border = "rounded",
+            border = 'rounded',
         },
     },
     heads = {
-        { "<", "2<C-w><" },
+        { '<', '2<C-w><' },
-        { ">", "2<C-w>>", { desc = "←/→" } },
+        { '>', '2<C-w>>', { desc = '←/→' } },
-        { "+", "2<C-w>+" },
+        { '+', '2<C-w>+' },
-        { "-", "2<C-w>-", { desc = "↑/↓" } },
+        { '-', '2<C-w>-', { desc = '↑/↓' } },
     },
 })

dots/.nvim-environments/primary/config/lua/plugins/configs/indent-blankline.lua

@@ -1,28 +1,24 @@
 local g = vim.g
 
-g.indent_blankline_char = "▏"
+g.indent_blankline_char = '▏'
-g.indent_blankline_context_char = "▏"
+g.indent_blankline_context_char = '▏'
 
 -- Disable indent-blankline on these pages.
 g.indent_blankline_filetype_exclude = {
-    "help",
+    'help',
-    "terminal",
+    'terminal',
-    "alpha",
+    'alpha',
-    "packer",
+    'packer',
-    "lsp-installer",
+    'lsp-installer',
-    "lspinfo",
+    'lspinfo',
-    "mason.nvim",
+    'mason.nvim',
 }
 
-g.indent_blankline_buftype_exclude = { "terminal" }
+g.indent_blankline_buftype_exclude = { 'terminal' }
 g.indent_blankline_show_trailing_blankline_indent = false
 g.indent_blankline_show_first_indent_level = true
 
-local loaded, indent_blankline = pcall(require, "indent_blankline")
+require('indent_blankline').setup({
-if not loaded then
-    return
-end
-indent_blankline.setup({
     -- space_char_blankline = " ",
     show_current_context = true,
     show_current_context_start = true,

dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua

@@ -1,42 +1,6 @@
-local loaded, mason_lspconfig = pcall(require, "mason-lspconfig")
+local mason_lspconfig = require("mason-lspconfig")
-if not loaded then
+local lspconfig = require("lspconfig")
-    return
+local async = require("plenary.async")
-end
-
-local lspconfig_loaded, lspconfig = pcall(require, "lspconfig")
-if not lspconfig_loaded then
-    return
-end
-
-local plenary_loaded, async = pcall(require, "plenary.async")
-if not plenary_loaded then
-    return
-end
-
-local cmp_nvim_lsp_loaded, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-if not cmp_nvim_lsp_loaded then
-    return
-end
-
-local rust_tools_loaded, rust_tools = pcall(require, "rust_tools")
-if not rust_tools_loaded then
-    return
-end
-
-local lua_dev_loaded, lua_dev = pcall(require, "lua-dev")
-if not lua_dev_loaded then
-    return
-end
-
-local sqls_loaded, sqls = pcall(require, "sqls")
-if not sqls_loaded then
-    return
-end
-
-local chsarpls_extended_loaded, csharpls_extended = pcall(require, "csharpls_extended")
-if not csharpls_extended_loaded then
-    return
-end
 
 -- NOTE: Keep this near top
 mason_lspconfig.setup({
@@ -54,7 +18,7 @@ local function on_attach(client, bufnr)
     end)
 end
 
-local lsp_capabilities = cmp_nvim_lsp.update_capabilities(vim.lsp.protocol.make_client_capabilities())
+local lsp_capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities())
 local opts = {
     capabilities = lsp_capabilities,
     on_attach = on_attach,
@@ -87,7 +51,7 @@ local rustopts = {
         },
     },
 }
-rust_tools.setup(rustopts)
+require("rust-tools").setup(rustopts)
 
 -- NOTE: ANSIBLE LSP
 -- I use ansible a lot, define exceptions for servers that can use
@@ -115,7 +79,7 @@ lspconfig.ansiblels.setup({
 })
 
 -- NOTE: LUA LSP
-local luadev = lua_dev.setup({
+local luadev = require("lua-dev").setup({
     lspconfig = opts,
 })
 
@@ -124,7 +88,7 @@ lspconfig.sumneko_lua.setup(luadev)
 -- NOTE: SQL LSP
 lspconfig.sqls.setup({
     on_attach = function(client, bufnr)
-        sqls.on_attach(client, bufnr)
+        require("sqls").on_attach(client, bufnr)
         on_attach(client, bufnr)
     end,
 })
@@ -193,7 +157,7 @@ lspconfig.yamlls.setup({
 
 lspconfig.csharp_ls.setup({
     handlers = {
-        ["textDocument/definition"] = csharpls_extended.handler,
+        ["textDocument/definition"] = require("csharpls_extended").handler,
     },
     capabilities = lsp_capabilities,
     on_attach = on_attach,

dots/.nvim-environments/primary/config/lua/plugins/configs/neotree.lua

@@ -1,7 +1,4 @@
-local loaded, neotree = pcall(require, "neo-tree")
+local neotree = require('neo-tree')
-if not loaded then
-    return
-end
 
 vim.g.neo_tree_remove_legacy_commands = 1
 neotree.setup({
@@ -10,8 +7,8 @@ neotree.setup({
     },
     window = {
         mappings = {
-            ["/"] = "noop",
+            ['/'] = 'noop',
-            ["/"] = {},
+            ['/'] = {},
         },
     },
 })

dots/.nvim-environments/primary/config/lua/plugins/configs/null_ls.lua

@@ -1,12 +1,9 @@
-local loaded, null_ls = pcall(require, "null-ls")
+local null_ls = require('null-ls')
-if not loaded then
-    return
-end
 
 null_ls.setup({
     sources = {
         null_ls.builtins.formatting.shfmt.with({
-            extra_args = { "-i 4" },
+            extra_args = { '-i 4' },
         }),
         null_ls.builtins.diagnostics.shellcheck,
         null_ls.builtins.code_actions.shellcheck,

dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-colorizer.lua

@@ -1,6 +1,3 @@
-local loaded, colorizer = pcall(require, "colorizer")
+local colorizer = require('colorizer')
-if not loaded then
-    return
-end
 colorizer.setup({})
-vim.cmd("ColorizerAttachToBuffer")
+vim.cmd('ColorizerAttachToBuffer')

dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-notify.lua

@@ -1,10 +1,6 @@
-local loaded, notify = pcall(require, "notify")
+require('notify').setup({
-if not loaded then
-    return
-end
-notify.setup({
     -- Animation style (see below for details)
-    stages = "fade_in_slide_out",
+    stages = 'fade_in_slide_out',
 
     -- Function called when a new window is opened, use for changing win settings/config
     on_open = nil,
@@ -13,26 +9,26 @@ notify.setup({
     on_close = nil,
 
     -- Render function for notifications. See notify-render()
-    render = "default",
+    render = 'default',
 
     -- Default timeout for notifications
     timeout = 5000,
 
     -- For stages that change opacity this is treated as the highlight behind the window
     -- Set this to either a highlight group, an RGB hex value e.g. "#000000" or a function returning an RGB code for dynamic values
-    background_colour = "#000000",
+    background_colour = '#000000',
 
     -- Minimum width for notification windows
     minimum_width = 50,
 
     -- Icons for the different levels
     icons = {
-        ERROR = "",
+        ERROR = '',
-        WARN = "",
+        WARN = '',
-        INFO = "",
+        INFO = '',
-        DEBUG = "",
+        DEBUG = '',
-        TRACE = "✎",
+        TRACE = '✎',
     },
 })
 
-vim.notify = require("notify")
+vim.notify = require('notify')

dots/.nvim-environments/primary/config/lua/plugins/configs/python-dap.lua

@@ -1,6 +1,3 @@
-local loaded, dap_python = pcall(require, "dap-python")
+local dap_python = require('dap-python')
-if not loaded then
+dap_python.setup('~/.venvs/debugpy/bin/python')
-    return
+dap_python.test_runner = 'pytest'
-end
-dap_python.setup("~/.venvs/debugpy/bin/python")
-dap_python.test_runner = "pytest"

dots/.nvim-environments/primary/config/lua/plugins/configs/telescope-nvim.lua

@@ -1,7 +1,4 @@
-local loaded, telescope = pcall(require, "telescope")
+local telescope = require("telescope")
-if not loaded then
-    return
-end
 local actions = require("telescope.actions")
 
 telescope.setup({

dots/.nvim-environments/primary/config/lua/plugins/configs/todo-comments.lua

@@ -1,5 +1 @@
-local loaded, todo_comments = pcall(require, "todo-comments")
+require('todo-comments').setup({})
-if not loaded then
-    return
-end
-todo_comments.setup({})

dots/.nvim-environments/primary/config/lua/plugins/configs/tokyonight.lua

@@ -0,0 +1,7 @@
+local g = vim.g
+
+g.tokyonight_style = 'night'
+g.tokyonight_transparent = true
+g.tokyonight_transparent_sidebar = true
+
+vim.cmd('colorscheme tokyonight')

dots/.nvim-environments/primary/config/lua/plugins/configs/treesitter.lua

@@ -1,16 +1,13 @@
-local loaded, nvim_treesitter = pcall(require, "nvim-treesitter.configs")
+local nvim_treesitter = require('nvim-treesitter.configs')
-if not loaded then
-    return
-end
 
 nvim_treesitter.setup({
     ensure_installed = {
-        "norg",
+        'norg',
     },
     highlight = {
         enable = true,
         additional_vim_regex_highlighting = true,
-        disable = { "yaml" },
+        disable = { 'yaml' },
     },
     matchup = {
         enable = true,