diff --git a/configuration.nix b/configuration.nix
index da63e84..283960e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -61,8 +61,6 @@
   ];
 
   hardware = {
-    pulseaudio.enable = true;
-
     opengl.enable = true;
 
     sane = {
@@ -73,6 +71,7 @@
 
   security = {
     polkit.enable = true;
+    rtkit.enable = true;
     pam.services.swaylock = { };
   };
 
@@ -88,6 +87,12 @@
     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 e82efaf..9fa62e2 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -142,6 +142,10 @@
 
             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 878a4aa..92123c2 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -19,7 +19,6 @@ 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)
@@ -39,9 +38,6 @@ 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 931c77d..eca7e14 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
     },
-    indent = {
-        enable = false,
-    },
-    rainbow = {
+    incremental_selection = {
         enable = true,
-        extended_mode = true,
-        max_file_lines = nil,
+        keymaps = {
+            init_selection = "v",
+            node_decremental = "<",
+            node_incremental = ">",
+            scope_incremental = false,
+        },
     },
 })
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index c610773..739d897 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -64,6 +64,7 @@ in
       input = {
         "type:keyboard" = {
           xkb_layout = "de";
+          xkb_variant = "nodeadkeys";
         };
         "type:touchpad" = {
           natural_scroll = "enabled";