Merge branch 'master' into laptop

2021-07-09 12:20:25 +02:00
parent d1a8a9ba91 fb21733874
commit 6816ebc07f
25 changed files with 0 additions and 0 deletions
--- a/emacs/.config/doom/config.el
+++ b/emacs/.config/doom/config.el
--- a/emacs/.config/doom/custom.el
+++ b/emacs/.config/doom/custom.el
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
--- a/emacs/.config/doom/org-agenda-files
+++ b/emacs/.config/doom/org-agenda-files
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
--- a/all/.config/dunst/dunstrc
+++ b/all/.config/dunst/dunstrc
--- a/all/.config/i3-scrot.conf
+++ b/all/.config/i3-scrot.conf
--- a/all/.config/i3/config
+++ b/all/.config/i3/config
--- a/all/.config/i3/manjaro-default-config
+++ b/all/.config/i3/manjaro-default-config
--- a/all/.config/i3/scripts/jupyter-calculator
+++ b/all/.config/i3/scripts/jupyter-calculator
--- a/all/.config/i3/scripts/rofi_calc
+++ b/all/.config/i3/scripts/rofi_calc
--- a/all/.config/i3/scripts/setupZoom
+++ b/all/.config/i3/scripts/setupZoom
--- a/all/.config/i3/workspace-chat.json
+++ b/all/.config/i3/workspace-chat.json
--- a/all/.config/i3/workspace-zoom.json
+++ b/all/.config/i3/workspace-zoom.json
--- a/all/.config/i3blocks/activity
+++ b/all/.config/i3blocks/activity
--- a/all/.config/i3blocks/battery-plus
+++ b/all/.config/i3blocks/battery-plus
--- a/all/.config/i3blocks/calendar
+++ b/all/.config/i3blocks/calendar
--- a/all/.config/i3blocks/calendar.test
+++ b/all/.config/i3blocks/calendar.test
--- a/all/.config/i3blocks/config
+++ b/all/.config/i3blocks/config
--- a/all/.config/i3blocks/i3b-gate
+++ b/all/.config/i3blocks/i3b-gate
--- a/all/.config/i3blocks/keyboard
+++ b/all/.config/i3blocks/keyboard
--- a/all/.config/i3blocks/volume
+++ b/all/.config/i3blocks/volume
--- a/all/.config/rofi/config.rasi
+++ b/all/.config/rofi/config.rasi
--- a/all/.config/mc/mc.keymap
+++ b/all/.config/mc/mc.keymap
--- a/vim/.config/nvim/init.vim
+++ b/vim/.config/nvim/init.vim