From bdd09aa73eb1a199a405c0b809ac285f41589a4d Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:33:06 +0200 Subject: [PATCH 1/6] feat(sway): disable dead keys on keyboard --- home-manager/sway/default.nix | 1 + 1 file changed, 1 insertion(+) 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"; From 56bf157a60c55c58262b533865fc504df48528cd Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:33:42 +0200 Subject: [PATCH 2/6] feat: use pipewire instead of pulseaudio to support zoom screensharing --- configuration.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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; From 06405a5d477928e80157e05bf055550ed95de2dd Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:37:53 +0200 Subject: [PATCH 3/6] feat: remove obsolete nvim-illuminate lsp config --- home-manager/neovim/lspconfig.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index 878a4aa..682e65a 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -39,9 +39,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") From a43a04aeaba5b0e1093bda60d4d9175061ade28a Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:38:15 +0200 Subject: [PATCH 4/6] feat: remove conflicting g-t key mapping --- home-manager/neovim/lspconfig.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index 682e65a..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) From 02635a71b1474c250c4600af0043defcc8877fc7 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:38:33 +0200 Subject: [PATCH 5/6] feat: configure illuminate highlighting as bold --- home-manager/neovim/default.nix | 4 ++++ 1 file changed, 4 insertions(+) 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 ''; }; From e91d1e1ce6ede494d54e440a694ed2536d527787 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 25 Oct 2023 10:49:16 +0200 Subject: [PATCH 6/6] feat: configure treesitter incremental selection, remove obsolte settings --- home-manager/neovim/treesitter.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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, + }, }, })