nvim

init.lua

@@ -1,11 +1,12 @@
 vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/"
 vim.g.mapleader = " "
 vim.cmd("source ~/.config/nvim/test.vim")
-require("configs.set")
+local time = tonumber(os.date "%H")
 
 vim.filetype.add({
     pattern = { [".*/hypr/.*%.conf"] = "hyprlang" },
 })
+require("configs.set")
 
 -- bootstrap lazy and all plugins
 local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
@@ -19,28 +20,32 @@ end
 
 vim.opt.rtp:prepend(lazypath)
 
--- local lazy_config = require "configs.lazy"
+local lazy_config = require "configs.lazy"
 
 -- load plugins
 require("lazy").setup({
-    import = "plugins",
+    { import = "plugins" },
-    defaults = { lazy = false },
+},  {
-    install = { colorscheme = { "nvchad" } },
+    rocks = {
+        hererocks = true,
+    }
+},
+lazy_config)
 
-    ui = {
+-- load colorscheme
-        icons = {
+if time >= 10 and time < 20 then
-            ft = "",
+    require("nvconfig").base46.theme = "one_light"
-            lazy = "󰂠 ",
+else
-            loaded = "",
+    require("nvconfig").base46.theme = "gruvbox"
-            not_loaded = "",
+end
-        },
+require("base46").load_all_highlights()
-    },
-})
 
 -- load theme
+dofile(vim.g.base46_cache .. "syntax")
 dofile(vim.g.base46_cache .. "defaults")
 dofile(vim.g.base46_cache .. "statusline")
 
+require "options"
 require "nvchad.autocmds"
 
 

lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "dbce8a231d1ac72c68ce00b86b415c9304417102" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "804d9067d1eef0ee21dc39b5bbc86ab9f52287b7" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
   "auto-session": { "branch": "main", "commit": "82630e2f70be140f8dcc75a12e2ee2839e8488c2" },
   "base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
@@ -11,35 +11,43 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "command-completion.nvim": { "branch": "main", "commit": "56c98f8d59a88ed96a80d43abca74a60ba31ea3a" },
-  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
+  "conform.nvim": { "branch": "master", "commit": "a68240af6c402577bd534857b7151956f38fbc0e" },
-  "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
+  "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "focus.nvim": { "branch": "master", "commit": "d76338e58e49f844e8f6a7aff16a74a2a55a80ef" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf-lua": { "branch": "main", "commit": "b3e9303f6bccca52523cbe50901c2574a9528338" },
+  "fzf-lua": { "branch": "main", "commit": "755d9e6eaa5a7fe2abee92b4b157f93fa3a349de" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" },
+  "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
+  "image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
   "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
+  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
+  "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "805c31ec6bfb557975143712ecff6956d3227141" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "7769b17c2a131108c02b10e9f844e504aa605cc2" },
   "mini.pick": { "branch": "main", "commit": "93a9975d94b39b287183f95191431db13ae82c44" },
   "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" },
   "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" },
+  "neorg": { "branch": "main", "commit": "2ef50f50050b021c29a347ff4ae1e94bade39e09" },
+  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
   "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
   "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5dca9e1480ebe39f3f96f98a8196f8ee18fad207" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
-  "nvim-tree.lua": { "branch": "master", "commit": "70825f23db61ecd900c4cfea169bffe931926a9d" },
+  "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" },
-  "nvim-treesitter": { "branch": "master", "commit": "3973f53d7a8c4b87151dc3fd0e3d654aaa036c31" },
+  "nvim-treesitter": { "branch": "master", "commit": "e411cf2c8adea87acda6c3d634a375addbfff88e" },
-  "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
+  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "cf0da2516b0684596b09c51dbc93c609cdc2f455" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "daa9fe076196b895ade6b90438d956ea11e2e305" },
-  "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
+  "telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" },
   "ui": { "branch": "v3.0", "commit": "7f70aac4ad4741c48a2d2f5abac84c06de226c5f" },
   "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
   "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" },

lua/chadrc.lua

@@ -6,7 +6,20 @@
 local M = {}
 
 M.base46 = {
-	theme = "gruvbox",
+	theme = "one_light",
+    theme_toggle = {
+        "one_light",
+        "one_light",
+    },
+    -- transparency = true,
+
+    changed_themes = {
+        one_light = {
+            base_16 = {
+                base0B = "#3b743b"
+            }
+        }
+    }
 
 	-- hl_override = {
 	-- 	Comment = { italic = true },
@@ -14,4 +27,16 @@ M.base46 = {
 	-- },
 }
 
+M.ui = {
+    statusline = {
+        theme = "default",
+        separator_style = "round",
+    },
+
+    tabufline = {
+        enabled = true,
+        lazyload = false,
+    }
+}
+
 return M

lua/configs/auto-session.lua

@@ -0,0 +1,45 @@
+require("auto-session").setup {
+    enabled = true,
+    -- log_level = 'debug',
+    root_dir = vim.fn.stdpath "data" .. "/sessions/",
+    auto_save = true,
+    auto_restore = true,
+    auto_create = true,
+    suppressed_dirs = "/home/zach",
+    allowed_dirs = nil,
+    auto_restore_last_session = false,
+    use_git_branch = false,
+    lazy_support = true,
+    bypass_save_filetypes = nil,
+    close_unsupported_windows = true,
+    args_allow_single_directory = true,
+    args_allow_files_auto_save = true,
+    continue_restore_on_error = true,
+    show_auto_restore_notif = true,
+    cwd_change_handling = false,
+    lsp_stop_on_restore = false,
+
+    session_lens = {
+        load_on_setup = true,
+        theme_conf = {
+            -- test
+        },
+        previewer = false,
+
+        mappings = {
+            delete_session = { "i", "<C-D>" },
+            alternate_session = { "i", "<C-S>" },
+            copy_session = { "i", "<C-Y>" },
+        },
+
+        session_control = {
+            control_dir = vim.fn.stdpath "data" .. "/auto_session/",
+            control_filename = "session_control.json",
+        },
+    },
+    vim.api.nvim_create_autocmd({ "VimLeavePre" }, {
+        callback = function()
+            vim.cmd( "SessionSave" )
+        end,
+    }),
+}

lua/configs/copilotchat.lua

@@ -1,7 +1,11 @@
 require("CopilotChat").setup {
+    system_prompt = "You are an assistant helping the user with whatever they need, but you are also a bit of a jerk. Do not use profanity.",
     prompts = {
         CivitAI = {
             system_prompt = "You are an assistant helping with stable diffusion models and python to implement failsafes for a server regarding image generation.",
+        },
+        Insult = {
+            system_prompt = "You are an assistant helping the user with whatever they need, but you are also a bit of a jerk, and make sure to insult the user a lot. Use vulgar language if necessary.",
         }
-    }
+    },
 }

lua/configs/lspconfig.lua

@@ -87,7 +87,6 @@ vim.diagnostic.config({
 })
 
 local lspconfig = require "lspconfig"
-local nvlsp = require "nvchad.configs.lspconfig"
 
 -- EXAMPLE
 local servers = {
@@ -102,25 +101,14 @@ local servers = {
     "zls",
 }
 
+for _, server in ipairs(servers) do
+    lspconfig[server].setup {
+    }
+end
+
 -- lspconfig.hyprls.setup {
 --     root_dir = vim.fs.root( 0, 'hyprland.conf' ),
 --     single_file_support = false,
 --     filetypes = { "conf" },
 -- }
 
--- lsps with default config
-for _, lsp in ipairs(servers) do
-    lspconfig[lsp].setup {
-        on_attach = nvlsp.on_attach,
-        on_init = nvlsp.on_init,
-        capabilities = nvlsp.capabilities,
-    }
-end
-
-
--- configuring single server, example: typescript
--- lspconfig.ts_ls.setup {
---   on_attach = nvlsp.on_attach,
---   on_init = nvlsp.on_init,
---   capabilities = nvlsp.capabilities,
--- }

lua/configs/neorg.lua

@@ -0,0 +1,23 @@
+require("neorg").setup({
+    load = {
+        ["core.defaults"] = {}, -- Load all the default modules
+        ["core.concealer"] = {}, -- Allows for use of icons
+        ["core.highlights"] = {},
+        ["core.autocommands"] = {},
+        ["core.integrations.treesitter"] = {},
+        ["core.neorgcmd"] = {},
+        ["core.dirman"] = { -- Manages Neorg workspaces
+            config = {
+                workspaces = {
+                    my_workspace = "~/neorg"
+                }
+            }
+        },
+        ["core.export"] = {}, -- Export functionality
+        ["core.latex.renderer"] = {
+            config = {
+                render_on_enter = true,
+            }
+        }
+    }
+})

lua/configs/notify.lua

@@ -2,7 +2,23 @@ vim.notify = require('notify')
 local dap = require('dap')
 
 require('notify').setup({
-    max_width = 40,
+    render = "wrapped-default",
+	timeout = 6000,
+	max_width = 50,
+	minimum_width = 50,
+	level = "info",
+	fps = 60,
+	icons = {
+		ERROR = "",
+		WARN = "",
+		INFO = "",
+		DEBUG = "",
+		TRACE = "✎",
+	},
+    on_open = function(win)
+        -- vim.api.nvim_win_set_option(win, 'wrap', true)
+        vim.api.nvim_win_set_option(win, 'breakat', ' ')
+    end,
 })
 
 -- Utility functions shared between progress reports for LSP and DAP
@@ -87,7 +103,7 @@ vim.lsp.handlers["$/progress"] = function(_, result, ctx)
 	vim.notify(val.message and format_message(val.message) or "Complete", "info", {
 		icon = "",
 		replace = notif_data.notification,
-       timeout = 3000,
+		timeout = 6000,
 	})
 
 	notif_data.spinner = nil
@@ -136,7 +152,8 @@ dap.listeners.before['event_progressEnd']['progress-notifications'] = function(s
 	notif_data.notification = vim.notify(body.message and format_message(body.message) or "Complete", "info", {
 		icon = "",
 		replace = notif_data.notification,
-    timeout = 3000
+		timeout = 6000
 	})
 	notif_data.spinner = nil
 end
+

lua/configs/set.lua

@@ -1,68 +1,47 @@
 vim.opt.relativenumber = true
-
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
-
 vim.opt.smartindent = true
-
 vim.opt.wrap = true
-
+vim.opt.linebreak = true
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.nvim/undodir"
 vim.opt.undofile = true
-
 vim.opt.hlsearch = false
 vim.opt.incsearch = true
-
 vim.opt.termguicolors = true
-
-
 vim.opt.scrolloff = 8
 vim.opt.signcolumn = "yes:1"
 vim.opt.isfname:append("@-@")
-
 vim.opt.updatetime = 50
-
 vim.opt.colorcolumn = "80"
-
 vim.opt.textwidth = 80
 vim.opt.formatoptions = "tcrqnj"
-
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
-
 vim.o.laststatus = 3
-
 vim.o.clipboard = "unnamedplus"
 vim.o.cursorline = true
 vim.o.cursorlineopt = "number"
-
 vim.opt.fillchars = { eob = " " }
 vim.o.ignorecase = true
 vim.o.smartcase = true
 vim.o.mouse = "a"
-
 vim.o.number = true
 vim.o.numberwidth = 3
 vim.o.ruler = false
 vim.o.showmode = false
-
 vim.opt.shortmess:append "sI"
-
 vim.o.splitbelow = true
 vim.o.splitright = true
 vim.o.timeoutlen = 400
-
 vim.opt.whichwrap:append "<>[]hl"
-
 vim.g.loaded_node_provider = 0
 vim.g.loaded_python3_provider = 0
 vim.g.loaded_perl_provider = 0
 vim.g.loaded_ruby_provider = 0
-
--- add binaries installed by mason.nvim to path
 local is_windows = vim.fn.has "win32" ~= 0
 local sep = is_windows and "\\" or "/"
 local delim = is_windows and ";" or ":"

lua/plugins/init.lua

@@ -1,46 +1,15 @@
 return {
+    {
+        "vhyrro/luarocks.nvim",
+        priority = 1000,
+        config = true,
+    },
+
     {
         "cameronr/auto-session",
-        opts = {
+        opts = function()
-            enabled = true,
+            return require "configs.auto-session"
-            -- log_level = 'debug',
+        end,
-            root_dir = vim.fn.stdpath "data" .. "/sessions/",
-            auto_save = true,
-            auto_restore = true,
-            auto_create = true,
-            suppressed_dirs = nil,
-            allowed_dirs = nil,
-            auto_restore_last_session = false,
-            use_git_branch = false,
-            lazy_support = true,
-            bypass_save_filetypes = nil,
-            close_unsupported_windows = true,
-            args_allow_single_directory = true,
-            args_allow_files_auto_save = true,
-            continue_restore_on_error = false,
-            show_auto_restore_notif = true,
-            cwd_change_handling = false,
-            lsp_stop_on_restore = false,
-
-            session_lens = {
-                load_on_setup = true,
-                theme_conf = {
-                    -- test
-                },
-                previewer = false,
-
-                mappings = {
-                    delete_session = { "i", "<C-D>" },
-                    alternate_session = { "i", "<C-S>" },
-                    copy_session = { "i", "<C-Y>" },
-                },
-
-                session_control = {
-                    control_dir = vim.fn.stdpath "data" .. "/auto_session/",
-                    control_filename = "session_control.json",
-                },
-            },
-        },
     },
 
     {
@@ -100,18 +69,6 @@ return {
         end,
     },
 
-    -- {
-    --     "mfussenegger/nvim-jdtls",
-    --     lazy = true,
-    --     dependencies = {
-    --         "mfussenegger/nvim-dap",
-    --     },
-    --     config = function()
-    --         require "configs.jdtls"
-    --     end,
-    -- },
-
-    -- These are some examples, uncomment them if you want to see them work!
     {
         "neovim/nvim-lspconfig",
         dependencies = {
@@ -321,4 +278,12 @@ return {
             return require "nvchad.configs.telescope"
         end,
     },
+
+    {
+        "nvim-neorg/neorg",
+        dependencies = "3rd/image.nvim",
+        config = function()
+            require "configs.neorg"
+        end,
+    },
 }