Latest updates.

doom-emacs/config.el

@@ -72,7 +72,7 @@
         org-agenda-skip-deadline-if-done t
         org-agenda-skip-scheduled-if-done t
 
-        org-clock-rounding-minutes 5
+        org-clock-rounding-minutes 15
         org-clock-persist t
         org-clock-in-resume t
         org-clock-persist-query-resume nil

doom-emacs/packages.el

@@ -9,7 +9,7 @@
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 ;(package! some-package)
 
-(package! evil-colemak-basics)
+(package! evil-colemak-basics :recipe (:branch "main"))
 
 (package! org-super-agenda)
 

gitconfig

@@ -2,6 +2,12 @@
 	email = tim@kompiler.org
 	name = Tim van Deurzen
 
+[includeIf "gitdir:~/src/blockport/"]
+    path = ~/src/blockport/.gitconfig_bux
+
+[includeIf "gitdir:~/src/bux/"]
+    path = ~/src/bux/.gitconfig_bux
+
 [alias]
 	co = checkout
 	br = branch
@@ -15,12 +21,15 @@
 [url "ssh://git@gitlab.dopey.blockport.io"]
 	insteadOf = https://gitlab.dopey.blockport.io
 
+[url "ssh://git@github.com-vdeurzen-bux/buxapp"]
+    insteadOf = https://github.com/buxapp
+
 [core]
 	editor = nvim
     pager = delta
 
 [delta]
-    features = line-numbers decorations side-by-side
+    features = line-numbers decorations
     plus-style = "syntax bold auto"
     minus-style = "syntax bold italic auto"
     syntax-theme = "gruvbox-light"

neovim/after/ftplugin/go.lua

-local lsp_config = require("lspconfig")
-
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
-capabilities.textDocument.completion.completionItem.snippetSupport = true
-
-lsp_config.gopls.setup({
-	capabilities = capabilities,
-	settings = {
-		gopls = {
-			experimentalPostfixCompletions = true,
-			analyses = {
-				fieldalignment = true,
-				nilness = true,
-				unusedwrite = true,
-				unusedparams = true,
-				shadow = true,
-				unreachable = true,
-				bools = true,
-			},
-			staticcheck = true,
-			usePlaceholders = true,
-			codelenses = {
-				gc_details = true,
-			},
-		},
-	},
-})
-
-vim.cmd('set noexpandtab')

neovim/init.lua

@@ -4,3 +4,5 @@ require("keybindings")
 require("plugins")
 require("lsp")
 require("treesitter")
+require("snippets")
+require("automagic")

neovim/lua/core/init.lua

@@ -10,6 +10,7 @@ end
 
 local function basic_configuration()
 	local options = {
+	    winbar = "%=%m %f";
 		hidden = true;
 		fileformats = "unix,mac,dos";
 		modeline = true;
@@ -31,7 +32,7 @@ local function basic_configuration()
 		termguicolors = true;
 		background = "dark";
 		ttyfast = true;
-		lazyredraw = true;
+		-- lazyredraw = true;
 		listchars = "tab:»·,nbsp:+,trail:·,extends:→,precedes:←";
 		showcmd = true;
 		ruler = true;
@@ -42,7 +43,7 @@ local function basic_configuration()
 		wildmenu = true;
 		wildignore = "*.o,*.class,*.hi,*.pdf,*.git,*.blg,*.bbl,*.aux,*.gcno,*.gcda";
 		showmode = true;
-		laststatus = 2;
+		laststatus = 3;
 		scrolloff = 7;
 		cmdheight = 2;
 		tabpagemax = 100;

neovim/lua/keybindings/compe.lua

@@ -2,50 +2,154 @@ local lspkind = require("lspkind")
 lspkind.init()
 
 local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-
+local luasnip = require("luasnip")
 local cmp = require("cmp")
+
+local has_words_before = function()
+    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+end
+
+local t = function(str)
+    return vim.api.nvim_replace_termcodes(str, true, true, true)
+end
+
 cmp.setup({
-	snippet = {
-		expand = function(args)
-			--require("luasnip").lsp_expand(args.body)
-			require("snippy").expand_snippet(args.body)
-		end,
-	},
-
-	mapping = {
-		["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
-		["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
-		["<C-e>"] = cmp.mapping({
-			i = cmp.mapping.abort(),
-			c = cmp.mapping.close(),
-		}),
-	},
-
-	sources = cmp.config.sources({
-		{ name = "nvim_lsp" },
-		{ name = "nvim_lua" },
-		{ name = "path" },
-		{ name = "snippy" },
-		{ name = "buffer", keyword_length = 5 },
-	}),
-
-	formatting = {
-		format = lspkind.cmp_format({
-			with_text = true,
-			menu = {
-				buffer = "[buf]",
-				nvim_lsp = "[LSP]",
-				nvim_lua = "[api]",
-				path = "[path]",
-				luasnip = "[snip]",
-			},
-		}),
-	},
-
-	experimental = {
-		native_menu = false,
-		ghost_text = true,
-	},
+    snippet = {
+        expand = function(args)
+            luasnip.lsp_expand(args.body)
+            --require("snippy").expand_snippet(args.body)
+        end,
+    },
+
+    mapping = {
+        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(2),
+        ['<Down>'] = cmp.mapping(cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }), { 'i' }),
+        ['<Up>'] = cmp.mapping(cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }), { 'i' }),
+        ['<C-n>'] = cmp.mapping({
+            c = function()
+                if cmp.visible() then
+                    cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
+                elseif luasnip.expand_or_jumpable() then
+                    luasnip.expand_or_jump()
+                elseif has_words_before() then
+                    cmp.complete()
+                else
+                    vim.api.nvim_feedkeys(t('<Down>'), 'n', true)
+                end
+            end,
+            i = function(fallback)
+                if cmp.visible() then
+                    cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
+                elseif luasnip.expand_or_jumpable() then
+                    luasnip.expand_or_jump()
+                elseif has_words_before() then
+                    cmp.complete()
+                else
+                    fallback()
+                end
+            end
+        }),
+        ['<C-p>'] = cmp.mapping({
+            c = function()
+                if cmp.visible() then
+                    cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
+                elseif luasnip.jumpable(-1) then
+                    luasnip.jump(-1)
+                else
+                    vim.api.nvim_feedkeys(t('<Up>'), 'n', true)
+                end
+            end,
+            i = function(fallback)
+                if cmp.visible() then
+                    cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
+                elseif luasnip.jumpable(-1) then
+                    luasnip.jump(-1)
+                else
+                    fallback()
+                end
+            end
+        }),
+        ["<C-e>"] = cmp.mapping.close(),
+        ["<c-y>"] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Insert,
+            select = true,
+        }),
+        ["<c-q>"] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Replace,
+            select = true,
+        }),
+
+        -- ["<CR>"] = cmp.mapping.confirm({ select = true }),
+
+        -- ["<Tab>"] = cmp.mapping(function(fallback)
+        -- 	if cmp.visible() then
+        -- 		cmp.select_next_item()
+        -- 	elseif luasnip.expand_or_jumpable() then
+        -- 		luasnip.expand_or_jump()
+        -- 	elseif has_words_before() then
+        -- 		cmp.complete()
+        -- 	else
+        -- 		fallback()
+        -- 	end
+        -- end, {
+        -- 	"i",
+        -- 	"s",
+        -- }),
+
+        -- ["<S-Tab>"] = cmp.mapping(function(fallback)
+        -- 	if cmp.visible() then
+        -- 		cmp.select_prev_item()
+        -- 	elseif luasnip.jumpable(-1) then
+        -- 		luasnip.jump(-1)
+        -- 	else
+        -- 		fallback()
+        -- 	end
+        -- end, {
+        -- 	"i",
+        -- 	"s",
+        -- }),
+    },
+
+    sources = cmp.config.sources({
+        { name = "nvim_lsp" },
+        { name = "luasnip" },
+        { name = "nvim_lua" },
+        { name = "path" },
+        --{ name = "snippy" },
+        { name = "buffer", keyword_length = 5 },
+    }),
+
+    formatting = {
+        format = lspkind.cmp_format({
+            with_text = true,
+            menu = {
+                buffer = "[buf]",
+                nvim_lsp = "[LSP]",
+                nvim_lua = "[api]",
+                path = "[path]",
+                luasnip = "[snip]",
+            },
+        }),
+    },
+
+    sorting = {
+        comparators = {
+            cmp.config.compare.offset,
+            cmp.config.compare.exact,
+            cmp.config.compare.score,
+            cmp.config.compare.kind,
+            cmp.config.compare.sort_text,
+            cmp.config.compare.length,
+            cmp.config.compare.order,
+        },
+    },
+
+    experimental = {
+        native_menu = false,
+        ghost_text = true,
+    },
 })
 
 cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))

neovim/lua/keybindings/which_key.lua

@@ -31,7 +31,7 @@ local keymap = {
 		r = { "<Cmd>lua vim.lsp.buf.rename()<CR>", "rename" },
 		s = { "<Cmd>lua vim.lsp.buf.references()<CR>", "find" },
 		p = { "<cmd>lua vim.lsp.buf.hover()<CR>", "preview definition" },
-		f = { "<Cmd>lua vim.lsp.buf.formatting()<CR>", "format" },
+		f = { "<Cmd>lua vim.lsp.buf.format({ async = true })<CR>", "format" },
 		d = { "<Cmd>lua vim.lsp.buf.definition()<CR>", "go to definition" },
 		i = { "<Cmd>lua vim.lsp.buf.implementation()<CR>", "go to definition" },
 		t = { "<Cmd>LspTroubleToggle lsp_workspace_diagnostics<CR>", "open LspTrouble" },

neovim/lua/snippets/init.lua

+require("luasnip.loaders.from_vscode").load({paths= {"~/.local/share/nvim/site/pack/packer/start/friendly-snippets/"}})
+
+
+local ls = require("luasnip")
+ls.filetype_extend("all", { "_" })

neovim/lua/treesitter/init.lua

@@ -3,10 +3,11 @@ ts_configs.setup {
     ensure_installed = {
         'bash', 'bibtex', 'c', 'comment', 'cpp', 'css', 'go', 'haskell',
         'html', 'javascript', 'json', 'jsonc', 'julia', 'kotlin', 'latex', 'lua', 'ocaml',
-        'ocaml_interface', 'python', 'regex', 'rust', 'teal', 'toml', 'typescript', 'yaml', 'zig'
+        'ocaml_interface', 'python', 'regex', 'rust', 'teal', 'toml', 'typescript', 'yaml',
+        'zig', 'query',
     },
-    highlight = {enable = true, use_languagetree = true},
-    indent = {enable = false},
+    highlight = { enable = true, use_languagetree = true },
+    indent = { enable = false },
     incremental_selection = {
         enable = true,
         keymaps = {
@@ -17,10 +18,30 @@ ts_configs.setup {
         }
     },
     refactor = {
-        smart_rename = {enable = true, keymaps = {smart_rename = "grr"}},
-        highlight_definitions = {enable = true},
+        smart_rename = { enable = true, keymaps = { smart_rename = "grr" } },
+        highlight_definitions = { enable = true },
         highlight_current_scope = { enable = false }
-    }--,
+    },
+    playground = {
+        enable = true,
+        disable = {},
+        updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+        persist_queries = false, -- Whether the query persists across vim sessions
+        keybindings = {
+            toggle_query_editor = 'o',
+            toggle_hl_groups = 'i',
+            toggle_injected_languages = 't',
+            toggle_anonymous_nodes = 'a',
+            toggle_language_display = 'I',
+            focus_language = 'f',
+            unfocus_language = 'F',
+            update = 'R',
+            goto_node = '<cr>',
+            show_help = '?',
+        },
+    }
+
+    --,
     --textobjects = {
     --    select = {
     --        enable = true,