init.lua

@@ -11,6 +11,8 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), {
 		{ import = 'plex.plugins.extras.ui' },
 		{ import = 'plex.plugins.extras.treesitter' },
 		{ import = 'plex.plugins.extras.editor' },
+		{ import = 'plex.plugins.extras.org' },
+		{ import = 'plex.plugins.extras.lang.go' },
 		{ import = 'plex.plugins.extras.lang.json' },
 		{ import = 'plex.plugins.extras.lang.python' },
 		{ import = 'plex.plugins.extras.lang.yaml' },

lua/plex/config/autocmds.lua

@@ -56,13 +56,13 @@ vim.api.nvim_create_autocmd('TextYankPost', {
 })
 
 -- Automatically set read-only for files being edited elsewhere
--- vim.api.nvim_create_autocmd('SwapExists', {
+vim.api.nvim_create_autocmd('SwapExists', {
--- 	group = augroup('open_swap'),
+	group = augroup('open_swap'),
--- 	nested = true,
+	nested = true,
--- 	callback = function()
+	callback = function()
--- 		vim.v.swapchoice = 'o'
+		vim.v.swapchoice = 'o'
--- 	end,
+	end,
--- })
+})
 
 -- Create directories when needed, when saving a file (except for URIs "://").
 vim.api.nvim_create_autocmd('BufWritePre', {

lua/plex/config/init.lua

@@ -28,7 +28,7 @@ local defaults = {
 	colorscheme = '',
 
 	features = {
-		elite_mode = true,
+		elite_mode = false,
 		window_q_mapping = true,
 	},
 

lua/plex/config/keymaps.lua

@@ -56,14 +56,6 @@ end
 map('n', '<A-k>', '<cmd>lnext<CR>', { desc = 'Next Loclist Item' })
 map('n', '<A-j>', '<cmd>lprev<CR>', { desc = 'Previous Loclist Item' })
 
--- go to next diagnostics entry
-map('n', '<C-j>', function ()
-	vim.diagnostic.goto_next()
-end, { desc = 'go to next diagnostic'})
-map('n', '<C-k>', function ()
-	vim.diagnostic.goto_prev()
-end, { desc = 'go to last diagnostic'})
-
 -- Whitespace jump (see plugin/whitespace.vim)
 map('n', ']s', function()
 	require('plex.lib.edit').whitespace_jump(1)
@@ -128,10 +120,8 @@ map('n', 'o', 'o', { desc = 'Insert newline below' })
 map('i', '<S-Return>', '<C-o>o', { desc = 'Start Newline' })
 
 -- Split and join lines
-map('n', '<leader>jj', ':join<CR>g$', { desc = 'Join lines', silent = true })
+map('n', '<leader>jj', ':join<CR>', { desc = 'Join lines', silent = true })
-map('n', '<leader>jJ', 'k:join<CR>j', { desc = 'Join lines', silent = true })
+map('n', '<leader>ss', 'i<CR><ESC>k', { desc = 'Split lines', silent = true })
-map('n', '<leader>ss', 'i<CR><ESC>', { desc = 'Split lines', silent = true })
-map('n', '<leader>sS', 'i<CR><ESC>kg$', { desc = 'Split lines', silent = true })
 
 -- Re-select blocks after indenting in visual/select mode
 map('x', '<', '<gv', { desc = 'Indent Right and Re-select' })

lua/plex/plugins/extras/coding/sandwich.lua

@@ -1,18 +1,16 @@
 return {
 	{
-		-- I dont get how this stuff works
 		'machakann/vim-sandwich',
-		enabled = false,
 		-- stylua: ignore
 		keys = {
 			-- See https://github.com/machakann/vim-sandwich/blob/master/macros/sandwich/keymap/surround.vim
-			{ '<leader>sd', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
+			{ 'ds', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
-			{ '<leader>ssd', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
+			{ 'dss', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
-			{ '<leader>sc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
+			{ 'cs', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
-			{ '<leader>ssc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
+			{ 'css', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
-			{ '<leader>sa', '<Plug>(operator-sandwich-add)', silent = true, mode = { 'n', 'x', 'o' }},
+			{ 'sa', '<Plug>(operator-sandwich-add)', silent = true, mode = { 'n', 'x', 'o' }},
-			{ '<leader>ir', '<Plug>(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }},
+			{ 'ir', '<Plug>(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }},
-			{ '<leader>ab', '<Plug>(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }},
+			{ 'ab', '<Plug>(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }},
 		},
 		init = function()
 			vim.g.sandwich_no_default_key_mappings = 1

lua/plex/plugins/extras/org/neorg.lua

@@ -0,0 +1,26 @@
+return {
+	{
+		"nvim-neorg/neorg",
+		lazy = false,
+		build = ":Neorg sync-parsers",
+		dependencies = { "nvim-lua/plenary.nvim" },
+		config = function()
+			require("neorg").setup {
+				load = {
+					["core.defaults"] = {}, -- Loads default behaviour
+					["core.concealer"] = {}, -- Adds pretty icons to your documents
+					["core.dirman"] = { -- Manages Neorg workspaces
+						config = {
+							workspaces = {
+								-- NOTE: This is the server branch, note taking here should not
+								-- be needed. Also, my server does not have a synchronisation
+								-- to nextcloud set up, so I don't have access to my Neorg 
+								-- notes regardless.
+							},
+						},
+					},
+				},
+			}
+		end,
+	},
+}

lua/plex/plugins/extras/org/vimwiki.lua

@@ -0,0 +1,45 @@
+return {
+	{
+		'vimwiki/vimwiki',
+		enabled = false,
+		cmd = { 'VimwikiIndex', 'VimwikiUISelect' },
+		keys = {
+			{ '<Leader>W', '<cmd>VimwikiIndex<CR>', { noremap = true } },
+		},
+		init = function()
+			vim.g.vimwiki_global_ext = 0
+			vim.g.vimwiki_use_calendar = 1
+			vim.g.vimwiki_hl_headers = 1
+			vim.g.vimwiki_hl_cb_checked = 1
+			vim.g.vimwiki_autowriteall = 0
+			vim.g.vimwiki_listsym_rejected = '✗'
+			vim.g.vimwiki_listsyms = '✗○◐●✓'
+		end,
+		config = function()
+			vim.g.vimwiki_key_mappings = {
+				all_maps = 1,
+				global = 1,
+				headers = 1,
+				text_objs = 1,
+				table_format = 1,
+				table_mappings = 1,
+				lists = 1,
+				links = 1,
+				html = 1,
+				mouse = 0,
+			}
+			vim.g.vimwiki_list = {
+				{
+					diary_header = 'Diary',
+					diary_link_fmt = '%Y-%m/%d',
+					auto_toc = 1,
+					path = '~/docs/wiki/',
+					syntax = 'markdown',
+					ext = '.md',
+				},
+				{ path = '~/docs/books/', syntax = 'markdown', ext = '.md' },
+				{ path = '~/notes/', syntax = 'markdown', ext = '.md' },
+			}
+		end,
+	},
+}

lua/plex/plugins/extras/treesitter/treesj.lua

@@ -1,8 +1,6 @@
 return {
 	{
 		'Wansmer/treesj',
-		enabled = true,
-		lazy = false,
 		cmd = { 'TSJJoin', 'TSJSplit' },
 		keys = {
 			{ '<leader>sj', '<cmd>TSJJoin<CR>' },

lua/plex/plugins/extras/ui/dashboard.lua

@@ -1,20 +1,3 @@
-local function get_header()
-	-- see https://github.com/MaximilianLloyd/ascii.nvim
-	return {
-	-- The following is a customized version!
-	[[                                                                       ]],
-	[[                                           		 ██                    ]],
-	[[        █ ███████            █████   		 ██                    ]],
-	[[       ███ █████              █████                             ]],
-	[[      █████ ███ ███████████████████ ███   ███████████   ]],
-	[[     ██ ██ █ ███     █████████████ █████ ██████████████   ]],
-	[[    ████ ████ ██████████ █████████ █████ █████ ████ █████   ]],
-	[[   ██████ ██ ███     ███ █████████ █████ █████ ████ █████  ]],
-	[[  ████████  ██████████████████ ████ █████ █████ ████ ██████ ]],
-	[[                                                                       ]],
-	}
-end
-
 return {
 	{
 		'glepnir/dashboard-nvim',
@@ -24,9 +7,11 @@ return {
 
 				theme = 'hyper',
 				config = {
-					header = get_header(),
+					header = {
+						foo = "bar",
+					},
 					week_header = {
-						enable = false,
+						enable = true,
 					},
 					shortcut = {
 						{
@@ -65,17 +50,6 @@ return {
 							key = 's',
 						},
 					},
-
-					project = {
-						enable = true,
-						limit = 8,
-						icon = '',
-						label = ' Projects',
-						action = 'Telescope find_files cwd='
-					},
-					packages = { enable = true},
-					mru = { limit = 10, icon = '', label = ' Last Edited'},
-					-- footer = { 'footer bar foo' },
 				},
 
 			})

lua/plex/plugins/treesitter.lua

@@ -69,8 +69,8 @@ return {
 			-- See: https://github.com/windwp/nvim-ts-autotag
 			autotag = {
 				enable = true,
+				-- Removed markdown due to errors
 				filetypes = {
-					'markdown',
 					'glimmer',
 					'handlebars',
 					'hbs',
@@ -186,9 +186,5 @@ return {
 				'zig',
 			},
 		},
-		init = function ()
-			vim.opt.concealcursor = "nc"
-			vim.opt.conceallevel = 2
-		end
 	},
 }

lua/plex/plugins/ui.lua

@@ -6,10 +6,7 @@ return {
 	-----------------------------------------------------------------------------
 	{ 'nvim-tree/nvim-web-devicons', lazy = false },
 	{ 'MunifTanjim/nui.nvim', lazy = false },
-	{
+	{ 'rafi/tabstrip.nvim', lazy = false, priority = 98, opts = true },
-		'akinsho/bufferline.nvim', lazy = false, version = "*",
-		dependencies = 'nvim-tree/nvim-web-devicons'
-	},
 
 	-----------------------------------------------------------------------------
 	{

spell/en.utf-8.add

@@ -17,54 +17,9 @@ cscherr
 MD5
 Hashchecker
 Testvectors
+#ossibilites
 possibilites/!
 Hexdumper
 hexdumped
 SMB2
 fileserver
-Atlassian
-Initialkosten
-Hexeditor
-hexeditor
-Hexdumping
-stdin
-md
-regex101
-Manspider
-Manspiders
-subrace
-subraces
-swiftstride
-beasthide
-Eldeen
-Khorvaire
-drider
-spiderful
-spiderfew
-Spiderfolk
-Shrelluka
-find/!
-find
-Magnam
-arachna
-matrem
-namegen
-Zessas
-Webbington
-Razu
-Rhellu
-cantrip
-d12
-d4
-th
-unnoteworthy
-Qroczhreer
-Blokhof
-Hauck
-spiderous
-zlib
-experimentelle
-SHA
-Etablierungs
-the
-strikethrough