diff --git a/configuration.nix b/configuration.nix
index 283960e..da63e84 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -61,6 +61,8 @@
   ];
 
   hardware = {
+    pulseaudio.enable = true;
+
     opengl.enable = true;
 
     sane = {
@@ -71,7 +73,6 @@
 
   security = {
     polkit.enable = true;
-    rtkit.enable = true;
     pam.services.swaylock = { };
   };
 
@@ -87,12 +88,6 @@
     wlr.enable = true;
   };
 
-  services.pipewire = {
-    enable = true;
-    wireplumber.enable = true;
-    pulse.enable = true;
-  };
-
   services.openssh = {
     enable = true;
     settings.X11Forwarding = true;
diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 9fa62e2..e82efaf 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -142,10 +142,6 @@
 
             vim.g.gitblame_date_format = "%r"
 
-            -- setup illuminate highlight groups
-            vim.api.nvim_set_hl(0, "IlluminatedWordText", { bold = true })
-            vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "IlluminatedWordText" })
-            vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "IlluminatedWordText" })
         EOF
       '';
     };
diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 92123c2..878a4aa 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -19,6 +19,7 @@ local on_attach = function(client, bufnr)
 
     nnoremap("gD", vim.lsp.buf.declaration)
     nnoremap("gd", telescope.lsp_definitions)
+    nnoremap("gt", telescope.lsp_type_definitions)
     nnoremap("gi", telescope.lsp_implementations)
     nnoremap("gr", telescope.lsp_references)
     nnoremap("K", vim.lsp.buf.hover)
@@ -38,6 +39,9 @@ local on_attach = function(client, bufnr)
             callback = format_buffer,
         })
     end
+
+    local illuminate = require("illuminate")
+    illuminate.on_attach(client)
 end
 
 local lsp_status = require("lsp-status")
diff --git a/home-manager/neovim/treesitter.lua b/home-manager/neovim/treesitter.lua
index eca7e14..931c77d 100644
--- a/home-manager/neovim/treesitter.lua
+++ b/home-manager/neovim/treesitter.lua
@@ -1,14 +1,14 @@
 require('nvim-treesitter.configs').setup({
     highlight = {
         enable = true,
+        additional_vim_regex_highlighting = false
     },
-    incremental_selection = {
+    indent = {
+        enable = false,
+    },
+    rainbow = {
         enable = true,
-        keymaps = {
-            init_selection = "v",
-            node_decremental = "<",
-            node_incremental = ">",
-            scope_incremental = false,
-        },
+        extended_mode = true,
+        max_file_lines = nil,
     },
 })
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 739d897..c610773 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -64,7 +64,6 @@ in
       input = {
         "type:keyboard" = {
           xkb_layout = "de";
-          xkb_variant = "nodeadkeys";
         };
         "type:touchpad" = {
           natural_scroll = "enabled";