update

.config/nvim/after/plugin/luasnip.lua

@@ -1,14 +1,46 @@
-require('luasnip').config.set_config({
+local ls = require('luasnip')
+local ll = require('luasnip.loaders.from_lua')
+local types = require('luasnip.util.types')
+
+ls.config.set_config({
     enable_autosnippets = true,
     store_selection_keys = '<C-s>',
     history = true,
     updateevents = 'TextChanged,TextChangedI',
     delete_check_events = 'TextChanged',
+    ext_opts = {
+        [types.insertNode] = {
+            active = {},
+            unvisited = {
+                virt_text = { { '<- insert', 'DiagnosticVirtualTextHint' } }
+            },
+            visited = {},
+            passive = {},
+            snippet_passive = {},
+        },
+        [types.choiceNode] = {
+            active = {
+                virt_text = { { '<- insert', 'DiagnosticVirtualTextError' } },
+            },
+        }
+    },
 })
 
-require('luasnip.loaders.from_lua').load({ paths = { vim.fn.stdpath('config') .. '/snippets' } })
+ll.load({ paths = { vim.fn.stdpath('config') .. '/snippets' } })
 
-local keymap = vim.api.nvim_set_keymap
+vim.keymap.set({ 'i', 's' }, '<C-j>', function()
-local opts = { noremap = true, silent = true }
+    if ls.expand_or_jumpable() then
-keymap('i', '<C-j>', '<cmd>lua require("luasnip").jump(1)<cr>', opts)
+        ls.expand_or_jump()
-keymap('i', '<C-k>', '<cmd>lua require("luasnip").jump(-1)<cr>', opts)
+    end
+end, { silent = true })
+
+vim.keymap.set({ 'i', 's' }, '<C-k>', function()
+    if ls.jumpable(-1) then
+        ls.jump(-1)
+    end
+end, { silent = true })
+
+vim.keymap.set('n', '<leader><leader>s', function()
+    vim.cmd('source ' .. vim.fn.stdpath('config') .. '/after/plugin/luasnip.lua')
+    vim.notify('Sourced snippets', 'info', { title = 'LuaSnip' })
+end)

.config/nvim/lua/lennartalff/remap.lua

@@ -42,6 +42,11 @@ local function quickfix()
 end
 vim.keymap.set('n', '<leader>qf', quickfix)
 
+vim.keymap.set('v', '<leader>dgh', "<cmd>diffget LOCAL<cr>")
+vim.keymap.set('v', '<leader>dgl', "<cmd>diffget REMOTE<cr>")
+
+vim.keymap.set('n', '<leader>dgh', "<cmd>diffget LOCAL<cr>")
+vim.keymap.set('n', '<leader>dgl', "<cmd>diffget REMOTE<cr>")
 
 -- stay in visual mode after indenting/dedenting
 vim.keymap.set('v', '<', '<gv')

.config/nvim/lua/plugins/lsp/init.lua

@@ -70,7 +70,7 @@ local handlers = {
             settings = {
                 texlab = {
                     build = {
-                        onSave = true,
+                        onSave = false,
                         forwardSearchAfter = true,
                     },
                     chktex = {

.config/sway/config

@@ -6,7 +6,7 @@ set $lock swaylock
 include ~/.config/sway/config.d/*
 
 # scale internal display
-output eDP-1 scale 1.5
+# output eDP-1 scale 1.5
 output * scale 1.25
 
 # notification daemon

home/.gitconfig

@@ -2,13 +2,23 @@
 	email = lennart.alff@gmail.com
 	name = Thies Lennart Alff
 [merge]
-	tool = nvim
+	tool = "nvim"
+[mergetool]
+    keepBackup = false
+    prompt = false
+[mergetool "nvim"]
+    cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
+[mergetool "vscode"]
+    cmd = code --wait $MERGED
+[diff]
+    guitool = vscode
+    tool = nvimdiff
+    prompt = true
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
+    layout = LOCAL,MERGED,REMOTE
 [difftool "vscode"]
 	cmd = code --wait --diff $LOCAL $REMOTE
-[mergetool "vscode"]
-	cmd = code --wait $MERGED
-[diff]
-	guitool = vscode
 [init]
 	defaultBranch = main
 [core]

pkglist

@@ -54,6 +54,8 @@ noto-fonts-emoji
 ttf-fira-code
 # required for waybar symbols
 ttf-font-awesome
+# used in waybar and nvim
+ttf-nerd-fonts-symbols
 
 # create gnome keyring
 seahorse