Merge branch 'main' of ssh://src.twobees.de/git/dotfiles

# Conflicts:
#	stow/nvim/.config/nvim/init.lua

diff --cc stow/nvim/.config/nvim/init.lua
index 8c27bdd9939d25ff87ccc6dd3571b5fef5379414,c4922ec27b5c8b157293f8e407ec2cf205f189ff..34cd17dc532310df190dd4a1225dadc34f8ffa8f
--- 1/stow/nvim/.config/nvim/init.lua
--- 2/stow/nvim/.config/nvim/init.lua
+++ b/stow/nvim/.config/nvim/init.lua
@@@ -100,23 -100,6 +100,16 @@@ require('lazy').setup(
      },
    },
  
-   {
-     -- Add indentation guides even on blank lines
-     'lukas-reineke/indent-blankline.nvim',
-     main = "ibl",
-     opts = { },
-   },
- 
 +  {  'vimwiki/vimwiki',
 +    init = function()
 +      vim.g.vimwiki_list = {
 +        {
 +          path = '~/p/wiki/',
 +          syntax = 'default',
 +          ext = '.md',
 +        },
 +      }
 +    end, },
    -- {  dir = '~/github/mynvimplugins/btoggle.nvim/' },
    {  'tobser/btoggle.nvim' },
  

diff --cc stow/sway/.config/sway/config
index 821b21956f4be9fa2aa0d6d34153f3d7a27108de,6565ca22bf5a3130dd48f0b749af9e921606ac1d..3dcf60c0a050bf1442e697422011ec98122b9fd8
--- 1/stow/sway/.config/sway/config
--- 2/stow/sway/.config/sway/config
+++ b/stow/sway/.config/sway/config
@@@ -256,10 -254,12 +256,13 @@@ bindsym Shift+Control+p exec grim -o $(
  for_window [window_role="About"] floating enable
  for_window [class="vlc"] floating enable
  
+ input type:touchpad {
+     tap enabled
+     natural_scroll enabled
+ }
+ 
  input type:keyboard {
 -    xkb_layout us,de
 +    #xkb_layout us,de
 +    xkb_layout eu
      xkb_options grp:win_space_toggle
  }
- 
-