From 28fc9fcbf2a457cceeb1b125041790dc2597455e Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:23:15 +0200
Subject: [PATCH 01/25] Add littler helper script

---
 home-manager/profiles/desktop.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix
index 2fdc7c7..aca03db 100644
--- a/home-manager/profiles/desktop.nix
+++ b/home-manager/profiles/desktop.nix
@@ -1,4 +1,14 @@
 { inputs, pkgs, ... }:
+let
+  az-media = pkgs.writeShellScriptBin "az-media" ''
+    videos="videos"
+    directory="''${1:-videos}"
+    for i in $(seq 1 4);
+    do
+        nvidia-offload mpv --shuffle "/run/media/andreas/e7c05e7e-79ec-45af-b1c8-840020fcf708/$directory/" &
+    done
+  '';
+in
 {
   imports = [
     "${inputs.self}/home-manager/modules"
@@ -13,6 +23,7 @@
       shotwell
       sound-juicer
       unstable.tagger
+      az-media
     ];
   };
 

From a374a792ecb04ea08192530551f09f5041575ddd Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:23:22 +0200
Subject: [PATCH 02/25] Change keybindings for denote

---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index 6562019..b8b70e8 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -1,7 +1,7 @@
 (use-package denote
   :bind
-  (("C-c n r" . denote-rename-file)
-   ("C-c n n" . denote-create-file))
+  (("C-c C-n r" . denote-rename-file)
+   ("C-c C-n n" . denote-create-file))
   :config
   (setq denote-file-type "markdown-yaml"
         denote-directory "~/nextcloud/10_documents/"))

From cb804313d0da5164c6b9b6cd22f6260b0fdd3970 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:27:04 +0200
Subject: [PATCH 03/25] Remove unused packges

---
 shell.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/shell.nix b/shell.nix
index 21517ed..26173a7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,25 +1,11 @@
 { pkgs ? import <nixpkgs> { } }:
-let
-  nix-refactor = pkgs.writeShellScriptBin "nix-refactor" ''
-    origin=$(${pkgs.coreutils-full}/bin/readlink /run/current-system)
-    result=$(${pkgs.lib.getExe pkgs.nixos-rebuild} build && ${pkgs.coreutils-full}/bin/readlink result)
-    ${pkgs.diffutils}/bin/diff -q <(echo "$origin" ) <(echo "$result")
-    rm ./result
-  '';
-in
 pkgs.mkShell {
   name = "nixosbuildshell";
   nativeBuildInputs = with pkgs; [
     git
     nixFlakes
-    nix-refactor
     python3
-    python310Packages.autopep8
-    python310Packages.black
-    python310Packages.flake8
-    python310Packages.jedi
-    python310Packages.pip
-    python310Packages.yapf
+    python310Packages.pylint
     vim
   ];
 

From b90759841cce0a78aff2998e83a94ed75687364c Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:27:35 +0200
Subject: [PATCH 04/25] Remove requirements.txt

---
 requirements.txt | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index af82025..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-pep8
-rope
-pylint
-autopep8
-yapf
-black
-flake8

From d421ed271f9161602db7f1dd23ad3f5667880f52 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:29:02 +0200
Subject: [PATCH 05/25] Replace python shebang with nix-shell shebang

---
 scripts/format-disk.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 scripts/format-disk.py

diff --git a/scripts/format-disk.py b/scripts/format-disk.py
old mode 100644
new mode 100755
index c06dc5d..cd6b5fd
--- a/scripts/format-disk.py
+++ b/scripts/format-disk.py
@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3
+
 import getpass
 import os
 import subprocess

From 5a3fdff38883c3329bb893d8f7943d15be96c74b Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 22 Jul 2023 14:33:00 +0200
Subject: [PATCH 06/25] Update README

---
 README.md | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 5e2a2fa..575bf72 100644
--- a/README.md
+++ b/README.md
@@ -4,19 +4,6 @@ This repository contains my configuration for my Nixos systems.
 I don't provide any garantuees that it will work on other systems.
 In addition some of the scripts required for installation will destroy your data when used.
 
-## VM installation
-
-This allows you to setup a VM with minimal effort.
-However this requires some prerequisites.
-
-- A VM running the minimal NixOS ISO reachable with SSH under nixos@nixos.2li.local.
-- The VM runs UEFI.
-- You've set a password for the nixos user.
-
-1. `./scripts/install_new_vm.sh`
-2. Provide the required information and wait until the script is finished.
-3. Reboot and profit!
-
 ## Raspberry Pi installation
 
 1. Add the new system to `flake.nix`.
@@ -34,14 +21,13 @@ However this requires some prerequisites.
 
 1. `curl https://git.2li.ch/Nebucatnetzer/nixos/archive/master.tar.gz | tar xz`
 2. `cd nixos && nix-shell`
-3. `sudo python3 scripts/format-disk.py`
+3. `sudo ./scripts/format-disk.py`
 4. `sudo nixos-install --no-root-passwd --root /mnt --impure --flake .#SYSTEMNAME`
 
 ## Update remote systems
 
-Simply run the script `scripts/update_all_systems.xsh` and it will iterate over
-all defined systems.
-The script requires Xonsh but can be easily adapted to BASH or similar.
+Simply run the script `scripts/remote_switch.sh` and it will iterate over
+all defined systems. With the option `-r` the systems will reboot as well.
 
 ## Non-Nixos System
 

From 6a9ae427a9e66c8b99fd4f307d3c648bab89fa07 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 10:34:27 +0200
Subject: [PATCH 07/25] Mute MPV

---
 home-manager/profiles/desktop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix
index aca03db..34d260c 100644
--- a/home-manager/profiles/desktop.nix
+++ b/home-manager/profiles/desktop.nix
@@ -5,7 +5,7 @@ let
     directory="''${1:-videos}"
     for i in $(seq 1 4);
     do
-        nvidia-offload mpv --shuffle "/run/media/andreas/e7c05e7e-79ec-45af-b1c8-840020fcf708/$directory/" &
+        nvidia-offload mpv --shuffle --mute=yes "/run/media/andreas/e7c05e7e-79ec-45af-b1c8-840020fcf708/$directory/" &
     done
   '';
 in

From 984746ef5c29252614d788176a7058c4d32bf028 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:16:05 +0200
Subject: [PATCH 08/25] Use ripgrep if possible with emacs

---
 .../modules/programs/emacs/emacs.d/lib/az_various.el        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
index d5784a6..2d9ccf4 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
@@ -56,3 +56,9 @@
 
 ;; switch focus to man page
 (setq man-notify-method t)
+
+;; use ripgrep or rg if possible
+(setq xref-search-program (cond ((or (executable-find "ripgrep")
+                                     (executable-find "rg")) 'ripgrep)
+                                ((executable-find "ugrep") 'ugrep) (t
+                                                                    'grep)))

From 0e657ed65d7ebf4bda00cb4aad29a89a1547f06f Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:24:58 +0200
Subject: [PATCH 09/25] Add function to create a note from a region

---
 .../modules/programs/emacs/emacs.d/lib/az_denote.el  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index b8b70e8..d00e9ba 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -1,7 +1,19 @@
 (use-package denote
   :bind
   (("C-c C-n r" . denote-rename-file)
+   ("C-c C-n p" . az-denote-create-new-note-from-region)
    ("C-c C-n n" . denote-create-file))
   :config
+  (defun az-denote-create-new-note-from-region (beg end)
+    "Create note whose contents include the text between BEG and END. Prompt
+    for title and keywords of the new note."
+    (interactive "r")
+    (if-let (((region-active-p))
+             (text
+              (buffer-substring-no-properties beg end)))
+        (progn (denote
+                (denote-title-prompt) (denote-keywords-prompt)) (insert text))
+      (user-error
+       "No region is available")))
   (setq denote-file-type "markdown-yaml"
         denote-directory "~/nextcloud/10_documents/"))

From afe6bbf5cdcb8b76905befcad6999c6b948af8ce Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:26:03 +0200
Subject: [PATCH 10/25] Rename denote buffers

---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index d00e9ba..0750cfa 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -15,5 +15,6 @@
                 (denote-title-prompt) (denote-keywords-prompt)) (insert text))
       (user-error
        "No region is available")))
-  (setq denote-file-type "markdown-yaml"
+  (setq denote-rename-buffer-mode 1
+        denote-file-type "markdown-yaml"
         denote-directory "~/nextcloud/10_documents/"))

From 64c54579f822221473ad11db90e35bed7c8c9e4e Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:27:14 +0200
Subject: [PATCH 11/25] Exclude the archive

---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index 0750cfa..7cf2b79 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -16,5 +16,6 @@
       (user-error
        "No region is available")))
   (setq denote-rename-buffer-mode 1
+        denote-excluded-directories-regexp "99_archive"
         denote-file-type "markdown-yaml"
         denote-directory "~/nextcloud/10_documents/"))

From e76959e0d0c97e8d5ed7a45ad4c3ca3fffdb87a0 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:35:09 +0200
Subject: [PATCH 12/25] Make denote links clickable

---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index 7cf2b79..14911a5 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -15,6 +15,7 @@
                 (denote-title-prompt) (denote-keywords-prompt)) (insert text))
       (user-error
        "No region is available")))
+  (add-hook 'find-file-hook #'denote-link-buttonize-buffer)
   (setq denote-rename-buffer-mode 1
         denote-excluded-directories-regexp "99_archive"
         denote-file-type "markdown-yaml"

From 5c194c49dd5204978c1e61320b5252ed37346144 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:49:09 +0200
Subject: [PATCH 13/25] Fix autoloading emacs packages

---
 .../modules/programs/emacs/emacs.d/lib/az_various.el       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
index 2d9ccf4..f4e776e 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_various.el
@@ -62,3 +62,10 @@
                                      (executable-find "rg")) 'ripgrep)
                                 ((executable-find "ugrep") 'ugrep) (t
                                                                     'grep)))
+
+;; required for autoloading packages on nixos
+(dolist (path load-path)
+  (when (string-match-p "/nix/store/[a-z0-9]\\{32\\}-emacs-packages-deps.*" path)
+    (dolist (autoload-file (directory-files path t "-autoloads.el"))
+      (with-demoted-errors "init.el error: %s"
+        (load autoload-file nil t)))))

From 5d02b4275c98b29701130537b2d00ef40690ce72 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:49:23 +0200
Subject: [PATCH 14/25] Actually enable the denote module

---
 home-manager/modules/programs/emacs/emacs.d/modules.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/modules/programs/emacs/emacs.d/modules.el b/home-manager/modules/programs/emacs/emacs.d/modules.el
index 9bbad03..2b77a92 100644
--- a/home-manager/modules/programs/emacs/emacs.d/modules.el
+++ b/home-manager/modules/programs/emacs/emacs.d/modules.el
@@ -17,6 +17,7 @@
 ;; note taking and writing
 (load-file (modules-path "az_deft_raw.el"))
 (load-file (modules-path "az_deft.el"))
+(load-file (modules-path "az_denote.el"))
 (load-file (modules-path "az_hyperbole.el"))
 (load-file (modules-path "az_langtool.el"))
 (load-file (modules-path "az_markdown.el"))

From 6f20d591d7efedb2216b39976cf5b753d8a77df7 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 22:58:14 +0200
Subject: [PATCH 15/25] Use correct function for denote

---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index 14911a5..b8c6b99 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -2,7 +2,7 @@
   :bind
   (("C-c C-n r" . denote-rename-file)
    ("C-c C-n p" . az-denote-create-new-note-from-region)
-   ("C-c C-n n" . denote-create-file))
+   ("C-c C-n n" . denote))
   :config
   (defun az-denote-create-new-note-from-region (beg end)
     "Create note whose contents include the text between BEG and END. Prompt

From 02a9d23130ec24939ccba61fdcd648682897a7a5 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 23 Jul 2023 23:07:04 +0200
Subject: [PATCH 16/25] Correct keybinding for denote

C-c C-n is already used by markdown mode
---
 .../modules/programs/emacs/emacs.d/lib/az_denote.el         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index b8c6b99..0a48427 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -1,8 +1,8 @@
 (use-package denote
   :bind
-  (("C-c C-n r" . denote-rename-file)
-   ("C-c C-n p" . az-denote-create-new-note-from-region)
-   ("C-c C-n n" . denote))
+  (("C-c n r" . denote-rename-file)
+   ("C-c n p" . az-denote-create-new-note-from-region)
+   ("C-c n n" . denote))
   :config
   (defun az-denote-create-new-note-from-region (beg end)
     "Create note whose contents include the text between BEG and END. Prompt

From ca57eefd6f0d7eeeb68f7cf92e2754594180a1d6 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 11:13:03 +0200
Subject: [PATCH 17/25] Enable support for apfs

---
 systems/gwyn/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/systems/gwyn/default.nix b/systems/gwyn/default.nix
index 5d25290..36c2c6a 100644
--- a/systems/gwyn/default.nix
+++ b/systems/gwyn/default.nix
@@ -26,6 +26,9 @@
 
   # Required to build aarch64 packages
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+  boot = {
+    supportedFilesystems = [ "apfs" "ext4" "nfs" "nfs4" "ntfs" "cifs" ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";

From 617a1c9b3fd76cce5d43e95f8d8bc25a7ef661b6 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 11:13:15 +0200
Subject: [PATCH 18/25] Remove the spaces from the denote frontmatter

Otherwise the notes get reformatted every time by prettier.
---
 home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
index 0a48427..598ec71 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el
@@ -19,4 +19,5 @@
   (setq denote-rename-buffer-mode 1
         denote-excluded-directories-regexp "99_archive"
         denote-file-type "markdown-yaml"
-        denote-directory "~/nextcloud/10_documents/"))
+        denote-directory "~/nextcloud/10_documents/"
+        denote-yaml-front-matter "---\ntitle: %s\ndate: %s\ntags: %s\nidentifier: %S\n---\n\n"))

From 5922e2be3e92da55d85958d93ff8dfd0f0085a4a Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 11:15:31 +0200
Subject: [PATCH 19/25] Update flake

---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index d117d63..effb60d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689334118,
-        "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
+        "lastModified": 1690228878,
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1689320556,
-        "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
+        "lastModified": 1690704397,
+        "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
+        "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689431009,
-        "narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=",
+        "lastModified": 1690726002,
+        "narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66",
+        "rev": "391e8db1f06c3f74c2d313a73135515023af3993",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1689534811,
-        "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=",
+        "lastModified": 1690789960,
+        "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222",
+        "rev": "fb942492b7accdee4e6d17f5447091c65897dde4",
         "type": "github"
       },
       "original": {

From 404406e648aa63c7f2d92d419406bfc88f05f6e6 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 14:39:57 +0200
Subject: [PATCH 20/25] Remove external drive from management

---
 systems/management/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/systems/management/default.nix b/systems/management/default.nix
index 6cd602f..860fd8a 100644
--- a/systems/management/default.nix
+++ b/systems/management/default.nix
@@ -1,13 +1,5 @@
 { hostname }: { inputs, ... }:
 {
-  fileSystems = {
-    "/mnt/external" = {
-      device = "/dev/disk/by-uuid/F73C-AA4F";
-      fsType = "exfat";
-      options = [ "x-systemd.automount" "noauto" "noatime" "uid=1000" "gid=100" ];
-    };
-  };
-
   hardware = {
     az-raspi4-ethernet = {
       enable = true;

From 568c89b95becc0849d2802d7d0b636e8c7eb982c Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 18:30:13 +0200
Subject: [PATCH 21/25] Remove zetteldeft from Emacs

---
 home-manager/modules/programs/emacs/default.nix            | 1 -
 home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/home-manager/modules/programs/emacs/default.nix b/home-manager/modules/programs/emacs/default.nix
index 0d1b27b..ca5cf07 100644
--- a/home-manager/modules/programs/emacs/default.nix
+++ b/home-manager/modules/programs/emacs/default.nix
@@ -106,7 +106,6 @@ in
         epkgs.xclip
         epkgs.yaml-mode
         epkgs.yasnippet-snippets
-        epkgs.zetteldeft
         languagetool
         mu # needed for mailing
         rufo # formatter for Ruby
diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el
index 33c0666..397e5d2 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el
@@ -31,10 +31,3 @@
     (interactive)
     (persp-switch "notes")
     (deft)))
-
-(use-package zetteldeft
-  :after deft
-  :config (zetteldeft-set-classic-keybindings)
-  (setq zetteldeft-link-indicator "[["
-        zetteldeft-link-suffix "]]")
-  (setq zetteldeft-title-prefix "# "))

From f4a952dd597a2025038dd80bd3e622d12b28f3e8 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 21:35:07 +0200
Subject: [PATCH 22/25] Update gitea

---
 modules/services/gitea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/gitea/default.nix b/modules/services/gitea/default.nix
index c4ea2a0..8a432b9 100644
--- a/modules/services/gitea/default.nix
+++ b/modules/services/gitea/default.nix
@@ -24,7 +24,7 @@ in
       containers."gitea" = {
         # https://blog.gitea.io/
         # https://hub.docker.com/r/gitea/gitea/tags
-        image = "gitea/gitea:1.19.4";
+        image = "gitea/gitea:1.20.2";
         autoStart = true;
         environment = {
           PUID = "1000";

From f2a47627453b79620edb1b8ea31c7f86cc10d103 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 21:37:11 +0200
Subject: [PATCH 23/25] Update plex

---
 modules/services/plex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/plex/default.nix b/modules/services/plex/default.nix
index 5ea8850..3906d17 100644
--- a/modules/services/plex/default.nix
+++ b/modules/services/plex/default.nix
@@ -31,7 +31,7 @@ in
       containers."plex" = {
         autoStart = true;
         # https://fleet.linuxserver.io/image?name=linuxserver/plex
-        image = "lscr.io/linuxserver/plex:1.32.4";
+        image = "lscr.io/linuxserver/plex:1.32.5";
         environment = {
           TZ = " Europe/Zurich ";
           PUID = "1000";

From 9d9eece8e0b9e3a30b3722b737347b698339a647 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 21:37:41 +0200
Subject: [PATCH 24/25] Update rss-brige

---
 modules/services/rss-bridge/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/rss-bridge/default.nix b/modules/services/rss-bridge/default.nix
index 35c5070..f88cab1 100644
--- a/modules/services/rss-bridge/default.nix
+++ b/modules/services/rss-bridge/default.nix
@@ -15,7 +15,7 @@ in
       backend = "docker";
       containers."rss-bridge" = {
         # https://hub.docker.com/r/rssbridge/rss-bridge/tags
-        image = "rssbridge/rss-bridge@sha256:a3620a5f39673ea6fc6e2d0ea99164174b542823cd593bd26564e92ef92d0676";
+        image = "rssbridge/rss-bridge@sha256:31d2e27f40b10291f0f2091cb3942fbb0754313dc57fe7c836bccbcab9c893ea";
         autoStart = true;
         ports = [
           "8082:80"

From 80a05aaea7a4fbaafb6de197a1682dd93af20c15 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Tue, 1 Aug 2023 21:42:34 +0200
Subject: [PATCH 25/25] Update ttrss

---
 modules/services/ttrss-postgres/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttrss-postgres/default.nix b/modules/services/ttrss-postgres/default.nix
index 11e68fe..0390e84 100644
--- a/modules/services/ttrss-postgres/default.nix
+++ b/modules/services/ttrss-postgres/default.nix
@@ -11,7 +11,7 @@ let
     TTRSS_PLUGINS = "af_comics, af_readability, auth_internal, hotkeys_swap_jk, nginx_xaccel";
   };
   # https://github.com/Nebucatnetzer/tt-rss-aarch64/pkgs/container/tt-rss-aarch64%2Fttrss-fpm-pgsql-static/versions
-  ttrssImage = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static@sha256:be93020a762f906e02e67fd6baf595d1811812cf6a9581ac1969b02f1803d972";
+  ttrssImage = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static@sha256:a7cb5c6291f7c2ecb2fe28a61c263a1a563ed8f759a7c6c4c33d2fcbe8410ff0";
   ttrssService = "${config.virtualisation.oci-containers.backend}-ttrss";
 in
 {