Small updates

nvim/.config/nvim/init.lua

@@ -1,31 +1,11 @@
--- local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+-----------------------------------------------------------
--- if not (vim.uv or vim.loop).fs_stat(lazypath) then
+-- General Neovim settings and configuration
---   local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+-----------------------------------------------------------
---   local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
---   if vim.v.shell_error ~= 0 then
---     vim.api.nvim_echo({
---       { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
---       { out, "WarningMsg" },
---       { "\nPress any key to exit..." },
---     }, true, {})
---     vim.fn.getchar()
---     os.exit(1)
---   end
--- end
--- vim.opt.rtp:prepend(lazypath)
-
 vim.g.mapleader = ','
 vim.g.localmapleader = ','
 vim.opt.colorcolumn = '+2'
 -- vim.diagnostic.config({ virtual_text = true, virtual_lines = true })
 
--- require('lazy').setup('plugins')
-
-
------------------------------------------------------------
--- General Neovim settings and configuration
------------------------------------------------------------
-
 -----------------------------------------------------------
 -- Neovim API aliases
 -----------------------------------------------------------
@@ -61,8 +41,8 @@ vim.cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
 opt.number = true               -- Show line number
 opt.relativenumber = true       -- Show Current Line with Relative numbers above and below cursor.
 opt.showmatch = true            -- Highlight matching parenthesis
--- opt.foldmethod = "expr"       -- Enable folding (default 'foldmarker')
+opt.foldmethod = "expr"       -- Enable folding (default 'foldmarker')
--- opt.foldexpr = "nvim_treesitter#foldexpr()"
+opt.foldexpr = "nvim_treesitter#foldexpr()"
 opt.splitright = true           -- Vertical split to the right
 opt.splitbelow = true           -- Horizontal split to the bottom
 opt.ignorecase = true           -- Ignore case letters when search
@@ -100,7 +80,6 @@ vim.cmd [[
 vim.cmd [[ autocmd FileType python set textwidth=250 ]]
 vim.cmd [[ autocmd FileType lua set textwidth=80 ]]
 vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]]
-vim.cmd[[ colorscheme hackthebox ]]
 
 local disabled_built_ins = {
     "netrw",
@@ -123,9 +102,9 @@ local disabled_built_ins = {
     "matchit"
 }
 
-for _, plugin in pairs(disabled_built_ins) do
+-- for _, plugin in pairs(disabled_built_ins) do
-    vim.g["loaded_" .. plugin] = 1
+--     vim.g["loaded_" .. plugin] = 1
-    end
+--     end
 
 -- Correctly set $VIRTUAL_ENV for Python venvs.
 if vim.fn.exists("$VIRTUAL_ENV") == 1 then
@@ -134,7 +113,7 @@ else
     vim.g.python3_host_prog = vim.fn.substitute(vim.fn.system("which python3"), "\n", "", "g")
 end
 
-vim.lsp.enable({'ruff', 'pyright', 'marksman', 'emmet-ls'})
+vim.lsp.enable({'ruff', 'pyright', 'marksman', 'emmet-ls', 'lua'})
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 require('core/keymaps')

nvim/.config/nvim/nvim-pack-lock.json

@@ -15,7 +15,7 @@
     "blink.cmp": {
       "rev": "a327b19a419347084074cce77f6cd074f54705ac",
       "src": "https://github.com/saghen/blink.cmp",
-      "version": "1.0.0 - 2.0.0"
+      "version": ">=0.0.0"
     },
     "codecompanion-history.nvim": {
       "rev": "bc1b4fe06eaaf0aa2399be742e843c22f7f1652a",
@@ -150,6 +150,10 @@
       "src": "https://github.com/nvim-telescope/telescope.nvim",
       "version": "'v0.2.1'"
     },
+    "obsidian.nvim": {
+      "rev": "726b60c89f4bafef267a714ea1faa1335bdd414a",
+      "src": "https://github.com/epwalsh/obsidian.nvim"
+    },
     "plenary.nvim": {
       "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
       "src": "https://github.com/nvim-lua/plenary.nvim"

nvim/.config/nvim/plugin/blink.lua

@@ -12,11 +12,11 @@ vim.api.nvim_create_autocmd('PackChanged', {
 })
 
 vim.pack.add({
-	{src = "https://github.com/saghen/blink.cmp", version = vim.version.range("^1")}
+	{src = "https://github.com/saghen/blink.cmp", version = vim.version.range("*")}
 })
 
 require("blink.cmp").setup({
-  -- opts = {
+		fuzzy = { implementation = "rust" },
 		keymap = {
       preset = "default",
 				['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
@@ -42,7 +42,7 @@ require("blink.cmp").setup({
 		},
 		completion = {documentation = { auto_show = true },
 		},
-		 sources = {
+	 sources = {
 			  per_filetype = {
 			},
 				default = {'lsp', 'path', 'snippets', 'buffer' },

nvim/.config/nvim/plugin/colorschemes.lua

@@ -6,9 +6,11 @@ vim.pack.add({
   "https://github.com/philosofonusus/morta.nvim",
   "https://github.com/Mofiqul/dracula.nvim",
   "https://github.com/EdenEast/nightfox.nvim",
-  "https://github.com/rebelot/kanagawa.nvim",
+  -- "https://github.com/rebelot/kanagawa.nvim",
   "https://github.com/catppuccin/nvim",
   "https://github.com/folke/tokyonight.nvim",
 	"https://github.com/bluz71/vim-nightfly-colors",
   "https://github.com/Bekaboo/deadcolumn.nvim",
 })
+vim.cmd('colorscheme dracula')
+

nvim/.config/nvim/plugin/init.backup

@@ -1,174 +0,0 @@
-vim.pack.add({
-----------------------------------------------------------------
--- LSP and Autocomplete Plugins
--- They should be pulled first!
------------------------------------------------------------------
-"https://github.com/rachartier/tiny-inline-diagnostic.nvim",
-"https://github.com/L3MON4D3/LuaSnip",
-------------------------------------------------------------
--- General Functionality
-------------------------------------------------------------
-"https://github.com/Flemma-Dev/flemma.nvim",
-"https://github.com/folke/noice.nvim",
-"https://github.com/nvim-lualine/lualine.nvim",
-"https://github.com/rcarriga/nvim-notify",
-"https://github.com/kenn7/vim-arsync",
-"https://github.com/nacro90/numb.nvim",
-"https://github.com/nvim-tree/nvim-tree.lua",
-"https://github.com/aserowy/tmux.nvim",
-"https://github.com/roobert/f-string-toggle.nvim",
-"https://github.com/rafamadriz/friendly-snippets",
-"https://github.com/romgrk/barbar.nvim",
-"https://github.com/folke/trouble.nvim",
-"https://github.com/jakewvincent/mkdnflow.nvim",
-"https://github.com/j-hui/fidget.nvim",
-"https://github.com/lukas-reineke/indent-blankline.nvim",
-"https://github.com/folke/todo-comments.nvim",
-"https://github.com/nvim-telescope/telescope-file-browser.nvim",
-"https://github.com/nvim-telescope/telescope-fzf-native.nvim",
-"https://github.com/Bekaboo/deadcolumn.nvim",
-"https://github.com/HiPhish/rainbow-delimiters.nvim",
-"https://github.com/wakatime/vim-wakatime",
-"https://github.com/folke/which-key.nvim",
-"https://github.com/akinsho/toggleterm.nvim",
-"https://github.com/nvim-mini/mini.nvim",
-"https://github.com/prabirshrestha/async.vim",
-})
-
-
-require('tiny-inline-diagnostic').setup(vim.diagnostic.config({ virtual_text = true }))
-require("luasnip").setup({
-	build = "make install_jsregexp",
-	history = true,
-	delete_check_events = "TextChanged",
-  })
-require("luasnip").filetype_extend("liquid", {"html","css","javascript","python"})
-require("luasnip.loaders.from_vscode").lazy_load()
-require("luasnip.loaders.from_vscode").load({})
-require("noice").setup()
-require("lualine").setup({
-	options = {
- 		theme = "nord",
- 	},
-	sections = {
- 		lualine_x = {
- 			{
-     	require("noice").api.statusline.mode.get,
-    	 cond = require("noice").api.statusline.mode.has,
-     	 color = { fg = "#ff9e64" },
-   },
- 	}
- },
-	 {"fileformat", symbols = { unix = " " }, "filetype" },
-  })
-require("numb").setup({
-      show_cursorline = false,
-      show_numbers = false, -- Enable 'number' for the window while peeking
-      hide_relativenumbers = false, -- Enable turning off 'relativenumber' for the window while peeking
-      number_only = true, -- Peek only when the command is only a number instead of when it starts with a number
-      centered_peeking = true,
-    })
-require("nvim-tree").setup({
-  sort_by = "case_sensitive",
-	view = {
-	  width = 30,
-	},
-	renderer = {
-	  group_empty = true,
-	},
-	filters = {
-	  dotfiles = true,
-	},
-	diagnostics = {
-	  enable = true,
-	},
-})
-require("f-string-toggle").setup({
-	key_binding = "<leader>g"
-})
-require("barbar").setup({
-	{ 'mini.icons', opts = {} }
-	-- { 'nvim-tree/nvim-web-devicons', opts = {} }
-})
-require("trouble").setup({
-  })
-require("which-key").setup({
-			add = ({
-	   { "<leader>?", function() require("which-key").show({ global = false }) end,
-	     desc = "Buffer Local Keymaps (which-key)",
-		 },
-	 	})
-	})
-require("notify").setup({
-  	timeout = 5000,
-		render = "minimal",
-		stages = "fade_in_slide_out",
-		-- on_open = function(win)
-		-- 	vim.api.nvim_win_set_config(win, { focusable = false })
-		-- 		end,
-		-- vim.keymap.set("n", "<Esc>", function()
-		-- 	require("notify").dismiss()
-		-- end, { desc = "dismiss notify popup and clear hlsearch" })
-		--    vim.api.nvim_notify = require('notify')
-		--   vim.notify = require('notify')
-		--   end,
-	})
-require("toggleterm").setup({
-		opts = {
-			direction = 'float',
-			}
-	})
--- ------------------------------------------------------------
--- -- echasnovski's Minis get a section of their own...
--- ------------------------------------------------------------
-require("mini.move").setup({
- mappings = {
- 	 left  = '<S-left>',
- 	 right = '<S-right>',
- 	 down  = '<S-down>',
- 	 up    = '<S-up>',
-
- 	 line_left  = '<S-left>',
- 	 line_right = '<S-right>',
- 	 line_down  = '<S-down>',
- 	 line_up    = '<S-up>',
- }})
-require("mini.trailspace").setup({
-  })
-require("mini.surround").setup({
-  })
-require("mini.pairs").setup({
-  })
-require("mini.fuzzy").setup({
-  })
-require("mini.hipatterns").setup({
-		  -- highlighters = {
-			-- hex_color = gen_highlighter.hex_color(),
-			-- hsl_color = {
-			--   pattern = "hsl%(%d+,? %d+,? %d+%)",
-			--   group = function(_, match)
-			-- 	local utils = require("solarized-osaka.hsl")
-			-- 	local nh, ns, nl = match:match("hsl%((%d+),? (%d+),? (%d+)%)")
-			-- 	local h, s, l = tonumber(nh), tonumber(ns), tonumber(nl)
-			-- 	local hex_color = utils.hslToHex(h, s, l)
-			-- 	return MiniHipatterns.compute_hex_color_group(hex_color, "bg")
-			--   end,
-			-- },
-		  -- },
-		})
-require("mini.indentscope").setup({
-	})
-require("mini.diff").setup({
- })
-
-----------------------------------------------
---- Custom Plugins and Tests
-----------------------------------------------
--- 	{
--- 		dir = '/Users/normrasmussen/Documents/Projects/markdown_organizer.nvim',
--- 		dev = true,
--- 		name = 'MarkdownOrganizerPlugin',
--- 	},
--- }
-
-

nvim/.config/nvim/plugin/init.lua

@@ -12,6 +12,8 @@ vim.pack.add({
 "https://github.com/ravitemer/mcphub.nvim",
 "https://github.com/ravitemer/codecompanion-history.nvim",
 "https://github.com/folke/noice.nvim",
+"https://github.com/epwalsh/obsidian.nvim",
+"https://github.com/nvim-lua/plenary.nvim",
 "https://github.com/nvim-lualine/lualine.nvim",
 "https://github.com/rcarriga/nvim-notify",
 "https://github.com/kenn7/vim-arsync",
@@ -63,6 +65,14 @@ require("lualine").setup({
  },
 	 {"fileformat", symbols = { unix = " " }, "filetype" },
   })
+require("obsidian").setup({
+	workspaces = {
+		{
+			name = "Work",
+			path = "~/Documents/Work",
+		}
+	}
+})
 require("numb").setup({
       show_cursorline = false,
       show_numbers = false, -- Enable 'number' for the window while peeking
@@ -99,7 +109,7 @@ require("which-key").setup({
 		 },
 	 	})
 	})
--- require("nvim-notify").setup({
+require("notify").setup({
 --   	timeout = 5000,
 -- 		render = "minimal",
 -- 		stages = "fade_in_slide_out",
@@ -112,7 +122,7 @@ require("which-key").setup({
 		--    vim.api.nvim_notify = require('notify')
 		--   vim.notify = require('notify')
 		--   end,
-	-- })
+	})
 require("toggleterm").setup({
 		opts = {
 			direction = 'float',

tmux/.config/tmux/wan_ip.txt

@@ -0,0 +1 @@
+69.120.56.29

wan_ip.txt

@@ -0,0 +1 @@
+69.120.56.29