fix[client,work]: fix yubikey scdaemon/pcscd issue

files/emacs/early-init.el

@@ -2,22 +2,22 @@
   (defvar swarsel-file-name-handler-alist file-name-handler-alist)
   (defvar swarsel-vc-handled-backends vc-handled-backends)
 
+  (defun swarsel/restore-startup-settings ()
+    "Restore startup-tuned variables to their regular runtime values."
+    (setq gc-cons-threshold (* 32 1024 1024)
+          gc-cons-percentage 0.1
+          jit-lock-defer-time 0.05
+          read-process-output-max (* 1024 1024)
+          file-name-handler-alist swarsel-file-name-handler-alist
+          vc-handled-backends swarsel-vc-handled-backends)
+    (fset 'epg-wait-for-status #'ignore))
+
   (setq gc-cons-threshold most-positive-fixnum
         gc-cons-percentage 0.6
         file-name-handler-alist nil
         vc-handled-backends nil)
 
-  (add-hook 'emacs-startup-hook
+  (add-hook 'emacs-startup-hook #'swarsel/restore-startup-settings)
-            (lambda ()
-              (progn
-                (setq gc-cons-threshold (* 32 1024 1024)
-                      gc-cons-percentage 0.1
-                      jit-lock-defer-time 0.05
-                      read-process-output-max (* 1024 1024)
-                      file-name-handler-alist swarsel-file-name-handler-alist
-                      vc-handled-backends swarsel-vc-handled-backends)
-                (fset 'epg-wait-for-status 'ignore)
-                )))
 
 (tool-bar-mode 0)
 (menu-bar-mode 0)
@@ -46,6 +46,7 @@
                 '(undecorated . t) ; no title bar, borders etc.
                 '(background-color . "#1D252C") ; load doom-citylight colors to avoid white flash
                 '(foreground-color . "#A0B3C5") ; load doom-citylight colors to avoid white flash
+                '(font . "FiraCode Nerd Font")
                 '(vertical-scroll-bars . nil)
                 '(horizontal-scroll-bars . nil)
                 '(internal-border-width . 5)

files/emacs/init.el

@@ -213,7 +213,27 @@ create a new one."
       (swarsel/run-formatting)
       )))
 
-(setq org-html-htmlize-output-type nil)
+(defun swarsel/org-babel-tangle-single-block-advice (orig-fun &rest args)
+  "Run ORIG-FUN with redisplay and messages temporarily inhibited."
+  (let ((inhibit-redisplay t)
+        (inhibit-message t))
+    (apply orig-fun args)))
+
+(defun swarsel/org-babel-tangle-timing-advice (orig-fun &rest args)
+  "Run ORIG-FUN and report elapsed tangle time."
+  (let ((tim (current-time)))
+    (prog1 (apply orig-fun args)
+      (message "org-tangle took %f sec" (float-time (time-subtract (current-time) tim))))))
+
+(defun swarsel/markdown-mode-keys ()
+  "Local markdown key customizations."
+  (local-set-key (kbd "C-c C-x C-l") #'org-latex-preview)
+  (local-set-key (kbd "C-c C-x C-u") #'markdown-toggle-url-hiding))
+
+(defun swarsel/eglot-ensure-and-format ()
+  "Ensure eglot is running and enable format-on-save for current buffer."
+  (eglot-ensure)
+  (add-hook 'before-save-hook #'eglot-format nil 'local))
 
 ;; (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'swarsel/org-babel-tangle-config)))
 
@@ -380,27 +400,27 @@ create a new one."
     "wm"  '(delete-other-windows :wk "maximize")
     "<right>" 'up-list
     "<left>" 'down-list
-    ))
+    )
 
-;; General often used hotkeys
+  ;; General often used hotkeys
-(general-define-key
+  (general-define-key
- "C-M-a" (lambda () (interactive) (org-capture nil "a")) ; make new anki card
+   "C-M-a" (lambda () (interactive) (org-capture nil "a")) ; make new anki card
- "C-c d" 'crux-duplicate-current-line-or-region
+   "C-c d" 'crux-duplicate-current-line-or-region
- "C-c D" 'crux-duplicate-and-comment-current-line-or-region
+   "C-c D" 'crux-duplicate-and-comment-current-line-or-region
- "<DUMMY-m>" 'swarsel/last-buffer
+   "<DUMMY-m>" 'swarsel/last-buffer
- "M-\\" 'indent-region
+   "M-\\" 'indent-region
- "M-r" 'swarsel/consult-magit-repos
+   "M-r" 'swarsel/consult-magit-repos
- "M-i" 'swarsel/org-insert-link-to-heading
+   "M-i" 'swarsel/org-insert-link-to-heading
- "<Paste>" 'yank
+   "<Paste>" 'yank
- "<Cut>" 'kill-region
+   "<Cut>" 'kill-region
- "<Copy>" 'kill-ring-save
+   "<Copy>" 'kill-ring-save
- "<undo>" 'evil-undo
+   "<undo>" 'evil-undo
- "<redo>" 'evil-redo
+   "<redo>" 'evil-redo
- "C-S-c C-S-c" 'mc/edit-lines
+   "C-S-c C-S-c" 'mc/edit-lines
- "C->" 'mc/mark-next-like-this
+   "C->" 'mc/mark-next-like-this
- "C-<" 'mc/mark-previous-like-this
+   "C-<" 'mc/mark-previous-like-this
- "C-c C-<" 'mc/mark-all-like-this
+   "C-c C-<" 'mc/mark-all-like-this
- )
+   ))
 
 ;; set Nextcloud directory for journals etc.
 (setq
@@ -418,9 +438,10 @@ create a new one."
       url-history-file (expand-file-name "url/history" user-emacs-directory))
 
 ;; Use no-littering to automatically set common paths to the new user-emacs-directory
-(use-package no-littering)
+(use-package no-littering
-(setq custom-file (make-temp-file "emacs-custom-"))
+  :config
-(load custom-file t)
+  (setq custom-file (make-temp-file "emacs-custom-"))
+  (load custom-file t))
 
 (let ((backup-dir "~/tmp/emacs/backups")
       (auto-saves-dir "~/tmp/emacs/auto-saves/"))
@@ -437,22 +458,20 @@ create a new one."
       delete-old-versions t  ; Clean up the backups
       version-control t      ; Use version numbers on backups,
       kept-new-versions 5    ; keep some new versions
-      kept-old-versions 2)   ; and some old ones, too
+      kept-old-versions 2    ; and some old ones, too
+      backup-by-copying-when-linked t)
 
 ;; use UTF-8 everywhere
 (set-language-environment "UTF-8")
 ;; (profiler-start 'cpu)
 ;; set default font size
-(defvar swarsel/default-font-size 130)
-(setq swarsel-standard-font "FiraCode Nerd Font Mono"
-      swarsel-alt-font "FiraCode Nerd Font Mono")
 
 ;; (defalias 'yes-or-no-p 'y-or-n-p)
 ;;(setq-default show-trailing-whitespace t)
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 (global-hl-line-mode 1)
 ;; (setq redisplay-dont-pause t) ;; obsolete
-(setq blink-cursor-mode nil) ;; blink-cursor is an unexpected source of slowdown
+(blink-cursor-mode -1) ;; blink-cursor is an unexpected source of slowdown
 (global-subword-mode 1) ; Iterate through CamelCase words
 (setq blink-matching-paren nil) ;; this makes the cursor jump around annoyingly
 (delete-selection-mode 1)
@@ -464,7 +483,6 @@ create a new one."
               bidi-display-reordering 'left-to-right
               bidi-inhibit-bpa t)
 (global-so-long-mode)
-(setq process-adaptive-read-buffering nil) ;; not sure if this is a good idea
 (setq fast-but-imprecise-scrolling t
       redisplay-skip-fontification-on-input t
       inhibit-compacting-font-caches t)
@@ -472,9 +490,7 @@ create a new one."
       which-func-update-delay 1.0)
 (setq undo-limit 80000000
       evil-want-fine-undo t
-      auto-save-default t
+      auto-save-default t)
-      password-cache-expiry nil
-      )
 (setq browse-url-browser-function 'browse-url-firefox)
 ;; (setenv "DISPLAY" ":0") ;; needed for firefox
 ;; disable a keybind that does more harm than good
@@ -519,16 +535,18 @@ create a new one."
               tab-width 2)
 
 (setq tab-always-indent 'complete)
-(setq python-indent-guess-indent-offset-verbose nil)
+
+(use-package python
+  :ensure nil
+  :custom
+  (python-indent-guess-indent-offset-verbose nil))
 
 (use-package highlight-indent-guides
   :hook (prog-mode . highlight-indent-guides-mode)
-  :init
+  :custom
-  (setq highlight-indent-guides-method 'column)
+  (highlight-indent-guides-method 'column)
-  (setq highlight-indent-guides-responsive 'top)
+  (highlight-indent-guides-responsive nil)
-  )
+  :config
-
-(with-eval-after-load 'highlight-indent-guides
   (set-face-attribute 'highlight-indent-guides-even-face nil :background "gray10")
   (set-face-attribute 'highlight-indent-guides-odd-face nil :background "gray20")
   (set-face-attribute 'highlight-indent-guides-stack-even-face nil :background "gray40")
@@ -598,8 +616,7 @@ create a new one."
 (use-package evil-collection
   :after evil
   :config
-  (evil-collection-init)
+  (evil-collection-init))
-  (setq forge-add-default-bindings nil))
 
 ;; enables 2-char inline search
 (use-package evil-snipe
@@ -619,34 +636,28 @@ create a new one."
   (global-evil-surround-mode 1))
 
 (use-package evil-visual-mark-mode
-  :config (evil-visual-mark-mode))
+  :commands evil-visual-mark-mode)
 
-(use-package evil-textobj-tree-sitter)
+(use-package evil-textobj-tree-sitter
-;; bind `function.outer`(entire function block) to `f` for use in things like `vaf`, `yaf`
+  :config
-(define-key evil-outer-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.outer"))
+  ;; bind `function.outer`(entire function block) to `f` for use in things like `vaf`, `yaf`
-;; bind `function.inner`(function block without name and args) to `f` for use in things like `vif`, `yif`
+  (define-key evil-outer-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.outer"))
-(define-key evil-inner-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.inner"))
+  ;; bind `function.inner`(function block without name and args) to `f` for use in things like `vif`, `yif`
-
+  (define-key evil-inner-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.inner"))
-;; You can also bind multiple items and we will match the first one we can find
+  ;; You can also bind multiple items and we will match the first one we can find
-(define-key evil-outer-text-objects-map "a" (evil-textobj-tree-sitter-get-textobj ("if_statement.outer" "conditional.outer" "loop.outer") '((python-mode . ((if_statement.outer) @if_statement.outer)) (python-ts-mode . ((if_statement.outer) @if_statement.outer)))))
+  (define-key evil-outer-text-objects-map "a" (evil-textobj-tree-sitter-get-textobj ("if_statement.outer" "conditional.outer" "loop.outer") '((python-mode . ((if_statement.outer) @if_statement.outer)) (python-ts-mode . ((if_statement.outer) @if_statement.outer))))))
 
 (use-package evil-numbers)
 
 ;; set the NixOS wordlist by hand
 (setq ispell-alternate-dictionary (getenv "WORDLIST"))
 
-(dolist (face '(default fixed-pitch))
+(setq swarsel/fixed-font "FiraCode Nerd Font"
-  (set-face-attribute face nil
+      swarsel/variable-font "Iosevka Aile")
-                      :font "FiraCode Nerd Font Mono"))
-(add-to-list 'default-frame-alist '(font . "FiraCode Nerd Font Mono"))
 
-(set-face-attribute 'default nil :height 100)
+(set-face-attribute 'default nil :font swarsel/fixed-font :height 100)
-(set-face-attribute 'fixed-pitch nil :height 1.0)
+(set-face-attribute 'fixed-pitch nil :font swarsel/fixed-font :height 130)
-
+(set-face-attribute 'variable-pitch nil :font swarsel/variable-font :weight 'light :height 130)
-(set-face-attribute 'variable-pitch nil
-                    :family "IBM Plex Sans"
-                    :weight 'regular
-                    :height 1.06)
 
 (use-package solaire-mode
   :custom
@@ -681,21 +692,21 @@ create a new one."
 
 (use-package mini-modeline
   :after smart-mode-line
+  :custom
+  (mini-modeline-display-gui-line nil)
+  (mini-modeline-enhance-visual nil)
+  (mini-modeline-truncate-p nil)
+  (mini-modeline-l-format nil)
+  (mini-modeline-right-padding 5)
+  (mini-modeline-r-format '("%e" mode-line-front-space mode-line-mule-info mode-line-client
+                             mode-line-modified mode-line-remote mode-line-frame-identification
+                             mode-line-buffer-identification " " mode-line-position " " mode-name evil-mode-line-tag))
   :config
   (mini-modeline-mode t)
-  (setq mini-modeline-display-gui-line nil)
+  (setq window-divider-default-places t
-  (setq mini-modeline-enhance-visual nil)
+        window-divider-default-bottom-width 1
-  (setq mini-modeline-truncate-p nil)
+        window-divider-default-right-width 1)
-  (setq mini-modeline-l-format nil)
+  (window-divider-mode 1))
-  (setq mini-modeline-right-padding 5)
-  (setq window-divider-mode t)
-  (setq window-divider-default-places t)
-  (setq window-divider-default-bottom-width 1)
-  (setq window-divider-default-right-width 1)
-  (setq mini-modeline-r-format '("%e" mode-line-front-space mode-line-mule-info mode-line-client
-                                 mode-line-modified mode-line-remote mode-line-frame-identification
-                                 mode-line-buffer-identification " " mode-line-position " " mode-name evil-mode-line-tag ))
-  )
 
 (use-package smart-mode-line
   :config
@@ -746,8 +757,8 @@ create a new one."
         orderless-matching-styles '(orderless-literal orderless-regexp)))
 
 (use-package consult
-  :config
+  :custom
-  (setq consult-fontify-max-size 1024)
+  (consult-fontify-max-size 1024)
   :bind
   (("C-x b" . consult-buffer)
    ("C-c <C-m>" . consult-global-mark)
@@ -803,8 +814,8 @@ create a new one."
 (use-package which-key
   :init (which-key-mode)
   :diminish which-key-mode
-  :config
+  :custom
-  (setq which-key-idle-delay 0.3))
+  (which-key-idle-delay 0.3))
 
 (use-package helpful
   :bind
@@ -812,8 +823,8 @@ create a new one."
    ("C-h v" . helpful-variable)
    ("C-h k" . helpful-key)
    ("C-h C-." . helpful-at-point))
-  :config
+  :custom
-  (setq help-window-select nil))
+  (help-window-select nil))
 
 (use-package ligature
   :init
@@ -901,6 +912,13 @@ create a new one."
   :bind
   (("C-<tab>" . org-fold-outer)
    ("C-c s" . org-store-link))
+  :custom
+  (org-html-htmlize-output-type nil)
+  (org-fold-core-style 'overlays)
+  (org-src-preserve-indentation nil)
+  (org-src-fontify-natively t)
+  (org-export-with-broken-links 'mark)
+  (org-confirm-babel-evaluate nil)
   :config
   (setq org-ellipsis " ⤵"
         org-link-descriptive t
@@ -909,6 +927,7 @@ create a new one."
   (setq org-support-shift-select t)
 
   (setq org-agenda-start-with-log-mode t)
+  (setq org-fontify-quote-and-verse-blocks t)
   (setq org-log-done 'time)
   (setq org-log-into-drawer t)
   (setq org-startup-with-inline-images t)
@@ -923,13 +942,54 @@ create a new one."
   (setq org-capture-templates
         '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox")
            "* TODO %?\n  %i\n  %a")
-          ("j" "Journal" entry (file+datetree "~/Org/Journal.org")
+          ("j" "Journal" entry (file+olp+datetree "~/Org/Journal.org")
            "* %?\nEntered on %U\n  %i\n  %a")))
 
   (setq org-refile-targets
         '((swarsel-archive-org-file :maxlevel . 1)
           (swarsel-tasks-org-file :maxlevel . 1)))
 
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   '((emacs-lisp . t)
+     (python . t)
+     (js . t)
+     (shell . t)))
+
+  (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch)
+  (set-face-attribute 'org-table nil :inherit 'fixed-pitch)
+  (set-face-attribute 'org-formula nil :inherit 'fixed-pitch)
+  (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch))
+  (set-face-attribute 'org-quote nil :inherit '(shadow fixed-pitch))
+  (set-face-attribute 'org-verse nil :inherit '(shadow fixed-pitch))
+  (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch))
+  (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
+  (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
+  (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch)
+
+
+  (dolist (face '((org-level-1 . 1.2)
+                  (org-level-2 . 1.1)
+                  (org-level-3 . 1.0)
+                  (org-level-4 . 1.0)
+                  (org-level-5 . 1.0)
+                  (org-level-6 . 1.0)
+                  (org-level-7 . 1.0)
+                  (org-level-8 . 1.0)))
+    (set-face-attribute (car face) nil :font swarsel/variable-font :weight 'medium :height (cdr face)))
+
+  (add-to-list 'org-src-lang-modes '("conf-unix" . conf-unix))
+
+  (advice-add 'org-babel-tangle-single-block :around #'swarsel/org-babel-tangle-single-block-advice)
+  (advice-add 'org-babel-tangle :around #'swarsel/org-babel-tangle-timing-advice)
+
+  (require 'org-tempo)
+  (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
+  (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
+  (add-to-list 'org-structure-template-alist '("py" . "src python :results output"))
+  (add-to-list 'org-structure-template-alist '("nix" . "src nix-ts :tangle"))
+  (add-to-list 'org-structure-template-alist '("ne" . "bash :exports both"))
+
   )
 
 (use-package org-appear
@@ -943,64 +1003,24 @@ create a new one."
 (use-package visual-fill-column
   :hook (org-mode . swarsel/org-mode-visual-fill))
 
-(setq org-fold-core-style 'overlays)
+(use-package auctex
+  :hook ((LaTeX-mode . visual-line-mode)
+         (LaTeX-mode . flyspell-mode)
+         (LaTeX-mode . LaTeX-math-mode)
+         (LaTeX-mode . reftex-mode))
+  :custom
+  (TeX-auto-save t)
+  (TeX-save-query nil)
+  (TeX-parse-self t)
+  (TeX-engine 'luatex)
+  (TeX-master nil)
+  (LaTeX-electric-left-right-brace t)
+  (font-latex-fontify-script nil)
+  (TeX-electric-sub-and-superscript t))
 
-(setq org-src-preserve-indentation nil)
+(use-package org-fragtog
-
+  :hook ((org-mode . org-fragtog-mode)
-(org-babel-do-load-languages
+         (markdown-mode . org-fragtog-mode)))
- 'org-babel-load-languages
- '((emacs-lisp . t)
-   (python . t)
-   (js . t)
-   (shell . t)
-   ))
-
-(push '("conf-unix" . conf-unix) org-src-lang-modes)
-
-(setq org-export-with-broken-links 'mark)
-(setq org-confirm-babel-evaluate nil)
-
-;; tangle is too slow, try to speed it up
-(defadvice org-babel-tangle-single-block (around inhibit-redisplay activate protect compile)
-  "inhibit-redisplay and inhibit-message to avoid flicker."
-  (let ((inhibit-redisplay t)
-        (inhibit-message t))
-    ad-do-it))
-
-(defadvice org-babel-tangle (around time-it activate compile)
-  "Display the execution time"
-  (let ((tim (current-time)))
-    ad-do-it
-    (message "org-tangle took %f sec" (float-time (time-subtract (current-time) tim)))))
-
-(require 'org-tempo)
-(add-to-list 'org-structure-template-alist '("sh" . "src shell"))
-(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
-(add-to-list 'org-structure-template-alist '("py" . "src python :results output"))
-(add-to-list 'org-structure-template-alist '("nix" . "src nix-ts :tangle"))
-(add-to-list 'org-structure-template-alist '("ne" . "bash :exports both"))
-
-(use-package auctex)
-(setq TeX-auto-save t)
-(setq TeX-save-query nil)
-(setq TeX-parse-self t)
-(setq-default TeX-engine 'luatex)
-(setq-default TeX-master nil)
-
-(add-hook 'LaTeX-mode-hook 'visual-line-mode)
-(add-hook 'LaTeX-mode-hook 'flyspell-mode)
-(add-hook 'LaTeX-mode-hook 'LaTeX-math-mode)
-(add-hook 'LaTeX-mode-hook 'reftex-mode)
-(setq LaTeX-electric-left-right-brace t)
-(setq font-latex-fontify-script nil)
-(setq TeX-electric-sub-and-superscript t)
-;; (setq reftex-plug-into-AUCTeX t)
-
-
-
-(use-package org-fragtog)
-(add-hook 'org-mode-hook 'org-fragtog-mode)
-(add-hook 'markdown-mode-hook 'org-fragtog-mode)
 
 (use-package org-modern
   :config (setq org-modern-block-name
@@ -1017,6 +1037,8 @@ create a new one."
               ("<right>" . swarsel/org-present-next))
   :hook ((org-present-mode . swarsel/org-present-start)
          (org-present-mode-quit . swarsel/org-present-end))
+  :config
+  (add-hook 'org-present-after-navigate-functions #'swarsel/org-present-slide)
   )
 
 
@@ -1026,8 +1048,11 @@ create a new one."
   (setq-local face-remapping-alist '((default (:height 1.5) variable-pitch)
                                      (header-line (:height 4.0) variable-pitch)
                                      (org-document-title (:height 1.75) org-document-title)
-                                     (org-code (:height 1.55) org-code)
+                                     (org-code (:height 1.2) org-code)
-                                     (org-verbatim (:height 1.55) org-verbatim)
+                                     (org-verbatim (:height 1.0) org-verbatim)
+                                     (org-quote (:height 1.0) org-quote)
+                                     (org-verse (:height 1.0) org-verse)
+                                     (org-table (:height 0.8) org-table)
                                      (org-block (:height 1.25) org-block)
                                      (org-block-begin-line (:height 0.7) org-block)
                                      ))
@@ -1039,7 +1064,7 @@ create a new one."
                   (org-level-6 . 1.2)
                   (org-level-7 . 1.2)
                   (org-level-8 . 1.2)))
-    (set-face-attribute (car face) nil :font swarsel-alt-font :weight 'medium :height (cdr face)))
+    (set-face-attribute (car face) nil :font swarsel/variable-font :weight 'medium :height (cdr face)))
 
   (setq header-line-format " ")
   (setq visual-fill-column-width 90)
@@ -1067,7 +1092,7 @@ create a new one."
                   (org-level-6 . 0.9)
                   (org-level-7 . 0.9)
                   (org-level-8 . 0.9)))
-    (set-face-attribute (car face) nil :font swarsel-alt-font :weight 'medium :height (cdr face)))
+    (set-face-attribute (car face) nil :font swarsel/variable-font :weight 'medium :height (cdr face)))
   (setq header-line-format nil)
   (setq visual-fill-column-width 150)
   (setq indicate-buffer-boundaries t)
@@ -1102,14 +1127,6 @@ create a new one."
     (swarsel/org-present-slide)
     ))
 
-(defun clojure-leave-clojure-mode-function ()
-  )
-
-(add-hook 'buffer-list-update-hook #'clojure-leave-clojure-mode-function)
-(add-hook 'org-present-mode-hook 'swarsel/org-present-start)
-(add-hook 'org-present-mode-quit-hook 'swarsel/org-present-end)
-(add-hook 'org-present-after-navigate-functions 'swarsel/org-present-slide)
-
 (defun org-babel-execute:markdown (body params)
   "Just return BODY unchanged, allowing noweb expansion."
   body)
@@ -1145,21 +1162,10 @@ create a new one."
         lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options.home-manager.users.type.getSubOptions []"
         ))
 
-(add-to-list 'auto-mode-alist '("\\.nix\\.enc\\'" . nix-mode))
-(add-to-list 'auto-mode-alist '("\\.nix\\.enc\\'" . nix-ts-mode))
-
-
-(with-eval-after-load 'lsp-mode
-  (lsp-register-client
-   (make-lsp-client :new-connection (lsp-stdio-connection "nixd")
-                    :major-modes '(nix-mode nix-ts-mode)
-                    :priority 0
-                    :server-id 'nixd)))
-
 (use-package hcl-mode
   :mode "\\.hcl\\'"
-  :config
+  :custom
-  (setq hcl-indent-level 2))
+  (hcl-indent-level 2))
 
 (use-package groovy-mode)
 
@@ -1173,65 +1179,60 @@ create a new one."
 
 (use-package terraform-mode
   :mode "\\.tf\\'"
-  :config
+  :hook (terraform-mode . outline-minor-mode)
-  (setq terraform-indent-level 2)
+  :custom
-  (setq terraform-format-on-save t))
+  (terraform-indent-level 2)
-
+  (terraform-format-on-save t))
-(add-hook 'terraform-mode-hook #'outline-minor-mode)
 
 (use-package nixpkgs-fmt)
 
 (use-package shfmt
-  :config
+  :custom
-  (setq shfmt-command "shfmt")
+  (shfmt-command "shfmt")
-  (setq shfmt-arguments '("-i" "4" "-s" "-sr")))
+  (shfmt-arguments '("-i" "4" "-s" "-sr")))
-
-(setq markdown-command "pandoc")
 
 (use-package markdown-mode
   :ensure t
   :mode ("README\\.md\\'" . gfm-mode)
-  :init (setq markdown-command "multimarkdown")
+  :init
+  (setq markdown-command "multimarkdown")
+  :hook (markdown-mode . swarsel/markdown-mode-keys)
   :bind (:map markdown-mode-map
-              ("C-c C-e" . markdown-do)))
+              ("C-c C-e" . markdown-do)
+              ("C-c C-x C-l" . org-latex-preview)
+              ("C-c C-x C-u" . markdown-toggle-url-hiding)))
 
-(add-hook 'markdown-mode-hook
+(use-package elfeed
-          (lambda ()
+  :custom
-            (local-set-key (kbd "C-c C-x C-l") 'org-latex-preview)
+  (elfeed-db-directory "~/.elfeed/db/")
-            (local-set-key (kbd "C-c C-x C-u") 'markdown-toggle-url-hiding)
+  (elfeed-use-curl t)
-            ))
+  (elfeed-set-timeout 36000)
-
+  :config
-(use-package elfeed)
+  (define-key elfeed-show-mode-map (kbd ";") #'visual-fill-column-mode)
-
+  (define-key elfeed-show-mode-map (kbd "j") #'elfeed-goodies/split-show-next)
-(use-package elfeed-goodies)
+  (define-key elfeed-show-mode-map (kbd "k") #'elfeed-goodies/split-show-prev)
-(elfeed-goodies/setup)
+  (define-key elfeed-search-mode-map (kbd "j") #'next-line)
-
+  (define-key elfeed-search-mode-map (kbd "k") #'previous-line)
-(setq elfeed-db-directory "~/.elfeed/db/")
+  (define-key elfeed-show-mode-map (kbd "S-SPC") #'scroll-down-command))
 
+(use-package elfeed-goodies
+  :after elfeed
+  :config
+  (elfeed-goodies/setup))
 
 (use-package elfeed-protocol
-  :after elfeed)
+  :after elfeed
-
+  :custom
-(elfeed-protocol-enable)
+  (elfeed-protocol-enabled-protocols '(fever))
-(setq elfeed-use-curl t)
+  (elfeed-protocol-fever-update-unread-only t)
-(setq elfeed-set-timeout 36000)
+  (elfeed-protocol-fever-fetch-category-as-tag t)
-(setq elfeed-protocol-enabled-protocols '(fever))
+  :config
-(setq elfeed-protocol-fever-update-unread-only t)
+  (elfeed-protocol-enable)
-(setq elfeed-protocol-fever-fetch-category-as-tag t)
+  (let ((domain (getenv "SWARSEL_RSS_DOMAIN")))
-
+    (setq elfeed-protocol-feeds
-(let ((domain (getenv "SWARSEL_RSS_DOMAIN")))
+          `((,(concat "fever+https://Swarsel@" domain)
-  (setq elfeed-protocol-feeds
+             :api-url ,(concat "https://" domain "/api/fever.php")
-        `((,(concat "fever+https://Swarsel@" domain)
+             :password-file "~/.emacs.d/.fever")))))
-           :api-url ,(concat "https://" domain "/api/fever.php")
-           :password-file "~/.emacs.d/.fever"))))
-
-
-(define-key elfeed-show-mode-map (kbd ";") 'visual-fill-column-mode)
-(define-key elfeed-show-mode-map (kbd "j") 'elfeed-goodies/split-show-next)
-(define-key elfeed-show-mode-map (kbd "k") 'elfeed-goodies/split-show-prev)
-(define-key elfeed-search-mode-map (kbd "j") 'next-line)
-(define-key elfeed-search-mode-map (kbd "k") 'previous-line)
-(define-key elfeed-show-mode-map (kbd "S-SPC") 'scroll-down-command)
 
 (use-package rg)
 
@@ -1266,7 +1267,7 @@ create a new one."
 
 (use-package treesit-auto
   :custom
-  (setq treesit-auto-install t)
+  (treesit-auto-install t)
   :config
   (treesit-auto-add-to-auto-mode-alist 'all)
   (global-treesit-auto-mode))
@@ -1281,25 +1282,17 @@ create a new one."
 (use-package avy
   :bind
   (("M-o" . avy-goto-char-timer))
-  :config
+  :custom
-  (setq avy-all-windows 'all-frames))
+  (avy-all-windows 'all-frames))
 
-(use-package devdocs)
+(use-package devdocs
-
+  :hook ((python-mode . (lambda () (setq-local devdocs-current-docs '("python~3.12" "numpy~1.23" "matplotlib~3.7" "pandas~1"))))
-(add-hook 'python-mode-hook
+         (python-ts-mode . (lambda () (setq-local devdocs-current-docs '("python~3.12" "numpy~1.23" "matplotlib~3.7" "pandas~1"))))
-          (lambda () (setq-local devdocs-current-docs '("python~3.12" "numpy~1.23" "matplotlib~3.7" "pandas~1"))))
+         (c-mode . (lambda () (setq-local devdocs-current-docs '("c"))))
-(add-hook 'python-ts-mode-hook
+         (c-ts-mode . (lambda () (setq-local devdocs-current-docs '("c"))))
-          (lambda () (setq-local devdocs-current-docs '("python~3.12" "numpy~1.23" "matplotlib~3.7" "pandas~1"))))
+         (c++-mode . (lambda () (setq-local devdocs-current-docs '("cpp"))))
-
+         (c++-ts-mode . (lambda () (setq-local devdocs-current-docs '("cpp")))))
-(add-hook 'c-mode-hook
+  )
-          (lambda () (setq-local devdocs-current-docs '("c"))))
-(add-hook 'c-ts-mode-hook
-          (lambda () (setq-local devdocs-current-docs '("c"))))
-
-(add-hook 'c++-mode-hook
-          (lambda () (setq-local devdocs-current-docs '("cpp"))))
-(add-hook 'c++-ts-mode-hook
-          (lambda () (setq-local devdocs-current-docs '("cpp"))))
 
                                         ; (devdocs-update-all)
 
@@ -1326,13 +1319,16 @@ create a new one."
 
 ;; yubikey support for pushing commits
 ;; commiting is enabled through nixos gpg-agent config
-(use-package pinentry)
+(use-package pinentry
-(pinentry-start)
+  :config
-(setq epg-pinentry-mode 'loopback)
+  (pinentry-start)
-(setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
+  (setq epg-pinentry-mode 'loopback)
+  (setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket"))))
 
 (use-package forge
-  :after magit)
+  :after magit
+  :init
+  (setq forge-add-default-bindings nil))
 
 (use-package git-timemachine
   :hook (git-time-machine-mode . evil-normalize-keymaps)
@@ -1361,7 +1357,7 @@ create a new one."
 ;;                                           (if (char-equal c ?<) t (,electric-pair-inhibit-predicate c))))))
 
 (use-package rainbow-mode
-  :config (rainbow-mode))
+  :hook ((css-mode css-ts-mode web-mode html-mode html-ts-mode) . rainbow-mode))
 
 (use-package corfu
   :init
@@ -1394,15 +1390,15 @@ create a new one."
               ("<insert-state> <down>"     . swarsel/corfu-quit-and-down))
   )
 
-(use-package nerd-icons-corfu)
+(use-package nerd-icons-corfu
-
+  :after corfu
-(add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)
+  :config
-
+  (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)
-(setq nerd-icons-corfu-mapping
+  (setq nerd-icons-corfu-mapping
-      '((array :style "cod" :icon "symbol_array" :face font-lock-type-face)
+        '((array :style "cod" :icon "symbol_array" :face font-lock-type-face)
-        (boolean :style "cod" :icon "symbol_boolean" :face font-lock-builtin-face)
+          (boolean :style "cod" :icon "symbol_boolean" :face font-lock-builtin-face)
-        ;; ...
+          ;; ...
-        (t :style "cod" :icon "code" :face font-lock-warning-face)))
+          (t :style "cod" :icon "code" :face font-lock-warning-face))))
 
 (use-package cape
   :bind
@@ -1460,14 +1456,11 @@ create a new one."
                            "-o ControlMaster=auto -o ControlPersist=yes"))
   )
 
-(setq vterm-tramp-shells '(("ssh" "'sh'")))
-
 (use-package diff-hl
   :hook
   ((prog-mode
     org-mode) . diff-hl-mode)
   :init
-  (diff-hl-flydiff-mode)
   (diff-hl-margin-mode)
   (diff-hl-show-hunk-mouse-mode))
 
@@ -1488,19 +1481,17 @@ create a new one."
     ;;rustic-mode
     tex-mode
     LaTeX-mode
-    ) . (lambda () (progn
+    ) . swarsel/eglot-ensure-and-format)
-                     (eglot-ensure)
-                     (add-hook 'before-save-hook 'eglot-format nil 'local))))
   :custom
   (eldoc-echo-area-use-multiline-p nil)
-  (completion-category-defaults nil)
-  (fset #'jsonrpc--log-event #'ignore)
   (eglot-events-buffer-size 0)
   (eglot-sync-connect nil)
   (eglot-connect-timeout nil)
   (eglot-autoshutdown t)
   (eglot-send-changes-idle-time 3)
   (flymake-no-changes-timeout 5)
+  :config
+  (fset #'jsonrpc--log-event #'ignore)
   :bind (:map eglot-mode-map
               ("M-(" . flymake-goto-next-error)
               ("C-c ," . eglot-code-actions)))
@@ -1518,7 +1509,13 @@ create a new one."
   ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
   (setq lsp-keymap-prefix "C-c l")
   (setq lsp-auto-guess-root "t")
-  :commands lsp)
+  :commands lsp
+  :config
+  (lsp-register-client
+   (make-lsp-client :new-connection (lsp-stdio-connection "nixd")
+                    :major-modes '(nix-mode nix-ts-mode)
+                    :priority 0
+                    :server-id 'nixd)))
 
 ;; (use-package company)
 
@@ -1562,8 +1559,6 @@ create a new one."
                                         ; 'line to show errors on the current line
   (setq sideline-backends-right '(sideline-flymake)))
 
-(setq backup-by-copying-when-linked t)
-
 (use-package dirvish
   :init
   (dirvish-override-dired-mode)
@@ -1638,6 +1633,8 @@ create a new one."
   :ensure nil
   ;; :load-path "/usr/share/emacs/site-lisp/mu4e/"
   ;;:defer 20 ; Wait until 20 seconds after startup
+  :hook ((mu4e-compose-mode . swarsel/mu4e-send-from-correct-address)
+         (mu4e-compose-post . swarsel/mu4e-restore-default))
   :config
 
   ;; This is set to 't' to avoid mail syncing issues when using mbsync
@@ -1681,12 +1678,31 @@ create a new one."
   ;; this does the equivalent of (setq mu4e-user-mail-address-list '(address1@about.com address2@about.com [...])))
   (setq mu4e-user-mail-address-list
     (mapcar #'intern (split-string (or (getenv "SWARSEL_MAIL_ALL") "") "[ ,]+" t)))
+
+  (setq mu4e--log-max-size 1000)
+
+  (mu4e t)
+
+  (let ((work (getenv "SWARSEL_MAIL_WORK")))
+    (when (and work (not (string-empty-p work)))
+      (setq swarsel-smime-cert-path "~/.Certificates/$SWARSEL_MAIL_WORK.pem")
+      (setq swarsel-smime-cert-path (substitute-env-vars swarsel-smime-cert-path))
+      (setq mml-secure-prefer-scheme 'smime)
+      (setq mml-secure-smime-sign-with-sender t)
+      (add-hook 'mu4e-compose-mode-hook
+                (lambda ()
+                  (when (and (boundp 'user-mail-address)
+                             (stringp user-mail-address)
+                             (string-equal user-mail-address (getenv "SWARSEL_MAIL_WORK")))
+                    (mml-secure-message-sign-smime))))
+      (setq smime-keys
+            `((,(getenv "SWARSEL_MAIL_WORK")
+               ,swarsel-smime-cert-path
+               ("~/Certificates/harica-root.pem"
+                "~/Certificates/harica-intermediate.pem"))))
+      ))
   )
 
-
-(add-hook 'mu4e-compose-mode-hook #'swarsel/mu4e-send-from-correct-address)
-(add-hook 'mu4e-compose-post-hook #'swarsel/mu4e-restore-default)
-
 (use-package mu4e-alert
   :config
   (mu4e-alert-enable-notifications)
@@ -1704,30 +1720,6 @@ create a new one."
   (add-hook 'after-init-hook #'mu4e-alert-enable-notifications)
   )
 
-(mu4e t)
-
-(let ((work (getenv "SWARSEL_MAIL_WORK")))
-  (when (and work (not (string-empty-p work)))
-
-    (setq swarsel-smime-cert-path "~/.Certificates/$SWARSEL_MAIL_WORK.pem")
-    (setq swarsel-smime-cert-path (substitute-env-vars swarsel-smime-cert-path))
-    (setq mml-secure-prefer-scheme 'smime)
-    (setq mml-secure-smime-sign-with-sender t)
-    (add-hook 'mu4e-compose-mode-hook
-              (lambda ()
-                (when (and (boundp 'user-mail-address)
-                           (stringp user-mail-address)
-                           (string-equal user-mail-address (getenv "SWARSEL_MAIL_WORK")))
-                  (mml-secure-message-sign-smime))))
-
-    (setq smime-keys
-          `((,(getenv "SWARSEL_MAIL_WORK")
-             ,swarsel-smime-cert-path
-             ("~/Certificates/harica-root.pem"
-              "~/Certificates/harica-intermediate.pem"
-              ))))
-    ))
-
 (use-package org-caldav
   :init
   ;; set org-caldav-sync-initalization
@@ -1851,20 +1843,24 @@ create a new one."
               (
                (,"󱄅"
                 ,swarsel-domain
-                ,(concat "Browse " main-domain)
+                ,(concat "Browse " swarsel-domain)
                 (lambda (&rest _) (browse-url ,(concat "https://" swarsel-domain))))
                )
               ))))
 
-(add-to-list 'recentf-exclude "\\Archive\\.org\\'")
+(use-package recentf
-(add-to-list 'recentf-exclude "\\Tasks\\.org\\'")
+  :ensure nil
+  :config
+  (add-to-list 'recentf-exclude "\\Archive\\.org\\'")
+  (add-to-list 'recentf-exclude "\\Tasks\\.org\\'"))
 
 (use-package vterm
-  :ensure t)
+  :ensure t
+  :custom
+  (vterm-tramp-shells '(("ssh" "'sh'"))))
 
 (use-package multiple-cursors)
 
-(setq mu4e--log-max-size 1000)
 (setq message-log-max 30)
 (setq comint-buffer-maximum-size 50)
 (add-hook 'comint-output-filter-functions 'comint-truncate-buffer)

files/firefox/chrome/userChrome.css

@@ -8,7 +8,7 @@ See the above repository for updates as well as full license text. */
 :root{
   --uc-autohide-toolbox-delay: 200ms; /* Wait 0.1s before hiding toolbars */
   --uc-toolbox-rotation: 82deg;  /* This may need to be lower on mac - like 75 or so */
-
+  /* swarsel: added colorscheme */
   --base00: #1D252C;
   --base01: #171D23;
   --base02: #5EC4FF;
@@ -63,9 +63,9 @@ See the above repository for updates as well as full license text. */
 
 :root[window-modal-open] #urlbar[popover],
 #mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel), > #tab-group-editor > [panelopen]) ~ toolbox #urlbar[popover],
-  /* swarsel: removed :hover from below line */
+/* swarsel: removed hover from next line */
 #navigator-toolbox:is(:focus-within,[movingtab]) #urlbar[popover],
-#urlbar-container > #urlbar[popover]:is([focused],[open]){
+:where(:root[sessionrestored]) #urlbar-container > #urlbar[popover]:is([focused],[open]){
   pointer-events: auto;
   opacity: 1;
   transition-delay: 33ms;
@@ -75,7 +75,7 @@ See the above repository for updates as well as full license text. */
 :root[window-modal-open] #navigator-toolbox,
 #mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel), > #tab-group-editor > [panelopen]) ~ toolbox,
 #navigator-toolbox:has(#urlbar:is([open],[focus-within])),
-  /* swarsel: removed :hover from below line */
+/* swarsel: removed hover from next line */
 #navigator-toolbox:is(:focus-within,[movingtab]){
   transition-delay: 33ms !important;
   transform: rotateX(0);
@@ -95,7 +95,16 @@ See the above repository for updates as well as full license text. */
   }
 }
 
-#navigator-toolbox > *{ line-height: normal; pointer-events: auto }
+/* swarsel: set pointer-events to none !important */
+#navigator-toolbox > *{ line-height: normal; pointer-events: none !important }
+
+/* swarsel: make toolbox clickable */
+:root[window-modal-open] #navigator-toolbox > *,
+#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel), > #tab-group-editor > [panelopen]) ~ toolbox > *,
+#navigator-toolbox:has(#urlbar:is([open],[focus-within])) > *,
+#navigator-toolbox:is(:focus-within,[movingtab],:hover) > * {
+    pointer-events: auto !important;
+}
 
 /* Don't apply transform before window has been fully created */
 :root:not([sessionrestored]) #navigator-toolbox{ transform:none !important }

files/scripts/command-not-found.sh

@@ -1,33 +0,0 @@
-# Adapted from https://github.com/bennofs/nix-index/blob/master/command-not-found.sh
-command_not_found_handle() {
-    if [ -n "${MC_SID-}" ] || ! [ -t 1 ]; then
-        >&2 echo "$1: command not found"
-        return 127
-    fi
-
-    echo -n "searching nix-index..."
-    ATTRS=$(@nix-locate@ --minimal --no-group --type x --type s --whole-name --at-root "/bin/$1")
-
-    case $(echo -n "$ATTRS" | grep -c "^") in
-    0)
-        >&2 echo -ne "$(@tput@ el1)\r"
-        >&2 echo "$1: command not found"
-        ;;
-    *)
-        >&2 echo -ne "$(@tput@ el1)\r"
-        >&2 echo "The program ‘$(@tput@ setaf 4)$1$(@tput@ sgr0)’ is currently not installed."
-        >&2 echo "It is provided by the following derivation(s):"
-        while read -r ATTR; do
-            ATTR=${ATTR%.out}
-            >&2 echo "  $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)"
-        done <<< "$ATTRS"
-        ;;
-    esac
-
-    return 127
-}
-
-command_not_found_handler() {
-    command_not_found_handle "$@"
-    return $?
-}

files/scripts/e.sh

@@ -1,23 +0,0 @@
-wait=0
-while :; do
-    case ${1:-} in
-    -w | --wait)
-        wait=1
-        ;;
-    *) break ;;
-    esac
-    shift
-done
-
-STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
-if [ "$STR" == "" ]; then
-    swaymsg '[title="kittyterm"]' scratchpad show
-    emacsclient -c -a "" "$@"
-    swaymsg '[title="kittyterm"]' scratchpad show
-else
-    if [[ $wait -eq 0 ]]; then
-        emacsclient -n -c -a "" "$@"
-    else
-        emacsclient -c -a "" "$@"
-    fi
-fi

files/scripts/fs-diff.sh

@@ -1,20 +0,0 @@
-set -euo pipefail
-
-OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
-OLD_TRANSID=${OLD_TRANSID#transid marker was }
-
-sudo btrfs subvolume find-new "/mnt/root" "$OLD_TRANSID" |
-    sed '$d' |
-    cut -f17- -d' ' |
-    sort |
-    uniq |
-    while read -r path; do
-        path="/$path"
-        if [ -L "$path" ]; then
-            : # The path is a symbolic link, so is probably handled by NixOS already
-        elif [ -d "$path" ]; then
-            : # The path is a directory, ignore
-        else
-            echo "$path"
-        fi
-    done

files/scripts/niri-resize.sh

@@ -1,11 +0,0 @@
-WORKSPACE=$(niri msg -j workspaces | jq -r '.[] | select(.is_focused == true) | .id')
-
-COUNT=$(niri msg -j windows | jq --argjson ws "$WORKSPACE" -r '.[] | select(.workspace_id == $ws and .is_floating == false) | .app_id' | wc -l)
-
-while [[ $COUNT == "0" || $COUNT == "2" ]]; do
-    COUNT=$(niri msg -j windows | jq --argjson ws "$WORKSPACE" -r '.[] | select(.workspace_id == $ws and .is_floating == false) | .app_id' | wc -l)
-done
-
-if [[ $COUNT == "1" ]]; then
-    niri msg action maximize-column
-fi

files/scripts/opacitytoggle.sh

@@ -1,5 +0,0 @@
-if swaymsg opacity plus 0.01 -q; then
-    swaymsg opacity 1
-else
-    swaymsg opacity 0.95
-fi

files/scripts/pass-fuzzel.sh

@@ -1,51 +0,0 @@
-# Adapted from https://code.kulupu.party/thesuess/home-manager/src/branch/main/modules/river.nix
-shopt -s nullglob globstar
-
-otp=0
-typeit=0
-while :; do
-    case ${1:-} in
-    -t | --type)
-        typeit=1
-        ;;
-    -o | --otp)
-        otp=1
-        ;;
-    *) break ;;
-    esac
-    shift
-done
-
-export PASSWORD_STORE_DIR=~/.local/share/password-store
-prefix=${PASSWORD_STORE_DIR-~/.local/share/password-store}
-if [[ $otp -eq 0 ]]; then
-    password_files=("$prefix"/**/*.gpg)
-else
-    password_files=("$prefix"/otp/**/*.gpg)
-fi
-password_files=("${password_files[@]#"$prefix"/}")
-password_files=("${password_files[@]%.gpg}")
-
-password=$(printf '%s\n' "${password_files[@]}" | fuzzel --dmenu "$@")
-
-[[ -n $password ]] || exit
-if [[ $otp -eq 0 ]]; then
-    if [[ $typeit -eq 0 ]]; then
-        pass show -c "$password" &> /tmp/pass-fuzzel
-    else
-        pass show "$password" | {
-            IFS= read -r pass
-            printf %s "$pass"
-        } | wtype -
-    fi
-else
-    if [[ $typeit -eq 0 ]]; then
-        pass otp -c "$password" &> /tmp/pass-fuzzel
-    else
-        pass otp "$password" | {
-            IFS= read -r pass
-            printf %s "$pass"
-        } | wtype -
-    fi
-fi
-notify-send -u critical -a pass -t 1000 "Copied/Typed Password"

files/scripts/project.sh

@@ -1,7 +0,0 @@
-set -euo pipefail
-
-if [ ! -d "$(pwd)/.git" ]; then
-    git init
-fi
-nix flake init --template "$FLAKE"#"$1"
-direnv allow

files/scripts/quickpass.sh

@@ -1,12 +0,0 @@
-shopt -s nullglob globstar
-
-notify-send "$(env | grep -E 'WAYLAND|SWAY')"
-
-password="$1"
-
-pass show "$password" | {
-    IFS= read -r pass
-    printf %s "$pass"
-} | wtype -
-
-notify-send -u critical -a pass -t 1000 "Typed Password"

files/scripts/sshrm.sh

@@ -1,11 +0,0 @@
-HISTFILE="$HOME"/.histfile
-
-last_ssh_cmd=$(grep -E "ssh " "$HISTFILE" | sed -E 's/^: [0-9]+:[0-9]+;//' | grep "^ssh " | tail -1)
-host=$(echo "$last_ssh_cmd" | sed -E 's/.*ssh ([^@ ]+@)?([^ ]+).*/\2/')
-
-if [[ -n $host ]]; then
-    echo "Removing SSH host key for: $host"
-    ssh-keygen -R "$host"
-else
-    echo "No valid SSH command found in history."
-fi

files/scripts/swarsel-bootstrap.sh

@@ -1,394 +0,0 @@
-# highly inspired by https://github.com/EmergentMind/nix-config/blob/dev/files/scripts/bootstrap-nixos.sh
-set -eo pipefail
-
-target_hostname=""
-target_destination=""
-target_arch=""
-target_user="swarsel"
-ssh_port="22"
-persist_dir=""
-disk_encryption=0
-disk_encryption_args=""
-no_disko_deps="false"
-temp=$(mktemp -d)
-
-function help_and_exit() {
-    echo
-    echo "Remotely installs SwarselSystem on a target machine including secret deployment."
-    echo
-    echo "USAGE: $0 -n <target_hostname> -d <target_destination> [OPTIONS]"
-    echo
-    echo "ARGS:"
-    echo "  -n <target_hostname>                    specify target_hostname of the target host to deploy the nixos config on."
-    echo "  -d <target_destination>                 specify ip or url to the target host."
-    echo "  -a <targeit_arch>                       specify the architecture of the target host."
-    echo "                                          target during install process."
-    echo
-    echo "OPTIONS:"
-    echo "  -u <target_user>                        specify target_user with sudo access. nix-config will be cloned to their home."
-    echo "                                          Default='${target_user}'."
-    echo "  --port <ssh_port>                       specify the ssh port to use for remote access. Default=${ssh_port}."
-    echo "  --debug                                 Enable debug mode."
-    echo "  --no-disko-deps                         Upload only disk script and not dependencies (for use on low ram)."
-    echo "  -h | --help                             Print this help."
-    exit 0
-}
-
-function cleanup() {
-    rm -rf "$temp"
-    rm -rf /tmp/disko-password
-}
-trap cleanup exit
-
-function red() {
-    echo -e "\x1B[31m[!] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[31m[!] $($2) \x1B[0m"
-    fi
-}
-function green() {
-    echo -e "\x1B[32m[+] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[32m[+] $($2) \x1B[0m"
-    fi
-}
-function yellow() {
-    echo -e "\x1B[33m[*] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[33m[*] $($2) \x1B[0m"
-    fi
-}
-
-function yes_or_no() {
-    echo -en "\x1B[32m[+] $* [y/n] (default: y): \x1B[0m"
-    while true; do
-        read -rp "" yn
-        yn=${yn:-y}
-        case $yn in
-        [Yy]*) return 0 ;;
-        [Nn]*) return 1 ;;
-        esac
-    done
-}
-
-function update_sops_file() {
-    key_name=$1
-    key_type=$2
-    key=$3
-
-    if [ ! "$key_type" == "hosts" ] && [ ! "$key_type" == "users" ]; then
-        red "Invalid key type passed to update_sops_file. Must be either 'hosts' or 'users'."
-        exit 1
-    fi
-    cd "${git_root}"
-
-    SOPS_FILE=".sops.yaml"
-    sed -i "{
-                                                        # Remove any * and & entries for this host
-                                                        /[*&]$key_name/ d;
-                                                        # Inject a new age: entry
-                                                        # n matches the first line following age: and p prints it, then we transform it while reusing the spacing
-                                                        /age:/{n; p; s/\(.*- \*\).*/\1$key_name/};
-                                                        # Inject a new hosts or user: entry
-                                                        /&$key_type/{n; p; s/\(.*- &\).*/\1$key_name $key/}
-                                                        }" $SOPS_FILE
-    green "Updating .sops.yaml"
-    cd -
-}
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-    -n)
-        shift
-        target_hostname=$1
-        ;;
-    -d)
-        shift
-        target_destination=$1
-        ;;
-    -a)
-        shift
-        target_arch=$1
-        ;;
-    -u)
-        shift
-        target_user=$1
-        ;;
-    --port)
-        shift
-        ssh_port=$1
-        ;;
-    --no-disko-deps)
-        no_disko_deps="true"
-        ;;
-    --debug)
-        set -x
-        ;;
-    -h | --help) help_and_exit ;;
-    *)
-        echo "Invalid option detected."
-        help_and_exit
-        ;;
-    esac
-    shift
-done
-
-if [[ $target_arch == "" || $target_destination == "" || $target_hostname == "" ]]; then
-    red "error: target_arch, target_destination or target_hostname not set."
-    help_and_exit
-fi
-
-LOCKED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.node.lockFromBootstrapping)"
-if [[ $LOCKED == "true" ]]; then
-    red "THIS SYSTEM IS LOCKED FROM BOOTSTRAPPING - set 'node.lockFromBootstrapping = lib.mkForce false;' to proceed"
-    exit
-fi
-
-green "~SwarselSystems~ remote installer"
-green "Reading system information for $target_hostname ..."
-
-DISK="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.rootDisk)"
-green "Root Disk: $DISK"
-
-CRYPTED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isCrypted)"
-if [[ $CRYPTED == "true" ]]; then
-    green "Encryption: ✓"
-    disk_encryption=1
-    disk_encryption_args=(
-        --disk-encryption-keys
-        /tmp/disko-password
-        /tmp/disko-password
-    )
-else
-    red "Encryption: X"
-    disk_encryption=0
-fi
-
-IMPERMANENCE="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isImpermanence)"
-if [[ $IMPERMANENCE == "true" ]]; then
-    green "Impermanence: ✓"
-    persist_dir="/persist"
-else
-    red "Impermanence: X"
-    persist_dir=""
-fi
-
-SWAP="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSwap)"
-if [[ $SWAP == "true" ]]; then
-    green "Swap: ✓"
-else
-    red "Swap: X"
-fi
-
-SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSecureBoot)"
-if [[ $SECUREBOOT == "true" ]]; then
-    green "Secure Boot: ✓"
-else
-    red "Secure Boot: X"
-fi
-
-ssh_cmd="ssh -oport=${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -t $target_user@$target_destination"
-# ssh_root_cmd=$(echo "$ssh_cmd" | sed "s|${target_user}@|root@|") # uses @ in the sed switch to avoid it triggering on the $ssh_key value
-ssh_root_cmd=${ssh_cmd/${target_user}@/root@}
-scp_cmd="scp -oport=${ssh_port} -o StrictHostKeyChecking=no"
-
-if [[ -z ${FLAKE} ]]; then
-    FLAKE=/home/"$target_user"/.dotfiles
-fi
-if [ ! -d "$FLAKE" ]; then
-    cd /home/"$target_user"
-    yellow "Flake directory not found - cloning repository from GitHub"
-    git clone git@github.com:Swarsel/.dotfiles.git || (yellow "Could not clone repository via SSH - defaulting to HTTPS" && git clone https://github.com/Swarsel/.dotfiles.git)
-    FLAKE=/home/"$target_user"/.dotfiles
-fi
-
-cd "$FLAKE"
-
-rm install/flake.lock || true
-git_root=$(git rev-parse --show-toplevel)
-# ------------------------
-green "Wiping known_hosts of $target_destination"
-sed -i "/$target_hostname/d; /$target_destination/d" ~/.ssh/known_hosts
-# ------------------------
-green "Preparing a new ssh_host_ed25519_key pair for $target_hostname."
-# Create the directory where sshd expects to find the host keys
-install -d -m755 "$temp/$persist_dir/etc/ssh"
-# Generate host ssh key pair without a passphrase
-ssh-keygen -t ed25519 -f "$temp/$persist_dir/etc/ssh/ssh_host_ed25519_key" -C root@"$target_hostname" -N ""
-# Set the correct permissions so sshd will accept the key
-chmod 600 "$temp/$persist_dir/etc/ssh/ssh_host_ed25519_key"
-echo "Adding ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
-# This will fail if we already know the host, but that's fine
-ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
-# ------------------------
-# when using luks, disko expects a passphrase on /tmp/disko-password, so we set it for now and will update the passphrase later
-# via the config
-if [ "$disk_encryption" -eq 1 ]; then
-    while true; do
-        green "Set disk encryption passphrase:"
-        read -rs luks_passphrase
-        green "Please confirm passphrase:"
-        read -rs luks_passphrase_confirm
-        if [[ $luks_passphrase == "$luks_passphrase_confirm" ]]; then
-            echo "$luks_passphrase" > /tmp/disko-password
-            $ssh_root_cmd "echo '$luks_passphrase' > /tmp/disko-password"
-            break
-        else
-            red "Passwords do not match"
-        fi
-    done
-fi
-# ------------------------
-green "Generating hardware-config.nix for $target_hostname and adding it to the nix-config."
-$ssh_root_cmd "nixos-generate-config --force --no-filesystems --root /mnt"
-
-mkdir -p "$FLAKE"/hosts/nixos/"$target_arch"/"$target_hostname"
-$scp_cmd root@"$target_destination":/mnt/etc/nixos/hardware-configuration.nix "${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix
-# ------------------------
-green "Generating hostkey for ssh initrd"
-$ssh_root_cmd "mkdir -p $temp/etc/secrets/initrd /etc/secrets/initrd"
-$ssh_root_cmd "ssh-keygen -t ed25519 -N '' -f $temp/etc/secrets/initrd/ssh_host_ed25519_key"
-$ssh_root_cmd "cp $temp/etc/secrets/initrd/ssh_host_ed25519_key /etc/secrets/initrd/ssh_host_ed25519_key"
-# ------------------------
-
-green "Deploying minimal NixOS installation on $target_destination"
-
-if [[ $no_disko_deps == "true" ]]; then
-    green "Building without disko dependencies (using custom kexec)"
-    nix run github:nix-community/nixos-anywhere/1.10.0 -- "${disk_encryption_args[@]}" --no-disko-deps --ssh-port "$ssh_port" --extra-files "$temp" --flake ./install#"$target_hostname" --kexec "$(nix build --print-out-paths .#packages."$target_arch".swarsel-kexec)/swarsel-kexec-$target_arch.tar.gz" root@"$target_destination"
-else
-    green "Building with disko dependencies (using nixos-images kexec)"
-    nix run github:nix-community/nixos-anywhere/1.10.0 -- "${disk_encryption_args[@]}" --ssh-port "$ssh_port" --extra-files "$temp" --flake ./install#"$target_hostname" root@"$target_destination"
-fi
-
-echo "Updating ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
-ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
-# ------------------------
-
-while true; do
-    read -rp "Press Enter to continue once the remote host has finished booting."
-    if nc -z "$target_destination" "${ssh_port}" 2> /dev/null; then
-        green "$target_destination is booted. Continuing..."
-        break
-    else
-        yellow "$target_destination is not yet ready."
-    fi
-done
-
-# ------------------------
-
-if [[ $SECUREBOOT == "true" ]]; then
-    green "Setting up secure boot keys"
-    $ssh_root_cmd "mkdir -p /var/lib/sbctl"
-    read -ra scp_call <<< "${scp_cmd}"
-    sudo "${scp_call[@]}" -r /var/lib/sbctl root@"$target_destination":/var/lib/
-    $ssh_root_cmd "sbctl enroll-keys --ignore-immutable --microsoft || true"
-fi
-# ------------------------
-
-if [ -n "$persist_dir" ]; then
-    $ssh_root_cmd "cp /etc/machine-id $persist_dir/etc/machine-id || true"
-    $ssh_root_cmd "cp -R /etc/ssh/ $persist_dir/etc/ssh/ || true"
-fi
-# ------------------------
-green "Generating an age key based on the new ssh_host_ed25519_key."
-target_key=$(
-    ssh-keyscan -p "$ssh_port" -t ssh-ed25519 "$target_destination" 2>&1 |
-        grep ssh-ed25519 |
-        cut -f2- -d" " ||
-        (
-            red "Failed to get ssh key. Host down?"
-            exit 1
-        )
-)
-host_age_key=$(nix shell nixpkgs#ssh-to-age.out -c sh -c "echo $target_key | ssh-to-age")
-
-if grep -qv '^age1' <<< "$host_age_key"; then
-    red "The result from generated age key does not match the expected format."
-    yellow "Result: $host_age_key"
-    yellow "Expected format: age1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-    exit 1
-else
-    echo "$host_age_key"
-fi
-
-green "Updating nix-secrets/.sops.yaml"
-update_sops_file "$target_hostname" "hosts" "$host_age_key"
-yellow ".sops.yaml has been updated. There may be superfluous entries, you might need to edit manually."
-if yes_or_no "Do you want to manually edit .sops.yaml now?"; then
-    vim "${git_root}"/.sops.yaml
-fi
-green "Updating all secrets files to reflect updates .sops.yaml"
-sops updatekeys --yes --enable-local-keyservice "${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/secrets/* || true
-# --------------------------
-green "Making ssh_host_ed25519_key available to home-manager for user $target_user"
-sed -i "/$target_hostname/d; /$target_destination/d" ~/.ssh/known_hosts
-$ssh_root_cmd "mkdir -p /home/$target_user/.ssh; chown -R $target_user:users /home/$target_user/.ssh/"
-$scp_cmd root@"$target_destination":/etc/ssh/ssh_host_ed25519_key root@"$target_destination":/home/"$target_user"/.ssh/ssh_host_ed25519_key
-$ssh_root_cmd "chown $target_user:users /home/$target_user/.ssh/ssh_host_ed25519_key"
-# __________________________
-
-if yes_or_no "Add ssh host fingerprints for git upstream repositories? (This is needed for building the full config)"; then
-    green "Adding ssh host fingerprints for git{lab,hub}"
-    $ssh_cmd "mkdir -p /home/$target_user/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com | tee /home/$target_user/.ssh/known_hosts"
-    $ssh_root_cmd "mkdir -p /root/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com | tee /root/.ssh/known_hosts"
-fi
-# --------------------------
-
-if yes_or_no "Do you want to copy your full nix-config and nix-secrets to $target_hostname?"; then
-    green "Adding ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
-    ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
-    green "Copying full nix-config to $target_hostname"
-    cd "${git_root}"
-    just sync "$target_user" "$target_destination"
-
-    if [ -n "$persist_dir" ]; then
-        $ssh_root_cmd "cp -r /home/$target_user/.dotfiles $persist_dir/.dotfiles || true"
-        $ssh_root_cmd "cp -r /home/$target_user/.ssh $persist_dir/.ssh || true"
-    fi
-
-    if yes_or_no "Do you want to rebuild immediately?"; then
-        green "Building nix-config for $target_hostname"
-        # yellow "Reminder: The password is 'setup'"
-        $ssh_root_cmd "mkdir -p /root/.local/share/nix/; printf '{\"extra-substituters\":{\"https://nix-community.cachix.org\":true,\"https://nix-community.cachix.org https://cache.ngi0.nixos.org/\":true},\"extra-trusted-public-keys\":{\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=\":true,\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=\":true}}' | tee /root/.local/share/nix/trusted-settings.json"
-        # $ssh_cmd -oForwardAgent=yes "cd .dotfiles && sudo nixos-rebuild --show-trace --flake .#$target_hostname switch"
-        store_path=$(nix build --no-link --print-out-paths .#nixosConfigurations."$target_hostname".config.system.build.toplevel)
-        green "Copying generation to $target_hostname"
-        nix copy --to "ssh://root@$target_destination" "$store_path"
-        # prev_system=$($ssh_root_cmd " readlink -e /nix/var/nix/profiles/system")
-        green "Linking generation in bootloader"
-        $ssh_root_cmd "/run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set $store_path"
-        green "Setting generation to activate upon next boot"
-        $ssh_root_cmd "$store_path/bin/switch-to-configuration boot"
-    else
-        echo
-        green "NixOS was successfully installed!"
-        echo "Post-install config build instructions:"
-        echo "To copy nix-config from this machine to the $target_hostname, run the following command from ~/nix-config"
-        echo "just sync $target_user $target_destination"
-        echo "To rebuild, sign into $target_hostname and run the following command from ~/nix-config"
-        echo "cd nix-config"
-        # see above FIXME:(bootstrap)
-        echo "sudo nixos-rebuild .pre-commit-config.yaml show-trace --flake .#$target_hostname switch"
-        # echo "just rebuild"
-        echo
-    fi
-fi
-
-green "NixOS was successfully installed!"
-if yes_or_no "You can now commit and push the nix-config, which includes the hardware-configuration.nix for $target_hostname?"; then
-    cd "${git_root}"
-    deadnix hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix -qe
-    nixpkgs--fmt hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix
-    (.pre-commit-config.yaml mit run --all-files 2> /dev/null || true) &&
-        git add "$git_root/hosts/nixos/$target_arch/$target_hostname/hardware-configuration.nix" &&
-        git add "$git_root/.sops.yaml" &&
-        git add "$git_root/secrets" &&
-        (git commit -m "feat: deployed $target_hostname" || true) && git push
-fi
-
-if yes_or_no "Reboot now?"; then
-    $ssh_root_cmd "reboot"
-fi
-
-rm -rf /tmp/disko-password

files/scripts/swarsel-displaypower.sh

@@ -1,2 +0,0 @@
-swaymsg "output * power on" > /dev/null 2>&1 || true
-swaymsg "output * dpms on" > /dev/null 2>&1 || true

files/scripts/swarsel-install.sh

@@ -1,188 +0,0 @@
-set -eo pipefail
-
-target_config="hotel"
-target_hostname="hotel"
-target_user="swarsel"
-target_arch=""
-persist_dir=""
-target_disk="/dev/vda"
-disk_encryption=0
-
-function help_and_exit() {
-    echo
-    echo "Locally installs SwarselSystem on this machine."
-    echo
-    echo "USAGE: $0 -n <target_config> -d <target_disk> [OPTIONS]"
-    echo
-    echo "ARGS:"
-    echo "  -n <target_config>                      specify the nixos config to deploy."
-    echo "                                          Default: hotel"
-    echo "  -d <target_disk>                        specify disk to install on."
-    echo "                                          Default: /dev/vda"
-    echo "  -u <target_user>                        specify user to deploy for."
-    echo "                                          Default: swarsel"
-    echo "  -a <target_arch>                        specify target architecture."
-    echo "  -h | --help                             Print this help."
-    exit 0
-}
-
-function red() {
-    echo -e "\x1B[31m[!] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[31m[!] $($2) \x1B[0m"
-    fi
-}
-function green() {
-    echo -e "\x1B[32m[+] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[32m[+] $($2) \x1B[0m"
-    fi
-}
-function yellow() {
-    echo -e "\x1B[33m[*] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[33m[*] $($2) \x1B[0m"
-    fi
-}
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-    -n)
-        shift
-        target_config=$1
-        target_hostname=$1
-        ;;
-    -u)
-        shift
-        target_user=$1
-        ;;
-    -d)
-        shift
-        target_disk=$1
-        ;;
-    -a)
-        shift
-        target_arch=$1
-        ;;
-    -h | --help) help_and_exit ;;
-    *)
-        echo "Invalid option detected."
-        help_and_exit
-        ;;
-    esac
-    shift
-done
-
-function cleanup() {
-    sudo rm -rf .cache/nix
-    sudo rm -rf /root/.cache/nix
-}
-trap cleanup exit
-
-if [[ $target_arch == "" || $target_hostname == "" ]]; then
-    red "error: target_arch or target_hostname not set."
-    help_and_exit
-fi
-
-green "~SwarselSystems~ local installer"
-
-cd /home/"$target_user"
-
-sudo rm -rf /root/.cache/nix
-sudo rm -rf .cache/nix
-sudo rm -rf .dotfiles
-
-green "Cloning repository from GitHub"
-git clone https://github.com/Swarsel/.dotfiles.git
-
-local_keys=$(ssh-add -L || true)
-pub_key=$(cat /home/"$target_user"/.dotfiles/secrets/public/ssh/yubikey.pub)
-read -ra pub_arr <<< "$pub_key"
-
-cd .dotfiles
-if [[ $local_keys != *"${pub_arr[1]}"* ]]; then
-    yellow "The ssh key for this configuration is not available."
-    green "Adjusting flake.nix so that the configuration is buildable ..."
-    sed -i '/vbc-nix = {/,/^[[:space:]]*};/d' flake.nix
-    sed -i '/[[:space:]]*\/\/ (inputs.vbc-nix.overlays.default final prev)/d' overlays/default.nix
-    nix flake update vbc-nix
-    git add .
-else
-    green "Valid SSH key found! Continuing with installation"
-fi
-
-green "Reading system information for $target_config ..."
-DISK="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.rootDisk)"
-green "Root Disk in config: $DISK - Root Disk passed in cli: $target_disk"
-
-CRYPTED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isCrypted)"
-if [[ $CRYPTED == "true" ]]; then
-    green "Encryption: ✓"
-    disk_encryption=1
-else
-    red "Encryption: X"
-    disk_encryption=0
-fi
-
-IMPERMANENCE="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isImpermanence)"
-if [[ $IMPERMANENCE == "true" ]]; then
-    green "Impermanence: ✓"
-    persist_dir="/persist"
-else
-    red "Impermanence: X"
-    persist_dir=""
-fi
-
-SWAP="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSwap)"
-if [[ $SWAP == "true" ]]; then
-    green "Swap: ✓"
-else
-    red "Swap: X"
-fi
-
-SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSecureBoot)"
-if [[ $SECUREBOOT == "true" ]]; then
-    green "Secure Boot: ✓"
-else
-    red "Secure Boot: X"
-fi
-
-if [ "$disk_encryption" -eq 1 ]; then
-    while true; do
-        green "Set disk encryption passphrase:"
-        read -rs luks_passphrase
-        green "Please confirm passphrase:"
-        read -rs luks_passphrase_confirm
-        if [[ $luks_passphrase == "$luks_passphrase_confirm" ]]; then
-            echo "$luks_passphrase" > /tmp/disko-password
-            break
-        else
-            red "Passwords do not match"
-        fi
-    done
-fi
-
-green "Setting up disk ..."
-if [[ $target_config == "hotel" ]]; then
-    sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/v1.10.0 -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks --arg diskDevice "$target_disk"
-else
-    sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks
-fi
-sudo mkdir -p /mnt/"$persist_dir"/home/"$target_user"/
-sudo cp -r /home/"$target_user"/.dotfiles /mnt/"$persist_dir"/home/"$target_user"/
-sudo chown -R 1000:100 /mnt/"$persist_dir"/home/"$target_user"
-
-green "Generating hardware configuration ..."
-sudo nixos-generate-config --root /mnt --no-filesystems --dir /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/
-
-git add /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/hardware-configuration.nix
-sudo mkdir -p /root/.local/share/nix/
-printf '{\"extra-substituters\":{\"https://nix-community.cachix.org\":true,\"https://nix-community.cachix.org https://cache.ngi0.nixos.org/\":true},\"extra-trusted-public-keys\":{\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=\":true,\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=\":true}}' | sudo tee /root/.local/share/nix/trusted-settings.json > /dev/null
-green "Installing flake $target_config"
-
-store_path=$(nix build --no-link --print-out-paths .#nixosConfigurationsMinimal."$target_config".config.system.build.toplevel)
-green "Linking generation in bootloader"
-sudo "/run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set $store_path"
-green "Setting generation to activate upon next boot"
-sudo "$store_path/bin/switch-to-configuration boot"
-green "Installation finished! Reboot to see changes"

files/scripts/swarsel-postinstall.sh

@@ -1,72 +0,0 @@
-set -eo pipefail
-
-target_config="hotel"
-target_user="swarsel"
-
-function help_and_exit() {
-    echo
-    echo "Locally installs SwarselSystem on this machine."
-    echo
-    echo "USAGE: $0 -d <disk> [OPTIONS]"
-    echo
-    echo "ARGS:"
-    echo "  -d <disk>                               specify disk to install on."
-    echo "  -n <target_config>                      specify the nixos config to deploy."
-    echo "                                          Default: hotel"
-    echo "                                          Default: hotel"
-    echo "  -u <target_user>                        specify user to deploy for."
-    echo "                                          Default: swarsel"
-    echo "  -h | --help                             Print this help."
-    exit 0
-}
-
-function green() {
-    echo -e "\x1B[32m[+] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[32m[+] $($2) \x1B[0m"
-    fi
-}
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-    -n)
-        shift
-        target_config=$1
-        ;;
-    -u)
-        shift
-        target_user=$1
-        ;;
-    -h | --help) help_and_exit ;;
-    *)
-        echo "Invalid option detected."
-        help_and_exit
-        ;;
-    esac
-    shift
-done
-
-function cleanup() {
-    sudo rm -rf .cache/nix
-    sudo rm -rf /root/.cache/nix
-}
-trap cleanup exit
-
-sudo rm -rf .cache/nix
-sudo rm -rf /root/.cache/nix
-
-green "~SwarselSystems~ remote post-installer"
-
-cd /home/"$target_user"/.dotfiles
-
-SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_config".config.swarselsystems.isSecureBoot)"
-
-if [[ $SECUREBOOT == "true" ]]; then
-    green "Setting up secure boot keys"
-    sudo mkdir -p /var/lib/sbctl
-    sbctl create-keys || true
-    sbctl enroll-keys --ignore-immutable --microsoft || true
-fi
-
-sudo nixos-rebuild --flake .#"$target_config" switch
-green "Post-install finished!"

files/scripts/swarsel-rebuild.sh

@@ -1,110 +0,0 @@
-set -eo pipefail
-
-target_config="hotel"
-target_arch=""
-target_user="swarsel"
-
-function help_and_exit() {
-    echo
-    echo "Builds SwarselSystem configuration."
-    echo
-    echo "USAGE: $0 [OPTIONS]"
-    echo
-    echo "ARGS:"
-    echo "  -n <target_config>                      specify nixos config to build."
-    echo "                                          Default: hotel"
-    echo "  -u <target_user>                        specify user to deploy for."
-    echo "                                          Default: swarsel"
-    echo "  -a <target_arch>                        specify target architecture."
-    echo "  -h | --help                             Print this help."
-    exit 0
-}
-
-function red() {
-    echo -e "\x1B[31m[!] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[31m[!] $($2) \x1B[0m"
-    fi
-}
-function green() {
-    echo -e "\x1B[32m[+] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[32m[+] $($2) \x1B[0m"
-    fi
-}
-function yellow() {
-    echo -e "\x1B[33m[*] $1 \x1B[0m"
-    if [ -n "${2-}" ]; then
-        echo -e "\x1B[33m[*] $($2) \x1B[0m"
-    fi
-}
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-    -n)
-        shift
-        target_config=$1
-        ;;
-    -a)
-        shift
-        target_arch=$1
-        ;;
-    -u)
-        shift
-        target_user=$1
-        ;;
-    -h | --help) help_and_exit ;;
-    *)
-        echo "Invalid option detected."
-        help_and_exit
-        ;;
-    esac
-    shift
-done
-
-if [[ $target_arch == "" ]]; then
-    red "error: target_arch not set."
-    help_and_exit
-fi
-
-cd /home/"$target_user"
-
-if [ ! -d /home/"$target_user"/.dotfiles ]; then
-    green "Cloning repository from GitHub"
-    git clone https://github.com/Swarsel/.dotfiles.git
-else
-    red "A .dotfiles repository is in the way. Please (re-)move the repository and try again."
-    exit 1
-fi
-
-local_keys=$(ssh-add -L || true)
-pub_key=$(cat /home/"$target_user"/.dotfiles/secrets/public/ssh/yubikey.pub)
-read -ra pub_arr <<< "$pub_key"
-
-cd .dotfiles
-if [[ $local_keys != *"${pub_arr[1]}"* ]]; then
-    yellow "The ssh key for this configuration is not available."
-    green "Adjusting flake.nix so that the configuration is buildable"
-    sed -i '/nix-secrets = {/,/^[[:space:]]*};/d' flake.nix
-    sed -i '/vbc-nix = {/,/^[[:space:]]*};/d' flake.nix
-    sed -i '/[[:space:]]*\/\/ (inputs.vbc-nix.overlays.default final prev)/d' overlays/default.nix
-    rm modules/home/common/env.nix
-    rm modules/home/common/gammastep.nix
-    rm modules/home/common/git.nix
-    rm modules/home/common/mail.nix
-    rm modules/home/common/yubikey.nix
-    rm modules/nixos/server/restic.nix
-    rm hosts/nixos/aarch64-linux/milkywell/default.nix
-    rm -rf modules/nixos/server
-    rm -rf modules/home/server
-    nix flake update vbc-nix
-    git add .
-else
-    green "Valid SSH key found! Continuing with installation"
-fi
-sudo nixos-generate-config --dir /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/
-git add /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/hardware-configuration.nix
-
-green "Installing flake $target_config"
-sudo nixos-rebuild --show-trace --flake .#"$target_config" boot
-yellow "Please keep in mind that this is only a demo of the configuration. Things might break unexpectedly."

files/scripts/swarselcheck.sh

@@ -1,62 +0,0 @@
-kitty=0
-element=0
-vesktop=0
-spotifyplayer=0
-while :; do
-    case ${1:-} in
-    -k | --kitty)
-        kitty=1
-        ;;
-    -e | --element)
-        element=1
-        ;;
-    -d | --vesktop)
-        vesktop=1
-        ;;
-    -s | --spotifyplayer)
-        spotifyplayer=1
-        ;;
-    *) break ;;
-    esac
-    shift
-done
-
-if [[ $kitty -eq 1 ]]; then
-    STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
-    CHECK=$(swaymsg -t get_tree | grep kittyterm || true)
-    if [ "$CHECK" == "" ]; then
-        exec kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm &
-        sleep 1
-    fi
-    if [ "$STR" == "" ]; then
-        exec swaymsg '[title="kittyterm"]' scratchpad show
-    else
-        exec swaymsg '[title="kittyterm"]' scratchpad show
-    fi
-elif [[ $element -eq 1 ]]; then
-    STR=$(swaymsg -t get_tree | grep Element || true)
-    if [ "$STR" == "" ]; then
-        exec element-desktop
-    else
-        exec swaymsg '[app_id=Element]' kill
-    fi
-elif [[ $vesktop -eq 1 ]]; then
-    STR=$(swaymsg -t get_tree | grep vesktop || true)
-    if [ "$STR" == "" ]; then
-        exec vesktop
-    else
-        exec swaymsg '[app_id=vesktop]' kill
-    fi
-elif [[ $spotifyplayer -eq 1 ]]; then
-    STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true)
-    CHECK=$(swaymsg -t get_tree | grep spotifytui || true)
-    if [ "$CHECK" == "" ]; then
-        exec kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player &
-        sleep 1
-    fi
-    if [ "$STR" == "" ]; then
-        exec swaymsg '[title="spotifytui"]' scratchpad show
-    else
-        exec swaymsg '[title="spotifytui"]' scratchpad show
-    fi
-fi

files/scripts/swarselzellij.sh

@@ -1,8 +0,0 @@
-# KITTIES=$(($(pgrep -P 1 kitty | wc -l) - 1))
-
-# if ((KITTIES < 1)); then
-#     exec kitty -o confirm_os_window_close=0 zellij attach --create main
-# else
-#     exec kitty -o confirm_os_window_close=0 zellij attach --create "temp $KITTIES"
-# fi
-exec kitty -o confirm_os_window_close=0 zellij

files/scripts/waybarupdate.sh

@@ -1,24 +0,0 @@
-CFG=$(git --git-dir="$HOME"/.dotfiles/.git --work-tree="$HOME"/.dotfiles/ status -s | wc -l)
-CSE=$(git --git-dir="$DOCUMENT_DIR_PRIV"/CSE_TUWIEN/.git --work-tree="$DOCUMENT_DIR_PRIV"/CSE_TUWIEN/ status -s | wc -l)
-PASS=$(($(git --git-dir="$HOME"/.local/share/password-store/.git --work-tree="$HOME"/.local/share/password-store/ status -s | wc -l) + $(git --git-dir="$HOME"/.local/share/password-store/.git --work-tree="$HOME"/.local/share/password-store/ diff origin/main..HEAD | wc -l)))
-
-if [[ $CFG != 0 ]]; then
-    CFG_STR='CONFIG'
-else
-    CFG_STR=''
-fi
-
-if [[ $CSE != 0 ]]; then
-    CSE_STR=' CSE'
-else
-    CSE_STR=''
-fi
-
-if [[ $PASS != 0 ]]; then
-    PASS_STR=' PASS'
-else
-    PASS_STR=''
-fi
-
-OUT="$CFG_STR""$CSE_STR""$PASS_STR"
-echo "$OUT"

flake.nix

@@ -28,7 +28,7 @@
     smallpkgs.url = "github:nixos/nixpkgs/08fcb0dcb59df0344652b38ea6326a2d8271baff?narHash=sha256-HXIQzULIG/MEUW2Q/Ss47oE3QrjxvpUX7gUl4Xp6lnc%3D&shallow=1";
     nixpkgs-dev.url = "github:Swarsel/nixpkgs/main";
     nixpkgs-bisect.url = "github:nixos/nixpkgs/master";
-    nixpkgs-update.url = "github:r-ryantm/nixpkgs/auto-update/oauth2-proxy";
+    # nixpkgs-update.url = "github:r-ryantm/nixpkgs/auto-update/oauth2-proxy";
     # nixpkgs-kernel.url = "github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D"; #specifically pinned for kernel version
     nixpkgs-kernel.url = "github:nixos/nixpkgs/dd9b079222d43e1943b6ebd802f04fd959dc8e61?narHash=sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE%3D"; #specifically pinned for kernel version
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";

install/installer-config.nix

@@ -108,7 +108,7 @@ in
 
     networking = {
       hostName = "drugstore";
-      wireless.enable = false;
+      wireless.enable = lib.mkForce false;
       # dhcpcd.runHook = "${pkgs.utillinux}/bin/agetty --reload";
       networkmanager.enable = true;
       usePredictableInterfaceNames = false;

modules/home/common/gpg-agent.nix

@@ -28,6 +28,9 @@ in
 
     programs.gpg = {
       enable = true;
+      scdaemonSettings = {
+        disable-ccid = true; # prevent conflicts between pcscd and scdameon
+      };
       publicKeys = [
         {
           source = "${self}/secrets/public/gpg/gpg-public-key-0x76FD3810215AE097.asc";

modules/home/common/nix-index.nix

@@ -1,4 +1,4 @@
-{ self, lib, config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 {
   options.swarselmodules.nix-index = lib.mkEnableOption "nix-index settings";
   config = lib.mkIf config.swarselmodules.nix-index {
@@ -6,7 +6,43 @@
       let
         commandNotFound = pkgs.runCommandLocal "command-not-found.sh" { } ''
           mkdir -p $out/etc/profile.d
-          substitute ${self + /files/scripts/command-not-found.sh}        \
+          cat > $out/etc/profile.d/command-not-found.sh <<'EOF'
+          # Adapted from https://github.com/bennofs/nix-index/blob/master/command-not-found.sh
+          command_not_found_handle() {
+              if [ -n "''${MC_SID-}" ] || ! [ -t 1 ]; then
+                  >&2 echo "$1: command not found"
+                  return 127
+              fi
+
+              echo -n "searching nix-index..."
+              ATTRS=$(@nix-locate@ --minimal --no-group --type x --type s --whole-name --at-root "/bin/$1")
+
+              case $(echo -n "$ATTRS" | grep -c "^") in
+              0)
+                  >&2 echo -ne "$(@tput@ el1)\r"
+                  >&2 echo "$1: command not found"
+                  ;;
+              *)
+                  >&2 echo -ne "$(@tput@ el1)\r"
+                  >&2 echo "The program ‘$(@tput@ setaf 4)$1$(@tput@ sgr0)’ is currently not installed."
+                  >&2 echo "It is provided by the following derivation(s):"
+                  while read -r ATTR; do
+                      ATTR=''${ATTR%.out}
+                      >&2 echo "  $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)"
+                  done <<< "$ATTRS"
+                  ;;
+              esac
+
+              return 127
+          }
+
+          command_not_found_handler() {
+              command_not_found_handle "$@"
+              return $?
+          }
+          EOF
+
+          substitute $out/etc/profile.d/command-not-found.sh        \
             $out/etc/profile.d/command-not-found.sh                 \
             --replace-fail @nix-locate@ ${pkgs.nix-index}/bin/nix-locate \
             --replace-fail @tput@ ${pkgs.ncurses}/bin/tput

modules/home/common/packages.nix

@@ -171,13 +171,12 @@
       })
 
       # font stuff
-      nerd-fonts.fira-mono
+      cantarell-fonts
       nerd-fonts.fira-code
+      (iosevka-bin.override { variant = "Aile"; })
       nerd-fonts.symbols-only
       noto-fonts-color-emoji
       font-awesome_5
-      noto-fonts
-      noto-fonts-cjk-sans
     ];
   };
 }

modules/nixos/client/hardwarecompatibility-yubikey.nix

@@ -8,7 +8,7 @@ in
   config = lib.mkIf config.swarselmodules.yubikey {
     programs.ssh.startAgent = false;
 
-    services.pcscd.enable = false;
+    services.pcscd.enable = true;
 
     hardware.gpgSmartcards.enable = true;
 

modules/nixos/optional/hibernation.nix

@@ -22,9 +22,9 @@
     };
     systemd.services."systemd-suspend-then-hibernate".aliases = [ "systemd-suspend.service" ];
     powerManagement.enable = true;
-    systemd.sleep.extraConfig = ''
+    systemd.sleep.settings.Sleep = {
-      HibernateDelaySec=120m
+      HibernateDelaySec = "120m";
-      SuspendState=freeze
+      SuspendState = "freeze";
-    '';
+    };
   };
 }

modules/nixos/optional/microvm-guest-shares.nix

@@ -1,4 +1,4 @@
-{ self, lib, config, inputs, microVMParent, nodes, ... }:
+{ lib, config, microVMParent, nodes, ... }:
 {
   config = {
     microvm = {

modules/nixos/server/disk-encrypt.nix

@@ -1,11 +1,5 @@
-{ self, pkgs, lib, config, globals, minimal, ... }:
+{ self, pkgs, lib, config, minimal, ... }:
 let
-  localIp = globals.networks.${config.swarselsystems.server.netConfigName}.hosts.${config.node.name}.ipv4;
-  subnetMask = globals.networks.${config.swarselsystems.server.netConfigName}.subnetMask4;
-  gatewayIp = globals.hosts.${config.node.name}.defaultGateway4;
-
-  inherit (globals.general) routerServer;
-  isRouter = config.node.name == routerServer;
 
   hostKeyPathBase = "/etc/secrets/initrd/ssh_host_ed25519_key";
   hostKeyPath =

modules/nixos/server/oauth2-proxy.nix

@@ -165,7 +165,7 @@ in
     services = {
       ${serviceName} = {
         enable = true;
-        package = pkgs.update.oauth2-proxy;
+        package = pkgs.oauth2-proxy;
         cookie = {
           domain = ".${mainDomain}";
           secure = true;

modules/nixos/server/postgresql.nix

@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, confLib, ... }:
+{ config, lib, pkgs, confLib, ... }:
 let
   inherit (confLib.gen { name = "postgresql"; port = 3254; }) serviceName;
   postgresVersion = 14;

modules/shared/vars.nix

@@ -37,23 +37,27 @@
           };
           serif = {
             # package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; });
-            package = pkgs.cantarell-fonts;
+            # package = pkgs.cantarell-fonts;
             # package = pkgs.montserrat;
-            name = "Cantarell";
+            # name = "Cantarell";
+            package = pkgs.iosevka-bin.override { variant = "Aile"; };
+            name = "Iosevka Aile";
             # name = "FiraCode Nerd Font Propo";
             # name = "Montserrat";
           };
           sansSerif = {
             # package = (pkgs.nerdfonts.override { fonts = [ "FiraMono" "FiraCode"]; });
-            package = pkgs.cantarell-fonts;
+            # package = pkgs.cantarell-fonts;
             # package = pkgs.montserrat;
-            name = "Cantarell";
+            # name = "Cantarell";
+            package = pkgs.iosevka-bin.override { variant = "Aile"; };
+            name = "Iosevka Aile";
             # name = "FiraCode Nerd Font Propo";
             # name = "Montserrat";
           };
           monospace = {
-            package = pkgs.nerd-fonts.fira-mono; # has overrides
+            package = pkgs.nerd-fonts.fira-code; # has overrides
-            name = "FiraCode Nerd Font Mono";
+            name = "FiraCode Nerd Font";
           };
           emoji = {
             package = pkgs.noto-fonts-color-emoji;

nix/overlays.nix

@@ -108,8 +108,6 @@ in
               "libreoffice"
               "libreoffice-qt"
               "nerd-fonts-symbols-only"
-              "noto-fonts"
-              "noto-fonts-cjk-sans"
               "noto-fonts-color-emoji"
               # "pipewire"
               "podman"

pkgs/flake/cdb/default.nix

@@ -1,5 +1,4 @@
 { name, writeShellApplication, fzf, ... }:
-
 writeShellApplication {
   inherit name;
   runtimeInputs = [ fzf ];

pkgs/flake/cdw/default.nix

@@ -1,5 +1,4 @@
 { name, writeShellApplication, fzf, ... }:
-
 writeShellApplication {
   inherit name;
   runtimeInputs = [ fzf ];

pkgs/flake/cura5/default.nix

@@ -1,7 +1,5 @@
 # taken from https://github.com/NixOS/nixpkgs/issues/186570#issuecomment-1627797219
 { appimageTools, fetchurl, writeScriptBin, pkgs, ... }:
-
-
 let
   cura5 = appimageTools.wrapType2 rec {
     pname = "cura5";

pkgs/flake/e/default.nix

@@ -1,6 +1,30 @@
-{ self, name, writeShellApplication, emacs30-pgtk, sway, jq }:
+{ name, writeShellApplication, emacs30-pgtk, sway, jq, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ emacs30-pgtk sway jq ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    wait=0
+    while :; do
+        case ''${1:-} in
+        -w | --wait)
+            wait=1
+            ;;
+        *) break ;;
+        esac
+        shift
+    done
+
+    STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
+    if [ "$STR" == "" ]; then
+        swaymsg '[title="kittyterm"]' scratchpad show
+        emacsclient -c -a "" "$@"
+        swaymsg '[title="kittyterm"]' scratchpad show
+    else
+        if [[ $wait -eq 0 ]]; then
+            emacsclient -n -c -a "" "$@"
+        else
+            emacsclient -c -a "" "$@"
+        fi
+    fi
+  '';
 }

pkgs/flake/fs-diff/default.nix

@@ -1,5 +1,26 @@
-{ self, name, writeShellApplication }:
+{ name, writeShellApplication, ... }:
 writeShellApplication {
   inherit name;
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    set -euo pipefail
+
+    OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
+    OLD_TRANSID=''${OLD_TRANSID#transid marker was }
+
+    sudo btrfs subvolume find-new "/mnt/root" "$OLD_TRANSID" |
+        sed '$d' |
+        cut -f17- -d' ' |
+        sort |
+        uniq |
+        while read -r path; do
+            path="/$path"
+            if [ -L "$path" ]; then
+                : # The path is a symbolic link, so is probably handled by NixOS already
+            elif [ -d "$path" ]; then
+                : # The path is a directory, ignore
+            else
+                echo "$path"
+            fi
+        done
+  '';
 }

pkgs/flake/hm-specialisation/default.nix

@@ -1,5 +1,4 @@
 { name, writeShellApplication, fzf, findutils, home-manager, ... }:
-
 writeShellApplication {
   inherit name;
   runtimeInputs = [ fzf findutils home-manager ];

pkgs/flake/niri-resize/default.nix

@@ -1,6 +1,18 @@
-{ self, name, writeShellApplication, jq }:
+{ name, writeShellApplication, jq, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ jq ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    WORKSPACE=$(niri msg -j workspaces | jq -r '.[] | select(.is_focused == true) | .id')
+
+    COUNT=$(niri msg -j windows | jq --argjson ws "$WORKSPACE" -r '.[] | select(.workspace_id == $ws and .is_floating == false) | .app_id' | wc -l)
+
+    while [[ $COUNT == "0" || $COUNT == "2" ]]; do
+        COUNT=$(niri msg -j windows | jq --argjson ws "$WORKSPACE" -r '.[] | select(.workspace_id == $ws and .is_floating == false) | .app_id' | wc -l)
+    done
+
+    if [[ $COUNT == "1" ]]; then
+        niri msg action maximize-column
+    fi
+  '';
 }

pkgs/flake/opacitytoggle/default.nix

@@ -1,6 +1,12 @@
-{ self, name, writeShellApplication, sway }:
+{ name, writeShellApplication, sway, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ sway ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    if swaymsg opacity plus 0.01 -q; then
+        swaymsg opacity 1
+    else
+        swaymsg opacity 0.95
+    fi
+  '';
 }

pkgs/flake/pass-fuzzel/default.nix

@@ -1,6 +1,58 @@
-{ self, name, writeShellApplication, libnotify, pass, fuzzel, wtype }:
+{ name, writeShellApplication, libnotify, pass, fuzzel, wtype, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ libnotify (pass.withExtensions (exts: [ exts.pass-otp ])) fuzzel wtype ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    # Adapted from https://code.kulupu.party/thesuess/home-manager/src/branch/main/modules/river.nix
+      shopt -s nullglob globstar
+
+      otp=0
+      typeit=0
+      while :; do
+          case ''${1:-} in
+          -t | --type)
+              typeit=1
+              ;;
+          -o | --otp)
+              otp=1
+              ;;
+          *) break ;;
+          esac
+          shift
+      done
+
+      export PASSWORD_STORE_DIR=~/.local/share/password-store
+      prefix=''${PASSWORD_STORE_DIR-~/.local/share/password-store}
+      if [[ $otp -eq 0 ]]; then
+          password_files=("$prefix"/**/*.gpg)
+      else
+          password_files=("$prefix"/otp/**/*.gpg)
+      fi
+      password_files=("''${password_files[@]#"$prefix"/}")
+      password_files=("''${password_files[@]%.gpg}")
+
+      password=$(printf '%s\n' "''${password_files[@]}" | fuzzel --dmenu "$@")
+
+      [[ -n $password ]] || exit
+      if [[ $otp -eq 0 ]]; then
+          if [[ $typeit -eq 0 ]]; then
+              pass show -c "$password" &> /tmp/pass-fuzzel
+          else
+              pass show "$password" | {
+                  IFS= read -r pass
+                  printf %s "$pass"
+              } | wtype -
+          fi
+      else
+          if [[ $typeit -eq 0 ]]; then
+              pass otp -c "$password" &> /tmp/pass-fuzzel
+          else
+              pass otp "$password" | {
+                  IFS= read -r pass
+                  printf %s "$pass"
+              } | wtype -
+          fi
+      fi
+      notify-send -u critical -a pass -t 1000 "Copied/Typed Password"
+  '';
 }

pkgs/flake/project/default.nix

@@ -1,5 +1,13 @@
-{ self, name, writeShellApplication }:
+{ name, writeShellApplication, ... }:
 writeShellApplication {
   inherit name;
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    set -euo pipefail
+
+    if [ ! -d "$(pwd)/.git" ]; then
+        git init
+    fi
+    nix flake init --template "$FLAKE"#"$1"
+    direnv allow
+  '';
 }

pkgs/flake/prstatus/default.nix

@@ -1,5 +1,4 @@
 { name, writeShellApplication, curl, ... }:
-
 writeShellApplication {
   inherit name;
   runtimeInputs = [ curl ];

pkgs/flake/quickpass/default.nix

@@ -1,6 +1,19 @@
-{ self, name, writeShellApplication, libnotify, pass, wtype }:
+{ name, writeShellApplication, libnotify, pass, wtype, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ libnotify pass wtype ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    shopt -s nullglob globstar
+
+    notify-send "$(env | grep -E 'WAYLAND|SWAY')"
+
+    password="$1"
+
+    pass show "$password" | {
+        IFS= read -r pass
+        printf %s "$pass"
+    } | wtype -
+
+    notify-send -u critical -a pass -t 1000 "Typed Password"
+  '';
 }

pkgs/flake/sshrm/default.nix

@@ -1,6 +1,18 @@
-{ self, name, writeShellApplication, openssh }:
+{ name, writeShellApplication, openssh, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ openssh ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    HISTFILE="$HOME"/.histfile
+
+    last_ssh_cmd=$(grep -E "ssh " "$HISTFILE" | sed -E 's/^: [0-9]+:[0-9]+;//' | grep "^ssh " | tail -1)
+    host=$(echo "$last_ssh_cmd" | sed -E 's/.*ssh ([^@ ]+@)?([^ ]+).*/\2/')
+
+    if [[ -n $host ]]; then
+        echo "Removing SSH host key for: $host"
+        ssh-keygen -R "$host"
+    else
+        echo "No valid SSH command found in history."
+    fi
+  '';
 }

pkgs/flake/swarsel-bootstrap/default.nix

@@ -1,6 +1,401 @@
-{ self, name, writeShellApplication, openssh }:
+{ name, writeShellApplication, openssh, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ openssh ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    # highly inspired by https://github.com/EmergentMind/nix-config/blob/dev/files/scripts/bootstrap-nixos.sh
+    set -eo pipefail
+
+    target_hostname=""
+    target_destination=""
+    target_arch=""
+    target_user="swarsel"
+    ssh_port="22"
+    persist_dir=""
+    disk_encryption=0
+    disk_encryption_args=""
+    no_disko_deps="false"
+    temp=$(mktemp -d)
+
+    function help_and_exit() {
+      echo
+      echo "Remotely installs SwarselSystem on a target machine including secret deployment."
+      echo
+      echo "USAGE: $0 -n <target_hostname> -d <target_destination> [OPTIONS]"
+      echo
+      echo "ARGS:"
+      echo "  -n <target_hostname>                    specify target_hostname of the target host to deploy the nixos config on."
+      echo "  -d <target_destination>                 specify ip or url to the target host."
+      echo "  -a <targeit_arch>                       specify the architecture of the target host."
+      echo "                                          target during install process."
+      echo
+      echo "OPTIONS:"
+      echo "  -u <target_user>                        specify target_user with sudo access. nix-config will be cloned to their home."
+      echo "                                          Default=''${target_user}."
+      echo "  --port <ssh_port>                       specify the ssh port to use for remote access. Default=''${ssh_port}."
+      echo "  --debug                                 Enable debug mode."
+      echo "  --no-disko-deps                         Upload only disk script and not dependencies (for use on low ram)."
+      echo "  -h | --help                             Print this help."
+      exit 0
+    }
+
+    function cleanup() {
+      rm -rf "$temp"
+      rm -rf /tmp/disko-password
+    }
+    trap cleanup exit
+
+    function red() {
+      echo -e "\x1B[31m[!] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[31m[!] $($2) \x1B[0m"
+      fi
+    }
+    function green() {
+      echo -e "\x1B[32m[+] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[32m[+] $($2) \x1B[0m"
+      fi
+    }
+    function yellow() {
+      echo -e "\x1B[33m[*] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[33m[*] $($2) \x1B[0m"
+      fi
+    }
+
+    function yes_or_no() {
+      echo -en "\x1B[32m[+] $* [y/n] (default: y): \x1B[0m"
+      while true; do
+        read -rp "" yn
+        yn=''${yn:-y}
+        case $yn in
+        [Yy]*) return 0 ;;
+        [Nn]*) return 1 ;;
+        esac
+      done
+    }
+
+    function update_sops_file() {
+      key_name=$1
+      key_type=$2
+      key=$3
+
+      if [ ! "$key_type" == "hosts" ] && [ ! "$key_type" == "users" ]; then
+        red "Invalid key type passed to update_sops_file. Must be either 'hosts' or 'users'."
+        exit 1
+      fi
+      cd "''${git_root}"
+
+      SOPS_FILE=".sops.yaml"
+      sed -i "{
+                                # Remove any * and & entries for this host
+                                /[*&]$key_name/ d;
+                                # Inject a new age: entry
+                                # n matches the first line following age: and p prints it, then we transform it while reusing the spacing
+                                /age:/{n; p; s/\(.*- \*\).*/\1$key_name/};
+                                # Inject a new hosts or user: entry
+                                /&$key_type/{n; p; s/\(.*- &\).*/\1$key_name $key/}
+                                }" $SOPS_FILE
+      green "Updating .sops.yaml"
+      cd -
+    }
+
+    while [[ $# -gt 0 ]]; do
+      case "$1" in
+      -n)
+        shift
+        target_hostname=$1
+        ;;
+      -d)
+        shift
+        target_destination=$1
+        ;;
+      -a)
+        shift
+        target_arch=$1
+        ;;
+      -u)
+        shift
+        target_user=$1
+        ;;
+      --port)
+        shift
+        ssh_port=$1
+        ;;
+      --no-disko-deps)
+        no_disko_deps="true"
+        ;;
+      --debug)
+        set -x
+        ;;
+      -h | --help) help_and_exit ;;
+      *)
+        echo "Invalid option detected."
+        help_and_exit
+        ;;
+      esac
+      shift
+    done
+
+    if [[ $target_arch == "" || $target_destination == "" || $target_hostname == "" ]]; then
+      red "error: target_arch, target_destination or target_hostname not set."
+      help_and_exit
+    fi
+
+    LOCKED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.node.lockFromBootstrapping)"
+    if [[ $LOCKED == "true" ]]; then
+      red "THIS SYSTEM IS LOCKED FROM BOOTSTRAPPING - set 'node.lockFromBootstrapping = lib.mkForce false;' to proceed"
+      exit
+    fi
+
+    green "~SwarselSystems~ remote installer"
+    green "Reading system information for $target_hostname ..."
+
+    DISK="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.rootDisk)"
+    green "Root Disk: $DISK"
+
+    CRYPTED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isCrypted)"
+    if [[ $CRYPTED == "true" ]]; then
+      green "Encryption: ✓"
+      disk_encryption=1
+      disk_encryption_args=(
+        --disk-encryption-keys
+        /tmp/disko-password
+        /tmp/disko-password
+      )
+    else
+      red "Encryption: X"
+      disk_encryption=0
+    fi
+
+    IMPERMANENCE="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isImpermanence)"
+    if [[ $IMPERMANENCE == "true" ]]; then
+      green "Impermanence: ✓"
+      persist_dir="/persist"
+    else
+      red "Impermanence: X"
+      persist_dir=""
+    fi
+
+    SWAP="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSwap)"
+    if [[ $SWAP == "true" ]]; then
+      green "Swap: ✓"
+    else
+      red "Swap: X"
+    fi
+
+    SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSecureBoot)"
+    if [[ $SECUREBOOT == "true" ]]; then
+      green "Secure Boot: ✓"
+    else
+      red "Secure Boot: X"
+    fi
+
+    ssh_cmd="ssh -oport=''${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -t $target_user@$target_destination"
+    # ssh_root_cmd=$(echo "$ssh_cmd" | sed "s|''${target_user}@|root@|") # uses @ in the sed switch to avoid it triggering on the $ssh_key value
+    ssh_root_cmd=''${ssh_cmd/''${target_user}@/root@}
+    scp_cmd="scp -oport=''${ssh_port} -o StrictHostKeyChecking=no"
+
+    if [[ -z ''${FLAKE} ]]; then
+      FLAKE=/home/"$target_user"/.dotfiles
+    fi
+    if [ ! -d "$FLAKE" ]; then
+      cd /home/"$target_user"
+      yellow "Flake directory not found - cloning repository from GitHub"
+      git clone git@github.com:Swarsel/.dotfiles.git || (yellow "Could not clone repository via SSH - defaulting to HTTPS" && git clone https://github.com/Swarsel/.dotfiles.git)
+      FLAKE=/home/"$target_user"/.dotfiles
+    fi
+
+    cd "$FLAKE"
+
+    rm install/flake.lock || true
+    git_root=$(git rev-parse --show-toplevel)
+    # ------------------------
+    green "Wiping known_hosts of $target_destination"
+    sed -i "/$target_hostname/d; /$target_destination/d" ~/.ssh/known_hosts
+    # ------------------------
+    green "Preparing a new ssh_host_ed25519_key pair for $target_hostname."
+    # Create the directory where sshd expects to find the host keys
+    install -d -m755 "$temp/$persist_dir/etc/ssh"
+    # Generate host ssh key pair without a passphrase
+    ssh-keygen -t ed25519 -f "$temp/$persist_dir/etc/ssh/ssh_host_ed25519_key" -C root@"$target_hostname" -N ""
+    # Set the correct permissions so sshd will accept the key
+    chmod 600 "$temp/$persist_dir/etc/ssh/ssh_host_ed25519_key"
+    echo "Adding ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
+    # This will fail if we already know the host, but that's fine
+    ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
+    # ------------------------
+    # when using luks, disko expects a passphrase on /tmp/disko-password, so we set it for now and will update the passphrase later
+    # via the config
+    if [ "$disk_encryption" -eq 1 ]; then
+      while true; do
+        green "Set disk encryption passphrase:"
+        read -rs luks_passphrase
+        green "Please confirm passphrase:"
+        read -rs luks_passphrase_confirm
+        if [[ $luks_passphrase == "$luks_passphrase_confirm" ]]; then
+          echo "$luks_passphrase" > /tmp/disko-password
+          $ssh_root_cmd "echo '$luks_passphrase' > /tmp/disko-password"
+          break
+        else
+          red "Passwords do not match"
+        fi
+      done
+    fi
+    # ------------------------
+    green "Generating hardware-config.nix for $target_hostname and adding it to the nix-config."
+    $ssh_root_cmd "nixos-generate-config --force --no-filesystems --root /mnt"
+
+    mkdir -p "$FLAKE"/hosts/nixos/"$target_arch"/"$target_hostname"
+    $scp_cmd root@"$target_destination":/mnt/etc/nixos/hardware-configuration.nix "''${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix
+    # ------------------------
+    green "Generating hostkey for ssh initrd"
+    $ssh_root_cmd "mkdir -p $temp/etc/secrets/initrd /etc/secrets/initrd"
+    $ssh_root_cmd "ssh-keygen -t ed25519 -N '''' -f $temp/etc/secrets/initrd/ssh_host_ed25519_key"
+    $ssh_root_cmd "cp $temp/etc/secrets/initrd/ssh_host_ed25519_key /etc/secrets/initrd/ssh_host_ed25519_key"
+    # ------------------------
+
+    green "Deploying minimal NixOS installation on $target_destination"
+
+    if [[ $no_disko_deps == "true" ]]; then
+      green "Building without disko dependencies (using custom kexec)"
+      nix run github:nix-community/nixos-anywhere/1.10.0 -- "''${disk_encryption_args[@]}" --no-disko-deps --ssh-port "$ssh_port" --extra-files "$temp" --flake ./install#"$target_hostname" --kexec "$(nix build --print-out-paths .#packages."$target_arch".swarsel-kexec)/swarsel-kexec-$target_arch.tar.gz" root@"$target_destination"
+    else
+      green "Building with disko dependencies (using nixos-images kexec)"
+      nix run github:nix-community/nixos-anywhere/1.10.0 -- "''${disk_encryption_args[@]}" --ssh-port "$ssh_port" --extra-files "$temp" --flake ./install#"$target_hostname" root@"$target_destination"
+    fi
+
+    echo "Updating ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
+    ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
+    # ------------------------
+
+    while true; do
+      read -rp "Press Enter to continue once the remote host has finished booting."
+      if nc -z "$target_destination" "''${ssh_port}" 2> /dev/null; then
+        green "$target_destination is booted. Continuing..."
+        break
+      else
+        yellow "$target_destination is not yet ready."
+      fi
+    done
+
+    # ------------------------
+
+    if [[ $SECUREBOOT == "true" ]]; then
+      green "Setting up secure boot keys"
+      $ssh_root_cmd "mkdir -p /var/lib/sbctl"
+      read -ra scp_call <<< "''${scp_cmd}"
+      sudo "''${scp_call[@]}" -r /var/lib/sbctl root@"$target_destination":/var/lib/
+      $ssh_root_cmd "sbctl enroll-keys --ignore-immutable --microsoft || true"
+    fi
+    # ------------------------
+
+    if [ -n "$persist_dir" ]; then
+      $ssh_root_cmd "cp /etc/machine-id $persist_dir/etc/machine-id || true"
+      $ssh_root_cmd "cp -R /etc/ssh/ $persist_dir/etc/ssh/ || true"
+    fi
+    # ------------------------
+    green "Generating an age key based on the new ssh_host_ed25519_key."
+    target_key=$(
+      ssh-keyscan -p "$ssh_port" -t ssh-ed25519 "$target_destination" 2>&1 |
+        grep ssh-ed25519 |
+        cut -f2- -d" " ||
+        (
+          red "Failed to get ssh key. Host down?"
+          exit 1
+        )
+    )
+    host_age_key=$(nix shell nixpkgs#ssh-to-age.out -c sh -c "echo $target_key | ssh-to-age")
+
+    if grep -qv '^age1' <<< "$host_age_key"; then
+      red "The result from generated age key does not match the expected format."
+      yellow "Result: $host_age_key"
+      yellow "Expected format: age1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      exit 1
+    else
+      echo "$host_age_key"
+    fi
+
+    green "Updating nix-secrets/.sops.yaml"
+    update_sops_file "$target_hostname" "hosts" "$host_age_key"
+    yellow ".sops.yaml has been updated. There may be superfluous entries, you might need to edit manually."
+    if yes_or_no "Do you want to manually edit .sops.yaml now?"; then
+      vim "''${git_root}"/.sops.yaml
+    fi
+    green "Updating all secrets files to reflect updates .sops.yaml"
+    sops updatekeys --yes --enable-local-keyservice "''${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/secrets/* || true
+    # --------------------------
+    green "Making ssh_host_ed25519_key available to home-manager for user $target_user"
+    sed -i "/$target_hostname/d; /$target_destination/d" ~/.ssh/known_hosts
+    $ssh_root_cmd "mkdir -p /home/$target_user/.ssh; chown -R $target_user:users /home/$target_user/.ssh/"
+    $scp_cmd root@"$target_destination":/etc/ssh/ssh_host_ed25519_key root@"$target_destination":/home/"$target_user"/.ssh/ssh_host_ed25519_key
+    $ssh_root_cmd "chown $target_user:users /home/$target_user/.ssh/ssh_host_ed25519_key"
+    # __________________________
+
+    if yes_or_no "Add ssh host fingerprints for git upstream repositories? (This is needed for building the full config)"; then
+      green "Adding ssh host fingerprints for git{lab,hub}"
+      $ssh_cmd "mkdir -p /home/$target_user/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com | tee /home/$target_user/.ssh/known_hosts"
+      $ssh_root_cmd "mkdir -p /root/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com | tee /root/.ssh/known_hosts"
+    fi
+    # --------------------------
+
+    if yes_or_no "Do you want to copy your full nix-config and nix-secrets to $target_hostname?"; then
+      green "Adding ssh host fingerprint at $target_destination to ~/.ssh/known_hosts"
+      ssh-keyscan -p "$ssh_port" "$target_destination" >> ~/.ssh/known_hosts || true
+      green "Copying full nix-config to $target_hostname"
+      cd "''${git_root}"
+      just sync "$target_user" "$target_destination"
+
+      if [ -n "$persist_dir" ]; then
+        $ssh_root_cmd "cp -r /home/$target_user/.dotfiles $persist_dir/.dotfiles || true"
+        $ssh_root_cmd "cp -r /home/$target_user/.ssh $persist_dir/.ssh || true"
+      fi
+
+      if yes_or_no "Do you want to rebuild immediately?"; then
+        green "Building nix-config for $target_hostname"
+        # yellow "Reminder: The password is 'setup'"
+        $ssh_root_cmd "mkdir -p /root/.local/share/nix/; printf '{\"extra-substituters\":{\"https://nix-community.cachix.org\":true,\"https://nix-community.cachix.org https://cache.ngi0.nixos.org/\":true},\"extra-trusted-public-keys\":{\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=\":true,\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=\":true}}' | tee /root/.local/share/nix/trusted-settings.json"
+        # $ssh_cmd -oForwardAgent=yes "cd .dotfiles && sudo nixos-rebuild --show-trace --flake .#$target_hostname switch"
+        store_path=$(nix build --no-link --print-out-paths .#nixosConfigurations."$target_hostname".config.system.build.toplevel)
+        green "Copying generation to $target_hostname"
+        nix copy --to "ssh://root@$target_destination" "$store_path"
+        # prev_system=$($ssh_root_cmd " readlink -e /nix/var/nix/profiles/system")
+        green "Linking generation in bootloader"
+        $ssh_root_cmd "/run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set $store_path"
+        green "Setting generation to activate upon next boot"
+        $ssh_root_cmd "$store_path/bin/switch-to-configuration boot"
+      else
+        echo
+        green "NixOS was successfully installed!"
+        echo "Post-install config build instructions:"
+        echo "To copy nix-config from this machine to the $target_hostname, run the following command from ~/nix-config"
+        echo "just sync $target_user $target_destination"
+        echo "To rebuild, sign into $target_hostname and run the following command from ~/nix-config"
+        echo "cd nix-config"
+        # see above FIXME:(bootstrap)
+        echo "sudo nixos-rebuild .pre-commit-config.yaml show-trace --flake .#$target_hostname switch"
+        # echo "just rebuild"
+        echo
+      fi
+    fi
+
+    green "NixOS was successfully installed!"
+    if yes_or_no "You can now commit and push the nix-config, which includes the hardware-configuration.nix for $target_hostname?"; then
+      cd "''${git_root}"
+      deadnix hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix -qe
+      nixpkgs--fmt hosts/nixos/"$target_arch"/"$target_hostname"/hardware-configuration.nix
+      (.pre-commit-config.yaml mit run --all-files 2> /dev/null || true) &&
+        git add "$git_root/hosts/nixos/$target_arch/$target_hostname/hardware-configuration.nix" &&
+        git add "$git_root/.sops.yaml" &&
+        git add "$git_root/secrets" &&
+        (git commit -m "feat: deployed $target_hostname" || true) && git push
+    fi
+
+    if yes_or_no "Reboot now?"; then
+      $ssh_root_cmd "reboot"
+    fi
+
+    rm -rf /tmp/disko-password
+  '';
 }

pkgs/flake/swarsel-displaypower/default.nix

@@ -1,6 +1,9 @@
-{ self, name, writeShellApplication, sway }:
+{ name, writeShellApplication, sway, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ sway ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    swaymsg "output * power on" > /dev/null 2>&1 || true
+    swaymsg "output * dpms on" > /dev/null 2>&1 || true
+  '';
 }

pkgs/flake/swarsel-install/default.nix

@@ -1,6 +1,195 @@
-{ self, name, writeShellApplication, git }:
+{ name, writeShellApplication, git, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ git ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    set -eo pipefail
+
+    target_config="hotel"
+    target_hostname="hotel"
+    target_user="swarsel"
+    target_arch=""
+    persist_dir=""
+    target_disk="/dev/vda"
+    disk_encryption=0
+
+    function help_and_exit() {
+      echo
+      echo "Locally installs SwarselSystem on this machine."
+      echo
+      echo "USAGE: $0 -n <target_config> -d <target_disk> [OPTIONS]"
+      echo
+      echo "ARGS:"
+      echo "  -n <target_config>                      specify the nixos config to deploy."
+      echo "                                          Default: hotel"
+      echo "  -d <target_disk>                        specify disk to install on."
+      echo "                                          Default: /dev/vda"
+      echo "  -u <target_user>                        specify user to deploy for."
+      echo "                                          Default: swarsel"
+      echo "  -a <target_arch>                        specify target architecture."
+      echo "  -h | --help                             Print this help."
+      exit 0
+    }
+
+    function red() {
+      echo -e "\x1B[31m[!] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[31m[!] $($2) \x1B[0m"
+      fi
+    }
+    function green() {
+      echo -e "\x1B[32m[+] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[32m[+] $($2) \x1B[0m"
+      fi
+    }
+    function yellow() {
+      echo -e "\x1B[33m[*] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[33m[*] $($2) \x1B[0m"
+      fi
+    }
+
+    while [[ $# -gt 0 ]]; do
+      case "$1" in
+      -n)
+        shift
+        target_config=$1
+        target_hostname=$1
+        ;;
+      -u)
+        shift
+        target_user=$1
+        ;;
+      -d)
+        shift
+        target_disk=$1
+        ;;
+      -a)
+        shift
+        target_arch=$1
+        ;;
+      -h | --help) help_and_exit ;;
+      *)
+        echo "Invalid option detected."
+        help_and_exit
+        ;;
+      esac
+      shift
+    done
+
+    function cleanup() {
+      sudo rm -rf .cache/nix
+      sudo rm -rf /root/.cache/nix
+    }
+    trap cleanup exit
+
+    if [[ $target_arch == "" || $target_hostname == "" ]]; then
+      red "error: target_arch or target_hostname not set."
+      help_and_exit
+    fi
+
+    green "~SwarselSystems~ local installer"
+
+    cd /home/"$target_user"
+
+    sudo rm -rf /root/.cache/nix
+    sudo rm -rf .cache/nix
+    sudo rm -rf .dotfiles
+
+    green "Cloning repository from GitHub"
+    git clone https://github.com/Swarsel/.dotfiles.git
+
+    local_keys=$(ssh-add -L || true)
+    pub_key=$(cat /home/"$target_user"/.dotfiles/secrets/public/ssh/yubikey.pub)
+    read -ra pub_arr <<< "$pub_key"
+
+    cd .dotfiles
+    if [[ $local_keys != *"''${pub_arr[1]}"* ]]; then
+      yellow "The ssh key for this configuration is not available."
+      green "Adjusting flake.nix so that the configuration is buildable ..."
+      sed -i '/vbc-nix = {/,/^[[:space:]]*};/d' flake.nix
+      sed -i '/[[:space:]]*\/\/ (inputs.vbc-nix.overlays.default final prev)/d' overlays/default.nix
+      nix flake update vbc-nix
+      git add .
+    else
+      green "Valid SSH key found! Continuing with installation"
+    fi
+
+    green "Reading system information for $target_config ..."
+    DISK="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.rootDisk)"
+    green "Root Disk in config: $DISK - Root Disk passed in cli: $target_disk"
+
+    CRYPTED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isCrypted)"
+    if [[ $CRYPTED == "true" ]]; then
+      green "Encryption: ✓"
+      disk_encryption=1
+    else
+      red "Encryption: X"
+      disk_encryption=0
+    fi
+
+    IMPERMANENCE="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isImpermanence)"
+    if [[ $IMPERMANENCE == "true" ]]; then
+      green "Impermanence: ✓"
+      persist_dir="/persist"
+    else
+      red "Impermanence: X"
+      persist_dir=""
+    fi
+
+    SWAP="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSwap)"
+    if [[ $SWAP == "true" ]]; then
+      green "Swap: ✓"
+    else
+      red "Swap: X"
+    fi
+
+    SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.swarselsystems.isSecureBoot)"
+    if [[ $SECUREBOOT == "true" ]]; then
+      green "Secure Boot: ✓"
+    else
+      red "Secure Boot: X"
+    fi
+
+    if [ "$disk_encryption" -eq 1 ]; then
+      while true; do
+        green "Set disk encryption passphrase:"
+        read -rs luks_passphrase
+        green "Please confirm passphrase:"
+        read -rs luks_passphrase_confirm
+        if [[ $luks_passphrase == "$luks_passphrase_confirm" ]]; then
+          echo "$luks_passphrase" > /tmp/disko-password
+          break
+        else
+          red "Passwords do not match"
+        fi
+      done
+    fi
+
+    green "Setting up disk ..."
+    if [[ $target_config == "hotel" ]]; then
+      sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/v1.10.0 -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks --arg diskDevice "$target_disk"
+    else
+      sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks
+    fi
+    sudo mkdir -p /mnt/"$persist_dir"/home/"$target_user"/
+    sudo cp -r /home/"$target_user"/.dotfiles /mnt/"$persist_dir"/home/"$target_user"/
+    sudo chown -R 1000:100 /mnt/"$persist_dir"/home/"$target_user"
+
+    green "Generating hardware configuration ..."
+    sudo nixos-generate-config --root /mnt --no-filesystems --dir /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/
+
+    git add /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/hardware-configuration.nix
+    sudo mkdir -p /root/.local/share/nix/
+    printf '{\"extra-substituters\":{\"https://nix-community.cachix.org\":true,\"https://nix-community.cachix.org https://cache.ngi0.nixos.org/\":true},\"extra-trusted-public-keys\":{\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=\":true,\"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=\":true}}' | sudo tee /root/.local/share/nix/trusted-settings.json > /dev/null
+    green "Installing flake $target_config"
+
+    store_path=$(nix build --no-link --print-out-paths .#nixosConfigurationsMinimal."$target_config".config.system.build.toplevel)
+    green "Linking generation in bootloader"
+    sudo "/run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set $store_path"
+    green "Setting generation to activate upon next boot"
+    sudo "$store_path/bin/switch-to-configuration boot"
+    green "Installation finished! Reboot to see changes"
+  '';
 }

pkgs/flake/swarsel-postinstall/default.nix

@@ -1,6 +1,79 @@
-{ self, name, writeShellApplication, git }:
+{ name, writeShellApplication, git, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ git ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    set -eo pipefail
+
+    target_config="hotel"
+    target_user="swarsel"
+
+    function help_and_exit() {
+      echo
+      echo "Locally installs SwarselSystem on this machine."
+      echo
+      echo "USAGE: $0 -d <disk> [OPTIONS]"
+      echo
+      echo "ARGS:"
+      echo "  -d <disk>                               specify disk to install on."
+      echo "  -n <target_config>                      specify the nixos config to deploy."
+      echo "                                          Default: hotel"
+      echo "                                          Default: hotel"
+      echo "  -u <target_user>                        specify user to deploy for."
+      echo "                                          Default: swarsel"
+      echo "  -h | --help                             Print this help."
+      exit 0
+    }
+
+    function green() {
+      echo -e "\x1B[32m[+] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[32m[+] $($2) \x1B[0m"
+      fi
+    }
+
+    while [[ $# -gt 0 ]]; do
+      case "$1" in
+      -n)
+        shift
+        target_config=$1
+        ;;
+      -u)
+        shift
+        target_user=$1
+        ;;
+      -h | --help) help_and_exit ;;
+      *)
+        echo "Invalid option detected."
+        help_and_exit
+        ;;
+      esac
+      shift
+    done
+
+    function cleanup() {
+      sudo rm -rf .cache/nix
+      sudo rm -rf /root/.cache/nix
+    }
+    trap cleanup exit
+
+    sudo rm -rf .cache/nix
+    sudo rm -rf /root/.cache/nix
+
+    green "~SwarselSystems~ remote post-installer"
+
+    cd /home/"$target_user"/.dotfiles
+
+    SECUREBOOT="$(nix eval ~/.dotfiles#nixosConfigurations."$target_config".config.swarselsystems.isSecureBoot)"
+
+    if [[ $SECUREBOOT == "true" ]]; then
+      green "Setting up secure boot keys"
+      sudo mkdir -p /var/lib/sbctl
+      sbctl create-keys || true
+      sbctl enroll-keys --ignore-immutable --microsoft || true
+    fi
+
+    sudo nixos-rebuild --flake .#"$target_config" switch
+    green "Post-install finished!"
+  '';
 }

pkgs/flake/swarsel-rebuild/default.nix

@@ -1,6 +1,117 @@
-{ self, name, writeShellApplication, git }:
+{ name, writeShellApplication, git, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ git ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    set -eo pipefail
+
+    target_config="hotel"
+    target_arch=""
+    target_user="swarsel"
+
+    function help_and_exit() {
+      echo
+      echo "Builds SwarselSystem configuration."
+      echo
+      echo "USAGE: $0 [OPTIONS]"
+      echo
+      echo "ARGS:"
+      echo "  -n <target_config>                      specify nixos config to build."
+      echo "                                          Default: hotel"
+      echo "  -u <target_user>                        specify user to deploy for."
+      echo "                                          Default: swarsel"
+      echo "  -a <target_arch>                        specify target architecture."
+      echo "  -h | --help                             Print this help."
+      exit 0
+    }
+
+    function red() {
+      echo -e "\x1B[31m[!] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[31m[!] $($2) \x1B[0m"
+      fi
+    }
+    function green() {
+      echo -e "\x1B[32m[+] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[32m[+] $($2) \x1B[0m"
+      fi
+    }
+    function yellow() {
+      echo -e "\x1B[33m[*] $1 \x1B[0m"
+      if [ -n "''${2-}" ]; then
+        echo -e "\x1B[33m[*] $($2) \x1B[0m"
+      fi
+    }
+
+    while [[ $# -gt 0 ]]; do
+      case "$1" in
+      -n)
+        shift
+        target_config=$1
+        ;;
+      -a)
+        shift
+        target_arch=$1
+        ;;
+      -u)
+        shift
+        target_user=$1
+        ;;
+      -h | --help) help_and_exit ;;
+      *)
+        echo "Invalid option detected."
+        help_and_exit
+        ;;
+      esac
+      shift
+    done
+
+    if [[ $target_arch == "" ]]; then
+      red "error: target_arch not set."
+      help_and_exit
+    fi
+
+    cd /home/"$target_user"
+
+    if [ ! -d /home/"$target_user"/.dotfiles ]; then
+      green "Cloning repository from GitHub"
+      git clone https://github.com/Swarsel/.dotfiles.git
+    else
+      red "A .dotfiles repository is in the way. Please (re-)move the repository and try again."
+      exit 1
+    fi
+
+    local_keys=$(ssh-add -L || true)
+    pub_key=$(cat /home/"$target_user"/.dotfiles/secrets/public/ssh/yubikey.pub)
+    read -ra pub_arr <<< "$pub_key"
+
+    cd .dotfiles
+    if [[ $local_keys != *"''${pub_arr[1]}"* ]]; then
+      yellow "The ssh key for this configuration is not available."
+      green "Adjusting flake.nix so that the configuration is buildable"
+      sed -i '/nix-secrets = {/,/^[[:space:]]*};/d' flake.nix
+      sed -i '/vbc-nix = {/,/^[[:space:]]*};/d' flake.nix
+      sed -i '/[[:space:]]*\/\/ (inputs.vbc-nix.overlays.default final prev)/d' overlays/default.nix
+      rm modules/home/common/env.nix
+      rm modules/home/common/gammastep.nix
+      rm modules/home/common/git.nix
+      rm modules/home/common/mail.nix
+      rm modules/home/common/yubikey.nix
+      rm modules/nixos/server/restic.nix
+      rm hosts/nixos/aarch64-linux/milkywell/default.nix
+      rm -rf modules/nixos/server
+      rm -rf modules/home/server
+      nix flake update vbc-nix
+      git add .
+    else
+      green "Valid SSH key found! Continuing with installation"
+    fi
+    sudo nixos-generate-config --dir /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/
+    git add /home/"$target_user"/.dotfiles/hosts/nixos/"$target_arch"/"$target_config"/hardware-configuration.nix
+
+    green "Installing flake $target_config"
+    sudo nixos-rebuild --show-trace --flake .#"$target_config" boot
+    yellow "Please keep in mind that this is only a demo of the configuration. Things might break unexpectedly."
+  '';
 }

pkgs/flake/swarselcheck-niri/default.nix

@@ -1,4 +1,4 @@
-{ self, name, writeShellApplication, kitty, element-desktop, vesktop, spotify-player, jq }:
+{ self, name, writeShellApplication, kitty, element-desktop, vesktop, spotify-player, jq, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ kitty element-desktop vesktop spotify-player jq ];

pkgs/flake/swarselcheck/default.nix

@@ -1,6 +1,69 @@
-{ self, name, writeShellApplication, kitty, element-desktop, vesktop, spotify-player, jq }:
+{ name, writeShellApplication, kitty, element-desktop, vesktop, spotify-player, jq, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ kitty element-desktop vesktop spotify-player jq ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    kitty=0
+    element=0
+    vesktop=0
+    spotifyplayer=0
+    while :; do
+      case ''${1:-} in
+      -k | --kitty)
+        kitty=1
+        ;;
+      -e | --element)
+        element=1
+        ;;
+      -d | --vesktop)
+        vesktop=1
+        ;;
+      -s | --spotifyplayer)
+        spotifyplayer=1
+        ;;
+      *) break ;;
+      esac
+      shift
+    done
+
+    if [[ $kitty -eq 1 ]]; then
+      STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
+      CHECK=$(swaymsg -t get_tree | grep kittyterm || true)
+      if [ "$CHECK" == "" ]; then
+        exec kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm &
+        sleep 1
+      fi
+      if [ "$STR" == "" ]; then
+        exec swaymsg '[title="kittyterm"]' scratchpad show
+      else
+        exec swaymsg '[title="kittyterm"]' scratchpad show
+      fi
+    elif [[ $element -eq 1 ]]; then
+      STR=$(swaymsg -t get_tree | grep Element || true)
+      if [ "$STR" == "" ]; then
+        exec element-desktop
+      else
+        exec swaymsg '[app_id=Element]' kill
+      fi
+    elif [[ $vesktop -eq 1 ]]; then
+      STR=$(swaymsg -t get_tree | grep vesktop || true)
+      if [ "$STR" == "" ]; then
+        exec vesktop
+      else
+        exec swaymsg '[app_id=vesktop]' kill
+      fi
+    elif [[ $spotifyplayer -eq 1 ]]; then
+      STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true)
+      CHECK=$(swaymsg -t get_tree | grep spotifytui || true)
+      if [ "$CHECK" == "" ]; then
+        exec kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player &
+        sleep 1
+      fi
+      if [ "$STR" == "" ]; then
+        exec swaymsg '[title="spotifytui"]' scratchpad show
+      else
+        exec swaymsg '[title="spotifytui"]' scratchpad show
+      fi
+    fi
+  '';
 }

pkgs/flake/swarselzellij/default.nix

@@ -1,6 +1,15 @@
-{ self, name, writeShellApplication, kitty }:
+{ name, writeShellApplication, kitty, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ kitty ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    # KITTIES=$(($(pgrep -P 1 kitty | wc -l) - 1))
+
+    # if ((KITTIES < 1)); then
+    #     exec kitty -o confirm_os_window_close=0 zellij attach --create main
+    # else
+    #     exec kitty -o confirm_os_window_close=0 zellij attach --create "temp $KITTIES"
+    # fi
+    exec kitty -o confirm_os_window_close=0 zellij
+  '';
 }

pkgs/flake/waybarupdate/default.nix

@@ -1,6 +1,31 @@
-{ self, name, writeShellApplication, git }:
+{ name, writeShellApplication, git, ... }:
 writeShellApplication {
   inherit name;
   runtimeInputs = [ git ];
-  text = builtins.readFile "${self}/files/scripts/${name}.sh";
+  text = ''
+    CFG=$(git --git-dir="$HOME"/.dotfiles/.git --work-tree="$HOME"/.dotfiles/ status -s | wc -l)
+    CSE=$(git --git-dir="$DOCUMENT_DIR_PRIV"/CSE_TUWIEN/.git --work-tree="$DOCUMENT_DIR_PRIV"/CSE_TUWIEN/ status -s | wc -l)
+    PASS=$(($(git --git-dir="$HOME"/.local/share/password-store/.git --work-tree="$HOME"/.local/share/password-store/ status -s | wc -l) + $(git --git-dir="$HOME"/.local/share/password-store/.git --work-tree="$HOME"/.local/share/password-store/ diff origin/main..HEAD | wc -l)))
+
+    if [[ $CFG != 0 ]]; then
+        CFG_STR='CONFIG'
+    else
+        CFG_STR=""
+    fi
+
+    if [[ $CSE != 0 ]]; then
+        CSE_STR=' CSE'
+    else
+        CSE_STR=""
+    fi
+
+    if [[ $PASS != 0 ]]; then
+        PASS_STR=' PASS'
+    else
+        PASS_STR=""
+    fi
+
+    OUT="$CFG_STR""$CSE_STR""$PASS_STR"
+    echo "$OUT"
+  '';
 }