bunch of updates

.aliases

@@ -6,8 +6,9 @@ alias rs='rsync --progress -vur '
 alias up='sudo apt update && sudo apt upgrade'
 alias upnodock='sudo apt-mark hold docker-ce docker-ce-cli && sudo apt update && sudo apt upgrade && sudo apt-mark unhold docker-ce docker-ce-cli'
 
+alias o='xdg-open'
 alias cat='bat'
-alias rg='ripgrep'
+# alias rg='ripgrep'
 alias ll='ls -ahlF'
 alias la='ls -Ah'
 alias l='ls -CF'
@@ -15,7 +16,6 @@ alias feh='feh -d --scale-down'
 alias camshot='fswebcam -r 640x480 --jpeg 90 -F 3 -D 1 --no-banner'
 
 alias ta='tmux attach'
-alias u='sudo ufw status numbered'
 
 alias sk='sh ~/projects/home-infra/tools/goking.sh'
 alias wgfsu='sudo wg-quick up fschl-vpn'

.bashrc

@@ -21,7 +21,13 @@ fi
 # * ~/.path can be used to extend `$PATH`.
 # * ~/.extra can be used for other settings you don’t want to commit.
 for file in ~/.{aliases,bash_prompt,functions,path,dockerfunc,extra,exports}; do
-	[[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
+  [[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
+done
+unset file
+
+
+for file in /usr/share/fzf/{key-bindings.bash,completion.bash}; do
+    [[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
 done
 unset file
 
@@ -63,12 +69,12 @@ force_color_prompt=yes
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	    # We have color support; assume it's compliant with Ecma-48
-	    # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	    # a case would tend to support setf rather than setaf.)
-	    color_prompt=yes
+      # We have color support; assume it's compliant with Ecma-48
+      # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+      # a case would tend to support setf rather than setaf.)
+      color_prompt=yes
     else
-	    color_prompt=
+      color_prompt=
     fi
 fi
 

.i3/config

@@ -240,5 +240,5 @@ exec --no-startup-id i3-msg 'workspace $WS1; exec firefox;'
 exec --no-startup-id i3-msg 'workspace $WS2; exec emacs'
 exec --no-startup-id i3-msg 'exec thunderbird'
 exec --no-startup-id i3-msg 'exec keepassxc'
-exec --no-startup-id i3-msg 'workspace $WS3; exec kitty;'
+exec --no-startup-id i3-msg 'workspace $WS5; exec kitty;'
 

.spacemacs

@@ -63,6 +63,11 @@ This function should only modify configuration layer settings."
      ;; shell-scripts
      ;; spell-checking
      syntax-checking
+     (tree-sitter :variables
+                  spacemacs-tree-sitter-hl-black-list '(js-mode js2-mode)
+                  tree-sitter-syntax-highlight-enable t
+                  tree-sitter-fold-enable t
+                  tree-sitter-fold-indicators-enable t)
      version-control
      yaml
      ;; (shell :variables
@@ -497,7 +502,7 @@ It should only modify the values of Spacemacs settings."
    ;; `trailing' to delete only the whitespace at end of lines, `changed' to
    ;; delete only whitespace for changed lines or `nil' to disable cleanup.
    ;; (default nil)
-   dotspacemacs-whitespace-cleanup nil
+   dotspacemacs-whitespace-cleanup changed
 
    ;; If non-nil activate `clean-aindent-mode' which tries to correct
    ;; virtual indentation of simple modes. This can interfere with mode specific
@@ -571,7 +576,22 @@ you should place your code here."
                    rust
                    rustauto-completion :variables
                                    auto-completion-enable-snippets-in-popup t
-                                   auto-completion-enable-help-tooltip t)))
+                                   auto-completion-enable-help-tooltip t))
+
+                )
+  (setq calendar-week-start-day 1)
+
+  (setq calendar-intermonth-text
+        '(propertize
+          (format "%2d"
+                  (car
+                   (calendar-iso-from-absolute
+                    (calendar-absolute-from-gregorian (list month day year)))))
+          'font-lock-face 'font-lock-warning-face))
+
+  (setq calendar-intermonth-header
+        (propertize "KW"                  ; or e.g. "Wk"
+                    'font-lock-face 'font-lock-keyword-face))
   (with-eval-after-load 'org
     (when (file-exists-p "~/dotfiles/spacemacs-custom.el")
       (load-file "~/dotfiles/spacemacs-custom.el")
@@ -607,11 +627,12 @@ This function is called at the very end of Spacemacs initialization."
  ;; If there is more than one, they won't work right.
  '(evil-want-Y-yank-to-eol nil)
  '(package-selected-packages
-   '(helm-rg systemd journalctl-mode company-auctex auctex flycheck-pos-tip pos-tip flycheck docker json-mode tablist docker-tramp json-snatcher json-reformat unfill mwim web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode company-web web-completion-data go-guru go-eldoc company-go go-mode yaml-mode smeargle orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy evil-magit magit magit-popup git-commit ghub treepy let-alist graphql with-editor diff-hl company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete dockerfile-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async)))
+   '(all-the-icons-gnus all-the-icons-completion all-the-icons-dired dap-mode lsp-docker bui company-auctex auctex flycheck-pos-tip pos-tip flycheck docker json-mode tablist docker-tramp json-snatcher json-reformat unfill mwim web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode company-web web-completion-data go-guru go-eldoc company-go go-mode yaml-mode smeargle orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy evil-magit magit magit-popup git-commit ghub treepy let-alist graphql with-editor diff-hl company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete dockerfile-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))
+ '(warning-suppress-types '((use-package) ((evil-collection)))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(highlight-parentheses-highlight ((nil (:weight ultra-bold))) t))
 )

scripts/install.sh

@@ -33,16 +33,11 @@ apt_sources() {
     echo "writing /etc/apt/sources.list..."
     echo "using ${DIST}"
     cat <<-EOF > /etc/apt/sources.list
-deb http://deb.debian.org/debian ${DIST} main
-deb-src http://deb.debian.org/debian ${DIST} main
+deb http://deb.debian.org/debian/ ${DIST} main
+deb-src http://deb.debian.org/debian/ ${DIST} main
 
-deb http://deb.debian.org/debian-security/ ${DIST}/updates main
-deb-src http://deb.debian.org/debian-security/ ${DIST}/updates main
-
-# backports for wireguard
-# https://www.wireguard.com/install/
-# https://backports.debian.org/Instructions/
-deb http://deb.debian.org/debian buster-backports main
+deb http://deb.debian.org/debian-security/ ${DIST}-security main
+deb-src http://deb.debian.org/debian-security/ ${DIST}-security main
 
 deb http://deb.debian.org/debian ${DIST}-updates main
 deb-src http://deb.debian.org/debian ${DIST}-updates main
@@ -634,6 +629,9 @@ main() {
         rust)
             install_rust
             ;;
+        syncthing)
+            install_syncthing
+            ;;
         wine)
             install_wine
             ;;

scripts/install_arch.sh

@@ -124,6 +124,7 @@ install_i3() {
            emacs \
            feh \
            firefox \
+           fzf \
            gimp \
            i3 \
            i3lock \
@@ -227,6 +228,7 @@ install_wine() {
     # if using NVidia gpu
     $SUDO pacman -Syu \
           lib32-alsa-plugins \
+          lib32-gnutls \
           lib32-libpulse \
           lib32-nvidia-utils \
           lib32-openal \
@@ -250,7 +252,7 @@ install_docker() {
 
     pacman -Syu \
         docker \
-        docker-compose 
+        docker-compose
 
     $SUDO usermod -aG docker $USERNAME
 

spacemacs-custom.el

@@ -66,7 +66,6 @@
               "~/Documents/Org/journal.org"
               "~/Documents/Org/private.org"
               "~/Documents/Org/projects.org"
-              "~/Documents/Org/watchlist.org"
               "~/Documents/Org/birthdays.org")))
 
 (defun fschl/create-org-letter ()