final kde shortcuts and nvim config from bandito

4 files changed, 114 insertions, 102 deletions

diff --git a/bandito.kksrc b/bandito.kksrc
index 0aefd5a..4f2c96e 100644
--- a/bandito.kksrc
+++ b/bandito.kksrc
@@ -4,13 +4,14 @@ switch-to-activity-86397602-29c4-4c49-8f4d-1dece7eaa920=
 
 [KDE Keyboard Layout Switcher][Global Shortcuts]
 Switch keyboard layout to English (US)=
+Switch keyboard layout to German=
 Switch to Next Keyboard Layout=
 
 [StandardShortcuts]
 AboutApp=
 AboutKDE=
 Activate Next Tab=Ctrl+PgDown; Ctrl+]
-Activate Previous Tab=Ctrl+PgUp; Ctrl+[
+Activate Previous Tab=Ctrl+[; Ctrl+PgUp
 ActualSize=Ctrl+0
 AddBookmark=Ctrl+B
 Back=Alt+Left; Back
@@ -65,7 +66,7 @@ PrintPreview=
 Prior=PgUp
 Quit=Ctrl+Q
 Redo=Ctrl+Shift+Z
-Reload=Refresh; F5
+Reload=F5; Refresh
 RenameFile=F2
 Replace=Ctrl+R
 ReportBug=
@@ -76,7 +77,7 @@ Save=Ctrl+S
 SaveAs=Ctrl+Shift+S
 SaveOptions=
 SelectAll=Ctrl+A
-ShowHideHiddenFiles=Alt+.; Ctrl+H
+ShowHideHiddenFiles=Ctrl+H; Alt+.
 ShowMenubar=Ctrl+M
 ShowStatusbar=
 ShowToolbar=
@@ -101,13 +102,18 @@ Enable Touchpad=Touchpad On
 Toggle Touchpad=Touchpad Toggle
 
 [kded5][Global Shortcuts]
-Show System Activity=Ctrl+Esc
-display=Meta+P; Display
+Show System Activity=Ctrl+CapsLock
+display=Display; Meta+P
 
 [khotkeys][Global Shortcuts]
+{a6886279-dcb5-4685-a32a-269877310610}=Meta+C
+{ce68a896-be4b-4f63-a2a4-734d42e8d313}=Meta+Shift+W
 {d03619b6-9b3c-48cc-9d9c-a2aadb485550}=
 {d42a24ad-cfe1-4e94-9d1b-2a5e9f3bd7c3}=
 
+[kitty.desktop][Global Shortcuts]
+_launch=Meta+Return
+
 [kmix][Global Shortcuts]
 decrease_microphone_volume=Microphone Volume Down
 decrease_volume=Volume Down
@@ -132,9 +138,11 @@ Activate Window Demanding Attention=Meta+A
 ClearLastMouseMark=Meta+Shift+Backspace
 ClearMouseMarks=Meta+Shift+Del
 Decrease Opacity=
+Edit Tiles=Meta+T
 Expose=Ctrl+F9
 ExposeAll=Launch (C); Ctrl+F10
 ExposeClass=Ctrl+F7
+ExposeClassCurrentDesktop=
 FlipSwitchAll=
 FlipSwitchCurrent=
 Increase Opacity=
@@ -146,6 +154,7 @@ MoveZoomDown=
 MoveZoomLeft=
 MoveZoomRight=
 MoveZoomUp=
+Overview=Meta+W
 Setup Window Shortcut=
 Show Desktop=Meta+D
 ShowDesktopGrid=Meta+G
@@ -190,6 +199,10 @@ Switch to Screen 4=
 Switch to Screen 5=
 Switch to Screen 6=
 Switch to Screen 7=
+Switch to Screen Above=
+Switch to Screen Below=
+Switch to Screen to the Left=
+Switch to Screen to the Right=
 Toggle=
 Toggle Night Color=
 Toggle Window Raise/Lower=
@@ -208,7 +221,7 @@ Walk Through Windows of Current Application Alternative=
 Walk Through Windows of Current Application Alternative (Reverse)=
 Window Above Other Windows=
 Window Below Other Windows=
-Window Close=Alt+F4; Meta+Q
+Window Close=Meta+Q; Alt+F4
 Window Fullscreen=
 Window Grow Horizontal=
 Window Grow Vertical=
@@ -225,6 +238,10 @@ Window One Desktop Down=
 Window One Desktop Up=
 Window One Desktop to the Left=
 Window One Desktop to the Right=
+Window One Screen Down=
+Window One Screen Up=
+Window One Screen to the Left=
+Window One Screen to the Right=
 Window Operations Menu=Alt+F3
 Window Pack Down=
 Window Pack Left=
@@ -267,6 +284,7 @@ Window to Next Desktop=
 Window to Next Screen=Meta+Shift+Right
 Window to Previous Desktop=
 Window to Previous Screen=Meta+Shift+Left
+Window to Screen %1=
 Window to Screen 0=
 Window to Screen 1=
 Window to Screen 2=
@@ -289,6 +307,12 @@ playpausemedia=Media Play
 previousmedia=Media Previous
 stopmedia=Media Stop
 
+[org.flameshot.Flameshot.desktop][Global Shortcuts]
+Capture=
+Configure=
+Launcher=
+_launch=
+
 [org.kde.dolphin.desktop][Global Shortcuts]
 _launch=Meta+E
 
@@ -301,11 +325,11 @@ _launch=Meta+Shift+C
 [org.kde.konsole.desktop][Global Shortcuts]
 NewTab=
 NewWindow=
-_launch=Meta+Return
+_launch=Ctrl+Alt+T
 
 [org.kde.krunner.desktop][Global Shortcuts]
 RunClipboard=
-_launch=Meta+C; Alt+Space
+_launch=Alt+Space
 
 [org.kde.plasma.emojier.desktop][Global Shortcuts]
 _launch=Meta+.
@@ -344,12 +368,15 @@ activate task manager entry 8=Meta+8
 activate task manager entry 9=Meta+9
 activate widget 109=
 activate widget 118=
-activate widget 150=Alt+F1
+activate widget 150=
+activate widget 194=
+activate widget 212=Alt+F1
 activate widget 3=
 activate widget 47=
 activate widget 74=
 clear-history=
 clipboard_action=
+cycle-panels=Meta+Alt+P
 cycleNextAction=
 cyclePrevAction=
 edit_clipboard=
diff --git a/nvim/init.vim b/nvim/init.vim
index 5f6a6fa..cddc0aa 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -2,29 +2,21 @@ set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath = &runtimepath
 source ~/.vimrc
 
-source ~/.config/nvim/nvim-tree.vim
-
-lua <<EOF
-require'nvim-tree'.setup {
+lua << EOF
+require('nvim-tree').setup({
   disable_netrw       = true,
   hijack_netrw        = true,
-  open_on_setup       = false,
-  ignore_ft_on_setup  = {},
-  auto_close          = false,
-  open_on_tab         = false,
+  open_on_tab         = true,
   hijack_cursor       = false,
   update_cwd          = false,
-  update_to_buf_dir   = {
-    enable = true,
-    auto_open = true,
-  },
+  respect_buf_cwd     = true,
   diagnostics = {
     enable = false,
     icons = {
       hint = "",
       info = "",
       warning = "",
-      error = "",
+      error = ""
     }
   },
   update_focused_file = {
@@ -43,18 +35,12 @@ require'nvim-tree'.setup {
   git = {
     enable = true,
     ignore = true,
-    timeout = 500,
+    timeout = 500
   },
   view = {
     width = 30,
-    height = 30,
     hide_root_folder = false,
     side = 'left',
-    auto_resize = false,
-    mappings = {
-      custom_only = false,
-      list = {}
-    },
     number = false,
     relativenumber = false,
     signcolumn = "yes"
@@ -62,24 +48,88 @@ require'nvim-tree'.setup {
   trash = {
     cmd = "trash",
     require_confirm = true
+  },
+  actions = {
+    open_file = {
+      quit_on_open = false,
+      resize_window = true,
+      window_picker = {
+        enable = false,
+        exclude = {
+          filetype = {
+            notify = 1,
+            packer = 1,
+            qf = 1
+          },
+          buftype = {'terminal'}
+        }
+      }
+    },
+    change_dir = {
+      global = false
+    }
+  },
+  renderer = {
+    indent_markers = {enable = true},
+    highlight_git = true,
+    highlight_opened_files = "icon",
+    root_folder_modifier = ":~",
+    add_trailing = true,
+    group_empty = true,
+    special_files = {
+      README = 1,
+      Makefile = 1
+    },
+    icons = {
+      padding = " ",
+      symlink_arrow = " >> ",
+      show = {
+        git = true,
+        folder = true,
+        file = true,
+        folder_arrow = true
+      },
+      glyphs = {
+        default = "",
+        symlink = "",
+        git = {
+          unstaged = "✗",
+          staged = "✓",
+          unmerged = "",
+          renamed = "➜",
+          untracked = "★",
+          deleted = "",
+          ignored = "◌"
+        },
+        folder = {
+          arrow_open = "",
+          arrow_closed = "",
+          default = "",
+          open = "",
+          empty = "",
+          empty_open = "",
+          symlink = "",
+          symlink_open = ""
+        }
+      }
+    }
   }
-}
-EOF
+})
 
-lua <<EOF
-require'nvim-treesitter.configs'.setup {
+require('nvim-treesitter.configs').setup({
   -- One of "all", "maintained" (parsers with maintainers), or a list of languages
-  ensure_installed = "maintained",
+  ensure_installed = "all",
   
   -- Install languages synchronously (only applied to `ensure_installed`)
   sync_install = false,
   
   -- List of parsers to ignore installing
-  ignore_install = {},
+  ignore_install = {"phpdoc"},
   
   highlight = {
     -- `false` will disable the whole extension
     enable = true,
+    disable = {},
     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
     -- Using this option may slow down your editor, and you may see some duplicate highlights.
@@ -96,5 +146,5 @@ require'nvim-treesitter.configs'.setup {
       node_decremental = "grm",
     },
   },
-}
+})
 EOF
diff --git a/nvim/nvim-tree.vim b/nvim/nvim-tree.vim
deleted file mode 100644
index c80f55b..0000000
--- a/nvim/nvim-tree.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-let g:nvim_tree_quit_on_open = 1 "0 by default, closes the tree when you open a file
-let g:nvim_tree_indent_markers = 1 "0 by default, this option shows indent markers when folders are open
-let g:nvim_tree_git_hl = 1 "0 by default, will enable file highlight for git attributes (can be used without the icons).
-let g:nvim_tree_highlight_opened_files = 1 "0 by default, will enable folder and file icon highlight for opened files/directories.
-let g:nvim_tree_root_folder_modifier = ':~' "This is the default. See :help filename-modifiers for more options
-let g:nvim_tree_add_trailing = 1 "0 by default, append a trailing slash to folder names
-let g:nvim_tree_group_empty = 1 " 0 by default, compact folders that only contain a single folder into one node in the file tree
-let g:nvim_tree_change_dir_global = 1 "0 by default, use :cd when changing directories.
-let g:nvim_tree_disable_window_picker = 1 "0 by default, will disable the window picker.
-let g:nvim_tree_icon_padding = ' ' "one space by default, used for rendering the space between the icon and the filename. Use with caution, it could break rendering if you set an empty string depending on your font.
-let g:nvim_tree_symlink_arrow = ' >> ' " defaults to ' ➛ '. used as a separator between symlinks' source and target.
-let g:nvim_tree_respect_buf_cwd = 1 "0 by default, will change cwd of nvim-tree to that of new buffer's when opening nvim-tree.
-let g:nvim_tree_create_in_closed_folder = 0 "1 by default, When creating files, sets the path of a file when cursor is on a closed folder to the parent folder when 0, and inside the folder when 1.
-let g:nvim_tree_refresh_wait = 500 "1000 by default, control how often the tree can be refreshed, 1000 means the tree can be refresh once per 1000ms.
-let g:nvim_tree_window_picker_exclude = {
-    \   'filetype': [
-    \     'notify',
-    \     'packer',
-    \     'qf'
-    \   ],
-    \   'buftype': [
-    \     'terminal'
-    \   ]
-    \ }
-" Dictionary of buffer option names mapped to a list of option values that
-" indicates to the window picker that the buffer's window should not be
-" selectable.
-let g:nvim_tree_special_files = { 'README.md': 1, 'Makefile': 1, 'MAKEFILE': 1 } " List of filenames that gets highlighted with NvimTreeSpecialFile
-let g:nvim_tree_show_icons = {
-    \ 'git': 1,
-    \ 'folders': 1,
-    \ 'files': 1,
-    \ 'folder_arrows': 1,
-    \ }
-"If 0, do not show the icons for one of 'git' 'folder' and 'files'
-"1 by default, notice that if 'files' is 1, it will only display
-"if nvim-web-devicons is installed and on your runtimepath.
-"if folder is 1, you can also tell folder_arrows 1 to show small arrows next to the folder icons.
-"but this will not work when you set indent_markers (because of UI conflict)
-
-" default will show icon by default if no icon is provided
-" default shows no icon by default
-let g:nvim_tree_icons = {
-    \ 'default': '',
-    \ 'symlink': '',
-    \ 'git': {
-    \   'unstaged': "✗",
-    \   'staged': "✓",
-    \   'unmerged': "",
-    \   'renamed': "➜",
-    \   'untracked': "★",
-    \   'deleted': "",
-    \   'ignored': "◌"
-    \   },
-    \ 'folder': {
-    \   'arrow_open': "",
-    \   'arrow_closed': "",
-    \   'default': "",
-    \   'open': "",
-    \   'empty': "",
-    \   'empty_open': "",
-    \   'symlink': "",
-    \   'symlink_open': "",
-    \   }
-    \ }
-
diff --git a/sync.sh b/sync.sh
index ed80b51..83f9cc3 100755
--- a/sync.sh
+++ b/sync.sh
@@ -6,3 +6,4 @@ cp ~/.zshrc ./
 cp -r ~/.config/sway/ ./
 cp -r ~/.config/i3status/ ./
 cp -r ~/.config/kitty/ ./
+cp -r ~/.config/nvim/ ./