.aliases

@@ -6,9 +6,8 @@ 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'
@@ -16,6 +15,7 @@ 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,13 +21,7 @@ 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"
-done
-unset file
-
-
-for file in /usr/share/fzf/{key-bindings.bash,completion.bash}; do
-    [[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
+	[[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
 done
 unset file
 
@@ -69,12 +63,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 $WS5; exec kitty;'
+exec --no-startup-id i3-msg 'workspace $WS3; exec kitty;'
 

.spacemacs

@@ -63,11 +63,6 @@ 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
@@ -502,7 +497,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 changed
+   dotspacemacs-whitespace-cleanup nil
 
    ;; If non-nil activate `clean-aindent-mode' which tries to correct
    ;; virtual indentation of simple modes. This can interfere with mode specific
@@ -576,27 +571,131 @@ you should place your code here."
                    rust
                    rustauto-completion :variables
                                    auto-completion-enable-snippets-in-popup 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))
+                                   auto-completion-enable-help-tooltip t)))
   (with-eval-after-load 'org
-    (when (file-exists-p "~/dotfiles/spacemacs-custom.el")
-      (load-file "~/dotfiles/spacemacs-custom.el")
-      )
-  )
+    (setq org-roam-directory (file-truename "~/org-roam"))
+    (org-roam-db-autosync-mode)
+    (require 'ox-publish)
+    (require 'ox-rss)
+    (setq org-export-html-coding-system 'utf-8-unix)
+    (setq org-html-doctype "html5")
+    (defvar fschlde-html-head "<link type='text/css' rel='stylesheet' href='../css/plain.css'>")
+    (setq fschlde-html-footer " <footer>\nfschl.de 2018-2022\n</footer>")
+    (setq org-publish-project-alist
+          '(("website"
+             :components ("org-journal", "project-notes", "org-sites", "blog-rss",  "blog-images"))
+            ("org-journal"
+            :base-directory "~/Documents/Org/"
+            :base-extension "org"
+            :publishing-directory "~/projects/blog-fschlde/reads/"
+            :recursive nil
+            :publishing-function org-html-publish-to-html
+
+            :headline-levels 4
+            :with-author t
+            :with-creator nil
+            :with-date t
+
+            :with-toc t
+            :with-drawers nil
+
+            :html-link-home "/"
+            :html-head nil ;; cleans up anything that would have been in there.
+            ;; :html-head-extra ,my-blog-extra-head
+            :html-head-include-default-style nil
+            :html-head-include-scripts nil
+
+            ;; :html-preamble my-blog-header
+            ;; :html-postamble ,my-blog-footer
+            )
+            ("project-notes"
+             :base-directory "~/projects/"
+             :base-extension "org"
+             :publishing-directory "~/projects/blog-fschlde/projects/"
+             :recursive nil
+             :publishing-function org-html-publish-to-html
+             :headline-levels 4)
+            ("org-sites"
+             :base-directory "~/projects/fschlde-static/"
+             :base-extension "org"
+             :publishing-directory "~/projects/fschlde-static/"
+             :recursive t
+             :publishing-function org-html-publish-to-html
+
+             :html-link-home "/"
+             ;; :html-head ,fschlde-html-head ;; cleans up anything that would have been in there.
+             :html-head-include-default-style nil
+             :html-head-include-scripts nil
+             :with-drawers nil
+             :with-creator nil
+
+             ;; :html-head-extra fschlde-html-head
+             ;; :html-postamble fschlde-html-footer
+             :headline-levels 4)
+            )
+          )
+    (setq org-default-notes-file "~/Documents/Org/tasks.org")
+    (setq org-agenda-files
+          (quote ("~/Documents/Org/tasks.org"
+                  "~/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 ()
+      "Create a new letter in ~/Documents/letters/ with filename and date"
+      (interactive)
+      (let ((name (read-string "Filename: ")))
+        (expand-file-name (format "%s.org" name) "~/Documents/letters/") ))
+
+    ;; https://orgmode.org/manual/Template-elements.html
+    ;; https://orgmode.org/manual/Template-expansion.html
+    (setq org-capture-templates
+          '(("t" "todo list item" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n SCHEDULED: %^T"
+             :tree-type month
+             )
+            ("T" "todo list item with source" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n %a \n SCHEDULED: %^T \n %^G \n"
+             :tree-type month
+             )
+
+            ("r" "Todo research some website/software" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n  SCHEDULED: %^T \n %^L \n"
+             :tree-type month
+             )
+            ("l" "letter to Documents/letters/<datetime.org>"
+             entry (file fschl/create-org-letter)
+             "* %? \n\n * \n\n "
+             )
+            ("m" "Schedule a meeting" entry
+             (file+headline "~/Documents/Org/tasks.org")
+             "* MEETING %?\n SCHEDULED: %^T\n %a"
+             )
+
+            ("p" "Schedule a phone call" entry
+             (file+headline "~/Documents/Org/tasks.org")
+             "* PHONE %?\n SCHEDULED: %^T\\n %a"
+             )
+
+            ("a" "Articles: keep notes of online articles"
+             entry
+             (file+datetree "~/Documents/Org/journal.org")
+             "* %? \n%x \n %u\n- $?"
+             :tree-type month
+             :kill-buffer t
+             :empty-lines-before 1)
+            )
+          )
+
+)
+  (setq org-ref-default-bibliography '("~/Documents/WHZ/MA/latex/references.bib")
+        org-ref-pdf-directory "~/Documents/WHZ/MA/references/"
+        org-ref-bibliography-notes "~/Documents/WHZ/MA/notes.org")
   )
 
 ;; Do not write anything past this comment. This is where Emacs will
@@ -627,12 +726,11 @@ 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
-   '(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)))))
+   '(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)))
 (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,11 +33,16 @@ 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}-security main
-deb-src http://deb.debian.org/debian-security/ ${DIST}-security 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 ${DIST}-updates main
 deb-src http://deb.debian.org/debian ${DIST}-updates main
@@ -629,9 +634,6 @@ main() {
         rust)
             install_rust
             ;;
-        syncthing)
-            install_syncthing
-            ;;
         wine)
             install_wine
             ;;

scripts/install_arch.sh

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

spacemacs-custom.el

@@ -1,122 +0,0 @@
-
-(setq org-roam-directory (file-truename "~/org-roam"))
-(org-roam-db-autosync-mode)
-(require 'ox-publish)
-(require 'org-projectile)
-(setq org-export-html-coding-system 'utf-8-unix)
-(setq org-html-doctype "html5")
-(defvar fschlde-html-head "<link type='text/css' rel='stylesheet' href='../css/plain.css'>")
-(setq fschlde-html-footer " <footer>\nfschl.de 2018-2022\n</footer>")
-(setq org-publish-project-alist
-      '(("website"
-         :components ("org-journal", "project-notes", "org-sites", "blog-rss",  "blog-images"))
-        ("org-journal"
-         :base-directory "~/Documents/Org/"
-         :base-extension "org"
-         :publishing-directory "~/projects/blog-fschlde/reads/"
-         :recursive nil
-         :publishing-function org-html-publish-to-html
-
-         :headline-levels 4
-         :with-author t
-         :with-creator nil
-         :with-date t
-
-         :with-toc t
-         :with-drawers nil
-
-         :html-link-home "/"
-         :html-head nil ;; cleans up anything that would have been in there.
-         ;; :html-head-extra ,my-blog-extra-head
-         :html-head-include-default-style nil
-         :html-head-include-scripts nil
-
-         ;; :html-preamble my-blog-header
-         ;; :html-postamble ,my-blog-footer
-         )
-        ("project-notes"
-         :base-directory "~/projects/"
-         :base-extension "org"
-         :publishing-directory "~/projects/blog-fschlde/projects/"
-         :recursive nil
-         :publishing-function org-html-publish-to-html
-         :headline-levels 4)
-        ("org-sites"
-         :base-directory "~/projects/fschlde-static/"
-         :base-extension "org"
-         :publishing-directory "~/projects/fschlde-static/"
-         :recursive t
-         :publishing-function org-html-publish-to-html
-
-         :html-link-home "/"
-         ;; :html-head ,fschlde-html-head ;; cleans up anything that would have been in there.
-         :html-head-include-default-style nil
-         :html-head-include-scripts nil
-         :with-drawers nil
-         :with-creator nil
-
-         ;; :html-head-extra fschlde-html-head
-         ;; :html-postamble fschlde-html-footer
-         :headline-levels 4)
-        )
-      )
-(setq org-default-notes-file "~/Documents/Org/tasks.org")
-(setq org-agenda-files
-      (quote ("~/Documents/Org/tasks.org"
-              "~/Documents/Org/journal.org"
-              "~/Documents/Org/private.org"
-              "~/Documents/Org/projects.org"
-              "~/Documents/Org/birthdays.org")))
-
-(defun fschl/create-org-letter ()
-  "Create a new letter in ~/Documents/letters/ with filename and date"
-  (interactive)
-  (let ((name (read-string "Filename: ")))
-    (expand-file-name (format "%s.org" name) "~/Documents/letters/") ))
-
-;; https://orgmode.org/manual/Template-elements.html
-;; https://orgmode.org/manual/Template-expansion.html
-(setq org-capture-templates
-      '(("t" "todo list item" entry
-         (file+olp+datetree "~/Documents/Org/tasks.org")
-         "* TODO %?\n SCHEDULED: %^T"
-         :tree-type month
-         )
-        ("T" "todo list item with source" entry
-         (file+olp+datetree "~/Documents/Org/tasks.org")
-         "* TODO %?\n %a \n SCHEDULED: %^T \n %^G \n"
-         :tree-type month
-         )
-
-        ("r" "Todo research some website/software" entry
-         (file+olp+datetree "~/Documents/Org/tasks.org")
-         "* TODO %?\n  SCHEDULED: %^T \n %^L \n"
-         :tree-type month
-         )
-        ("l" "letter to Documents/letters/<datetime.org>"
-         entry (file fschl/create-org-letter)
-         "* %? \n\n * \n\n "
-         )
-        ("m" "Schedule a meeting" entry
-         (file+headline "~/Documents/Org/tasks.org")
-         "* MEETING %?\n SCHEDULED: %^T\n %a"
-         )
-
-        ("p" "Schedule a phone call" entry
-         (file+headline "~/Documents/Org/tasks.org")
-         "* PHONE %?\n SCHEDULED: %^T\\n %a"
-         )
-
-        ("a" "Articles: keep notes of online articles"
-         entry
-         (file+datetree "~/Documents/Org/journal.org")
-         "* %? \n%x \n %u\n- $?"
-         :tree-type month
-         :kill-buffer t
-         :empty-lines-before 1)
-        )
-      )
-
-(setq org-ref-default-bibliography '("~/Documents/WHZ/MA/latex/references.bib")
-      org-ref-pdf-directory "~/Documents/WHZ/MA/references/"
-      org-ref-bibliography-notes "~/Documents/WHZ/MA/notes.org")