roles/nvim/files/init_pc.lua

@@ -32,6 +32,7 @@ require('packer').startup(function()
     'nvim-treesitter/nvim-treesitter', -- Syntax Highlighting
     run = ':TSUpdate'
   }
+  use 'tpope/vim-commentary' -- Commentary
   use 'tpope/vim-surround' -- Surrounding
   use 'tpope/vim-repeat' -- Repeat Surrounding
   use 'tpope/vim-sleuth' -- Detect Spacing
@@ -57,6 +58,7 @@ require("zenburn").setup()
 
 vim.g.mapleader = ","
 opt.mouse = "nv"
+opt.pastetoggle = "ZP"
 
 opt.number = true
 opt.relativenumber = true
@@ -117,7 +119,7 @@ _G.enable_spell = function(lang)
     print("spellcheck disabled")
   end
 
-  -- return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
+  return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
 end
 
 map('n', 'ZD', 'v:lua.enable_spell("de")', { expr = true, silent = true })
@@ -191,6 +193,7 @@ lsp.lua_ls.setup {
 }
 
 -- Autopairs
+require 'nvim-ts-autotag'.setup()
 require 'nvim-autopairs'.setup {}
 
 -- Snippets
@@ -214,7 +217,7 @@ ls.config.set_config({
   },
 })
 
-require("luasnip.loaders.from_lua").load({ paths = { "~/.config/nvim/lua/snippets" } })
+require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })
 
 -- Completion
 local cmp = require('cmp')
@@ -286,8 +289,7 @@ require('nvim-treesitter.configs').setup {
     additional_vim_regex_highlighting = false,
   },
   autotag = {
-    enable = true,
-    filetypes = { 'html', 'htmldjango', 'xml', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'svelte', 'vue' }
+    enable = true
   }
 }
 
@@ -437,4 +439,4 @@ require("auto-session").setup {
   log_level = "error"
 }
 
--- opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal"
+opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"

roles/xmonad/files/xmonad_qwerty.hs

@@ -7,9 +7,9 @@ import XMonad.Actions.Search (SearchEngine, openstreetmap, hackage, wikipedia, y
 
 import XMonad.Hooks.DynamicLog (PP(..), dynamicLogWithPP, filterOutWsPP, xmobarPP, xmobarColor, wrap, shorten)
 import XMonad.Hooks.ManageDocks (ToggleStruts(..), avoidStruts, docks)
+import XMonad.Hooks.DynamicProperty (dynamicPropertyChange)
 import XMonad.Hooks.SetWMName (setWMName)
 import XMonad.Hooks.WorkspaceHistory (workspaceHistoryHook)
-import XMonad.Hooks.OnPropertyChange (onXPropertyChange)
 
 import XMonad.Layout.Spacing (Spacing, spacingRaw, Border (..))
 import XMonad.Layout.LayoutModifier (ModifiedLayout)
@@ -249,9 +249,7 @@ myManageHook = composeAll . concat $
         myFloatingClasses = ["Gimp", "Origin"]
         myGames = ["Grim Dawn", "Der Herr der Ringe Online™", "Dota 2", "Project Zomboid", "Valheim", "Factorio", "Path of Exile", "Paradox Launcher", "Europa Universalis IV", "Bannerlord"]
 
-myEventHook = mconcat 
-    [ onXPropertyChange "WM_NAME" (title =? "Database.kdbx - KeePassXC" <||> title =? "Database.kdbx [Gesperrt] - KeePassXC" --> floating)
-    ]
+myEventHook = dynamicPropertyChange "WM_NAME" (title =? "Database.kdbx - KeePassXC" <||> title =? "Database.kdbx [Gesperrt] - KeePassXC" --> floating)
     where floating = customFloating $ W.RationalRect (1/8) (1/8) (3/4) (3/4)
 
 -- Startup hook