.

fix: zitadel script
chore: revert bash option
2025-12-01 20:56:56 +01:00 · 2025-12-01 15:31:14 +01:00 · 2025-12-01 15:30:47 +01:00 · 2025-12-01 14:27:13 +00:00 · 2025-12-01 14:26:40 +00:00 · 2025-12-01 14:49:33 +01:00
22 changed files with 517 additions and 701 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-* text=auto
--- a/.just/machine.just
+++ b/.just/machine.just
@ -8,4 +8,4 @@
 [no-exit-message]
@update machine:
    just assert '-d "../systems/x86_64-linux/{{ machine }}"' "Machine {{ machine }} does not exist, must be one of: $(ls ../systems/x86_64-linux/ | sed ':a;N;$!ba;s/\n/, /g')"
-    nixos-rebuild switch -L --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
+    nixos-rebuild switch --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
--- a/.just/vars.just
+++ b/.just/vars.just
@ -1,38 +1,36 @@
-set unstable := true
+set unstable

 base_path := invocation_directory() / "systems/x86_64-linux"
-
 # sops := "nix shell nixpkgs#sops --command sops"
 # yq := "nix shell nixpkgs#yq --command yq"
-
 sops := "sops"
 yq := "yq"

@_default:
-    just --list
+  just --list

 [doc('list all vars of the target machine')]
 list machine:
-    sops decrypt {{ base_path }}/{{ machine }}/secrets.yml
+  sops decrypt {{ base_path }}/{{ machine }}/secrets.yml
  
@edit machine:
-    sops edit {{ base_path }}/{{ machine }}/secrets.yml
+  sops edit {{ base_path }}/{{ machine }}/secrets.yml
  
@set machine key value:
-    sops set {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')" "\"$(echo '{{ value }}' | sed 's/\"/\\\"/g')\""
+  sops set {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')" "\"$(echo '{{ value }}' | sed 's/\"/\\\"/g')\"" 

-    git add {{ base_path }}/{{ machine }}/secrets.yml
-    git commit -m 'chore(secrets): set secret "{{ key }}" for machine "{{ machine }}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
+  git add {{ base_path }}/{{ machine }}/secrets.yml
+  git commit -m 'chore(secrets): set secret "{{ key }}" for machine "{{ machine}}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null

-    echo "Done"
+  echo "Done"
  
@get machine key:
-    sops decrypt {{ base_path }}/{{ machine }}/secrets.yml | yq ".$(echo "{{ key }}" | sed -E 's/\//./g')"
+  sops decrypt {{ base_path }}/{{ machine }}/secrets.yml | yq ".$(echo "{{ key }}" | sed -E 's/\//./g')"
  
@remove machine key:
-    sops unset {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')"
+  sops unset {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')"

-    git add {{ base_path }}/{{ machine }}/secrets.yml
-    git commit -m 'chore(secrets): removed secret "{{ key }}" from machine "{{ machine }}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
+  git add {{ base_path }}/{{ machine }}/secrets.yml
+  git commit -m 'chore(secrets): removed secret "{{ key }}" from machine "{{ machine}}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null

-    echo "Done"
+  echo "Done"
--- a/.justfile
+++ b/.justfile
@ -19,7 +19,7 @@ mod machine '.just/machine.just'

 [doc('Introspection on flake output')]
@select key:
-  nix eval --show-trace --json .#{{ key }} | jq .
+  nix eval --json .#{{ key }} | jq .



--- a/flake.lock
+++ b/flake.lock
@ -38,11 +38,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1760703920,
-        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
+        "lastModified": 1752979451,
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
        "type": "github"
      },
      "original": {
@ -84,11 +84,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1764601856,
-        "narHash": "sha256-AWohz0cJ5J1keDnUkuWeX2QbWDa62yGSSeMNfdstx10=",
-        "rev": "a61aac8bf2c97cf142b70d344a7174811c62b1a4",
+        "lastModified": 1763547157,
+        "narHash": "sha256-lJcMap2uT+x1R8WUUKKQ6ndynysJ/JOkrMThMGz6DP0=",
+        "rev": "2cb2134a6ee32d427097077c4fb4c416b52ae988",
        "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/a61aac8bf2c97cf142b70d344a7174811c62b1a4.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/2cb2134a6ee32d427097077c4fb4c416b52ae988.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -130,11 +130,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764350888,
-        "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=",
+        "lastModified": 1762276996,
+        "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26",
+        "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
        "type": "github"
      },
      "original": {
@ -149,11 +149,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1764542190,
-        "narHash": "sha256-einnpQaGZ4OoinhfKWm8mfatrBeYNnc3K4TYoKmVOSw=",
+        "lastModified": 1762360792,
+        "narHash": "sha256-YR7vqk+XEvFUQ/miuBAD3+p+97QUN86ya9Aw0K5feJE=",
        "owner": "emmanuelrosa",
        "repo": "erosanix",
-        "rev": "eef0ab9b05d3d27f320226daaffb18d9dcc41c06",
+        "rev": "9075dff5685d3e7269284e53ca496da0beb24596",
        "type": "github"
      },
      "original": {
@ -170,11 +170,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1764571808,
-        "narHash": "sha256-+oo9W5rz03TjfpNqDSLEQwgKiuBbjrHdORyTHli2RuM=",
+        "lastModified": 1763534658,
+        "narHash": "sha256-i/51/Zi/1pM9hZxxSuA3nVPpyqlGoWwJwajyA/loOpo=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "df3c2e78ec13418f85c1f26e77a50f865ec57d38",
+        "rev": "69e40ddf45698d0115a62a7a15d8412f35dd4c09",
        "type": "github"
      },
      "original": {
@ -190,11 +190,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1764592856,
-        "narHash": "sha256-ODwJzh/AiFyhFtmJoAGP5Gbp38ARsUiesBVMXXd1x/s=",
+        "lastModified": 1763504432,
+        "narHash": "sha256-kpmPI67TdoTxiK7LsmgmkKW3iHoyvZJwZeiJhpwPfmw=",
        "owner": "nix-community",
        "repo": "flake-firefox-nightly",
-        "rev": "5aadac137f2c49991cea2bc367dddbb905ffe645",
+        "rev": "49d5d8d42a7650e5353f8467c813839290cb7c9f",
        "type": "github"
      },
      "original": {
@ -206,11 +206,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1764724327,
-        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
+        "lastModified": 1758112371,
+        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
+        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
        "type": "github"
      },
      "original": {
@ -306,11 +306,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1762980239,
+        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
        "type": "github"
      },
      "original": {
@ -320,27 +320,6 @@
      }
    },
    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "mydia",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
      "inputs": {
        "nixpkgs-lib": [
          "nvf",
@ -361,7 +340,7 @@
        "type": "github"
      }
    },
-    "flake-parts_4": {
+    "flake-parts_3": {
      "inputs": {
        "nixpkgs-lib": [
          "stylix",
@ -369,11 +348,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1756770412,
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
        "type": "github"
      },
      "original": {
@ -382,7 +361,7 @@
        "type": "github"
      }
    },
-    "flake-parts_5": {
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "terranix",
@ -423,7 +402,7 @@
    },
    "flake-utils-plus": {
      "inputs": {
-        "flake-utils": "flake-utils_4"
+        "flake-utils": "flake-utils_5"
      },
      "locked": {
        "lastModified": 1715533576,
@ -478,7 +457,25 @@
    },
    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_7"
      },
      "locked": {
        "lastModified": 1694529238,
@ -532,11 +529,11 @@
      "flake": false,
      "locked": {
        "host": "gitlab.gnome.org",
-        "lastModified": 1764524476,
-        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
+        "lastModified": 1762869044,
+        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
+        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
        "type": "gitlab"
      },
      "original": {
@ -574,19 +571,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764617621,
-        "narHash": "sha256-Eq0TvWs6xhKZs5HXH1hlrNasrHD7AOEdeLkTis//X7w=",
+        "lastModified": 1763486183,
+        "narHash": "sha256-10EvBTF9ELezWg+KoKZJ3bxrPzT1Xz95ifurC6HixLY=",
        "owner": "himmelblau-idm",
        "repo": "himmelblau",
-        "rev": "c19494250d8c15e7c75e9301bdc271579a6dc77a",
-=======
-        "lastModified": 1764787446,
-        "narHash": "sha256-RUfGGM8kiXSQA3ct1BZXN5Sm8hxr3XF0P/eR/WGLaGU=",
-        "owner": "himmelblau-idm",
-        "repo": "himmelblau",
-        "rev": "8ab33affe6db4cf5e9c17c2abcd7f3b2cedcfbd8",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "fb27f4bee812e4b4df9df9f78bd5280f0aa2193c",
        "type": "github"
      },
      "original": {
@ -602,19 +591,11 @@
        ]
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764603455,
-        "narHash": "sha256-Q70rxlbrxPcTtqWIb9+71rkJESxIOou5isZBvyOieXw=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "effe4c007d6243d9e69ce2242d76a2471c1b8d5c",
-=======
-        "lastModified": 1764839789,
-        "narHash": "sha256-QCgaXEj8036JlfyVM2e5fgKIxoF7IgGRcAi8LkehKvo=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "d441981b200305ebb8e2e2921395f51d207fded6",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
        "type": "github"
      },
      "original": {
@ -652,19 +633,11 @@
        ]
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764612577,
-        "narHash": "sha256-sHI+7m/ryVYf7agWkutYbvzUS07aAd8g2NVWgUqhxLg=",
+        "lastModified": 1763453666,
+        "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "bcb22e208cf8883004fcec3a33f2500e7dc319a5",
-=======
-        "lastModified": 1764746434,
-        "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "b4c0b604148adacf119b89824ed26df8926ce42c",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf",
        "type": "github"
      },
      "original": {
@ -679,11 +652,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1764506612,
-        "narHash": "sha256-47a2OvGsq1AfffWQqKAGlB9GjmoVa1yXVyfZP3f3kog=",
+        "lastModified": 1754828166,
+        "narHash": "sha256-i7c+fpXVsnvj2+63Gl3YfU1hVyxbLeqeFj55ZBZACWI=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "f7208cc4a3200a2573fc566066ef4d3c041bc924",
+        "rev": "f01c8d121a3100230612be96e4ac668e15eafb77",
        "type": "github"
      },
      "original": {
@ -709,19 +682,19 @@
    },
    "mydia": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1764866402,
-        "narHash": "sha256-0NOWsPks+/vV5ZM9ti71hUPMLy3FzbEIlFI6vxARvuY=",
-        "owner": "chris-kruining",
+        "lastModified": 1764568388,
+        "narHash": "sha256-kl8165eI0lUz9E96sdreZ48/nApydDfJP8IksjBveAw=",
+        "owner": "getmydia",
        "repo": "mydia",
-        "rev": "458fc9a21c6987d994bc7932efb6c49df25ba806",
+        "rev": "74f0cf9a8ca782581ec0a35acf6526fccfbb6e2a",
        "type": "github"
      },
      "original": {
-        "owner": "chris-kruining",
+        "owner": "getmydia",
        "repo": "mydia",
        "type": "github"
      }
@ -734,11 +707,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764161084,
-        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
+        "lastModified": 1763136804,
+        "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
+        "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f",
        "type": "github"
      },
      "original": {
@ -772,23 +745,15 @@
    "nix-minecraft": {
      "inputs": {
        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764556167,
-        "narHash": "sha256-/b+oEls56HDRzsSp60tsRfPFRjFebBPHq6k1I+hfPqw=",
+        "lastModified": 1763171892,
+        "narHash": "sha256-6cg9zSiqKA89yJzVtYhBaBptqq6bX4pr4g7WLAHOD4Y=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "849d1b2b1adddfc7bddbd3be6bffd218a3f5a6fe",
-=======
-        "lastModified": 1764813963,
-        "narHash": "sha256-Vs7Mamto+T8r1evk9myHepgHGNJkS2Kr0BF64NIei94=",
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "rev": "491200d6848402bbab1421cccbc15a46f08c7f78",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "316858c27d278b20e776cd4dd8f787812f587ba2",
        "type": "github"
      },
      "original": {
@ -842,11 +807,11 @@
    },
    "nixos-facter-modules": {
      "locked": {
-        "lastModified": 1764252389,
-        "narHash": "sha256-3bbuneTKZBkYXlm0bE36kUjiDsasoIC1GWBw/UEJ9T4=",
+        "lastModified": 1762264948,
+        "narHash": "sha256-iaRf6n0KPl9hndnIft3blm1YTAyxSREV1oX0MFZ6Tk4=",
        "owner": "nix-community",
        "repo": "nixos-facter-modules",
-        "rev": "5ea68886d95218646d11d3551a476d458df00778",
+        "rev": "fa695bff9ec37fd5bbd7ee3181dbeb5f97f53c96",
        "type": "github"
      },
      "original": {
@ -863,11 +828,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764234087,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "lastModified": 1751903740,
+        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
        "type": "github"
      },
      "original": {
@ -884,19 +849,11 @@
        ]
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764591717,
-        "narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=",
+        "lastModified": 1763537456,
+        "narHash": "sha256-/WRqcqeE9C+mxxWgI7jy5blMrvg2lHFSlTFjC8pRWos=",
        "owner": "nix-community",
        "repo": "nixos-wsl",
-        "rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7",
-=======
-        "lastModified": 1764730608,
-        "narHash": "sha256-FxKIa3OCSRVC23qrk7VT68vExUcmSruJ8OobVlSWOxc=",
-        "owner": "nix-community",
-        "repo": "nixos-wsl",
-        "rev": "10124c58674360765adcb38c9a8b081fb72904e4",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "cd9eb5225fc91eb67629966844d2ff371824abb1",
        "type": "github"
      },
      "original": {
@ -907,11 +864,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764255304,
-        "narHash": "sha256-oQPux8afXmkbb88ceRtz1lgSGqL9auOgdYnBSqpVgSA=",
+        "lastModified": 1761828793,
+        "narHash": "sha256-xjdPwMD4wVuDD85U+3KST62VzFkJueI6oBwIzpzUHLY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e86c955fc372d12face4a9c0d932a6e0f7bff4d",
+        "rev": "843859a08e114403f44aaf5b996b44c38094aa46",
        "type": "github"
      },
      "original": {
@ -923,11 +880,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1764465291,
-        "narHash": "sha256-jJ/E4B9Hp7U2ZmT3E0tD1LtAfATw/xjVf8sueNyeYmc=",
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "e9537535ae8f4a2f78dbef0aaa0cbb6af4abd047",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
        "type": "github"
      },
      "original": {
@ -938,11 +895,11 @@
    },
    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
        "type": "github"
      },
      "original": {
@ -954,19 +911,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764547213,
-        "narHash": "sha256-pGXM6frMKLRJmeMcQ228O1QQBuNEUjzmWx9uBd+CbXM=",
+        "lastModified": 1763469780,
+        "narHash": "sha256-IW67Db/wBNQwJ5e0fF9Yk4SmdivMcecrUVDs7QJoC/s=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "64de27c1c985895c1a9f92aaeaab4e6a4c0960f5",
-=======
-        "lastModified": 1764811743,
-        "narHash": "sha256-Ypfd8oBuG3HWtzcY7VtYiI6Pawznag7YHWy8RoOfiBs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4a6ebaabd716d6479b39fa234a8f895f0ec1cb88",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "a70b03ca5dc9d46294740f165abdef9f9bea5632",
        "type": "github"
      },
      "original": {
@ -994,19 +943,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764618760,
-        "narHash": "sha256-QTUgygkdUq4sq7mXoO2Q2IPpvkKOZtTAJkbTaTjMi0A=",
+        "lastModified": 1763547551,
+        "narHash": "sha256-YOdXVAqEGmrPUgs71r8ziuu9qqpn3jJEiIxsIls+VQA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "29a7d6eec7e1177020f62f7599e5021317219c37",
-=======
-        "lastModified": 1764856222,
-        "narHash": "sha256-yEJmtoFu4cJre1NuU4fb8q57Oux+NTbocnALtJ64aEI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ece6e266caf1effab32eceef0403b797b4330373",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "06aa4d5f488875b6af46e10b45b8000ed0906860",
        "type": "github"
      },
      "original": {
@ -1050,19 +991,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1763421233,
+        "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
-=======
-        "lastModified": 1764667669,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
        "type": "github"
      },
      "original": {
@ -1090,11 +1023,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1764445028,
-        "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=",
+        "lastModified": 1763191728,
+        "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a09378c0108815dbf3961a0e085936f4146ec415",
+        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
        "type": "github"
      },
      "original": {
@ -1116,11 +1049,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764773531,
-        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
+        "lastModified": 1758998580,
+        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
+        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
        "type": "github"
      },
      "original": {
@ -1132,10 +1065,10 @@
    "nvf": {
      "inputs": {
        "flake-compat": "flake-compat_4",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
        "mnw": "mnw",
        "nixpkgs": "nixpkgs_8",
-        "systems": "systems_5"
+        "systems": "systems_6"
      },
      "locked": {
        "lastModified": 1762622004,
@ -1161,11 +1094,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763909441,
-        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
+        "lastModified": 1762784320,
+        "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
+        "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
        "type": "github"
      },
      "original": {
@ -1203,19 +1136,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764525349,
-        "narHash": "sha256-vR3vU9AwzMsBvjNeeG2inA5W/2MwseFk5NIIrLFEMHk=",
+        "lastModified": 1762860488,
+        "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "d646b23f000d099d845f999c2c1e05b15d9cdc78",
-=======
-        "lastModified": 1764778537,
-        "narHash": "sha256-SNL+Fj1ZWiBqCrHJT1S9vMZujrWxCOmf3zkT66XSnhE=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "633cff25206d5108043d87617a43c9d04aa42c88",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "2efc80078029894eec0699f62ec8d5c1a56af763",
        "type": "github"
      },
      "original": {
@ -1276,11 +1201,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764483358,
-        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
+        "lastModified": 1763264763,
+        "narHash": "sha256-N0BEoJIlJ+M6sWZJ8nnfAjGY9VLvM6MXMitRenmhBkY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
+        "rev": "882e56c8293e44d57d882b800a82f8b2ee7a858f",
        "type": "github"
      },
      "original": {
@ -1294,11 +1219,11 @@
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1764483358,
-        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
+        "lastModified": 1763509310,
+        "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
+        "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
        "type": "github"
      },
      "original": {
@ -1314,11 +1239,11 @@
        "base16-helix": "base16-helix",
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
        "gnome-shell": "gnome-shell",
        "nixpkgs": "nixpkgs_10",
        "nur": "nur",
-        "systems": "systems_7",
+        "systems": "systems_8",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
        "tinted-schemes": "tinted-schemes",
@ -1326,19 +1251,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764550443,
-        "narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=",
+        "lastModified": 1763497248,
+        "narHash": "sha256-OGP6MYc+lVkLVQOTS6ORszDcCnZm7kDOGpFBdDoLd0k=",
        "owner": "nix-community",
        "repo": "stylix",
-        "rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15",
-=======
-        "lastModified": 1764798099,
-        "narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=",
-        "owner": "nix-community",
-        "repo": "stylix",
-        "rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "f19ac46f6aa26188b2020ed40066a5b832be9c53",
        "type": "github"
      },
      "original": {
@ -1467,13 +1384,28 @@
        "type": "github"
      }
    },
+    "systems_9": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "terranix": {
      "inputs": {
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_4",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems_8"
+        "systems": "systems_9"
      },
      "locked": {
        "lastModified": 1762472226,
@ -1525,11 +1457,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1763914658,
-        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
+        "lastModified": 1757716333,
+        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
+        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
        "type": "github"
      },
      "original": {
@ -1541,11 +1473,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1764465359,
-        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
+        "lastModified": 1757811970,
+        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
+        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
        "type": "github"
      },
      "original": {
@ -1557,11 +1489,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1764464512,
-        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
+        "lastModified": 1757811247,
+        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
+        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
        "type": "github"
      },
      "original": {
@ -1599,19 +1531,11 @@
        ]
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1764598958,
-        "narHash": "sha256-sJQHRL8trBoG/ArR+mUlyp5cyKU0pgQY+qDQzZGnVgM=",
+        "lastModified": 1763521945,
+        "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "8cded25e10b13e2999241f1c73a7d4e5e5d6f69e",
-=======
-        "lastModified": 1764825646,
-        "narHash": "sha256-QkKEkj3GXpkPxJz9S1RgaMlxstkyaj5IKVWvxIbtC8w=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "8c9284cc227a5c7cd8f1e1fa7a6882b0907187c8",
->>>>>>> ba1d4e1 (chore: update deps)
+        "rev": "24d7381b9231c23daceec5d372cc28e877f7785d",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -90,8 +90,7 @@
    };

    mydia = {
-      url = "github:chris-kruining/mydia";
-      # url = "github:getmydia/mydia";
+      url = "github:getmydia/mydia";
    };
  };

--- a/homes/x86_64-linux/chris@mandos/default.nix
+++ b/homes/x86_64-linux/chris@mandos/default.nix
@ -1,11 +1,10 @@
-{osConfig, ...}: {
+{ osConfig, ... }:
+{
  home.stateVersion = osConfig.system.stateVersion;

  programs.git = {
-    settings.user = {
-      name = "Chris Kruining";
-      email = "chris@kruining.eu";
-    };
+    userName = "Chris Kruining";
+    userEmail = "chris@kruining.eu";
  };

  sneeuwvlok = {
--- a/homes/x86_64-linux/chris@manwe/default.nix
+++ b/homes/x86_64-linux/chris@manwe/default.nix
@ -1,11 +1,10 @@
-{osConfig, ...}: {
+{ osConfig, ... }:
+{
  home.stateVersion = osConfig.system.stateVersion;

  programs.git = {
-    settings.user = {
-      name = "Chris Kruining";
-      email = "chris@kruining.eu";
-    };
+    userName = "Chris Kruining";
+    userEmail = "chris@kruining.eu";
  };

  sneeuwvlok = {
--- a/homes/x86_64-linux/chris@orome/default.nix
+++ b/homes/x86_64-linux/chris@orome/default.nix
@ -1,11 +1,10 @@
-{osConfig, ...}: {
+{ osConfig, ... }:
+{
  home.stateVersion = osConfig.system.stateVersion;

  programs.git = {
-    settings.user = {
-      name = "Chris Kruining";
-      email = "chris@kruining.eu";
-    };
+    userName = "Chris Kruining";
+    userEmail = "chris@kruining.eu";
  };

  sneeuwvlok = {
--- a/homes/x86_64-linux/chris@tulkas/default.nix
+++ b/homes/x86_64-linux/chris@tulkas/default.nix
@ -1,11 +1,10 @@
-{osConfig, ...}: {
+{ osConfig, ... }:
+{
  home.stateVersion = osConfig.system.stateVersion;

  programs.git = {
-    settings.user = {
-      name = "Chris Kruining";
-      email = "chris@kruining.eu";
-    };
+    userName = "Chris Kruining";
+    userEmail = "chris@kruining.eu";
  };

  sneeuwvlok = {
--- a/modules/home/application/onlyoffice/default.nix
+++ b/modules/home/application/onlyoffice/default.nix
@ -1,20 +1,16 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  namespace,
-  ...
-}: let
+{ inputs, config, lib, pkgs, namespace, ... }:
+let
  inherit (lib) mkIf mkEnableOption;

  cfg = config.${namespace}.application.onlyoffice;
-in {
+in
+{
  options.${namespace}.application.onlyoffice = {
    enable = mkEnableOption "enable onlyoffice";
  };

  config = mkIf cfg.enable {
-    home.packages = with pkgs; [onlyoffice-desktopeditors];
+    home.packages = with pkgs; [ onlyoffice-bin ];
+    # fonts.packages = with pkgs; [ corefonts ];
  };
 }
--- a/modules/home/shell/toolset/git/default.nix
+++ b/modules/home/shell/toolset/git/default.nix
@ -1,14 +1,10 @@
-{
-  config,
-  lib,
-  pkgs,
-  namespace,
-  ...
-}: let
+{ config, lib, pkgs, namespace, ... }:
+let
  inherit (lib) mkEnableOption mkIf;

  cfg = config.${namespace}.shell.toolset.git;
-in {
+in
+{
  options.${namespace}.shell.toolset.git = {
    enable = mkEnableOption "version-control system";
  };
@ -16,7 +12,7 @@ in {
  config = mkIf cfg.enable {
    home.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";

-    home.packages = with pkgs; [lazygit lazyjj jujutsu];
+    home.packages = with pkgs; [ lazygit lazyjj jujutsu ];

    programs = {
      zsh.initContent = ''
@ -33,6 +29,14 @@ in {
      git = {
        enable = true;
        package = pkgs.gitFull;
+        difftastic = {
+          enable = true;
+          options = {
+            background = "dark";
+            color = "always";
+            display = "inline";
+          };
+        };

        ignores = [
          # General:
@ -65,7 +69,7 @@ in {
          "*.elc"
        ];

-        settings = {
+        extraConfig = {
          init.defaultBranch = "main";
          core = {
            editor = "nvim";
@ -102,16 +106,6 @@ in {
          };
        };
      };
-
-      difftastic = {
-        enable = true;
-        git.enable = true;
-        options = {
-          background = "dark";
-          color = "always";
-          display = "inline";
-        };
-      };
    };
  };
 }
--- a/modules/nixos/application/steam/default.nix
+++ b/modules/nixos/application/steam/default.nix
@ -1,15 +1,10 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  namespace,
-  ...
-}: let
+{ inputs, config, lib, pkgs, namespace, ... }:
+let
  inherit (lib) mkIf mkEnableOption;

  cfg = config.${namespace}.application.steam;
-in {
+in
+{
  options.${namespace}.application.steam = {
    enable = mkEnableOption "enable steam";
  };
@ -18,7 +13,7 @@ in {
    programs = {
      steam = {
        enable = true;
-        package = pkgs.steam.override {
+        package = pkgs.steam-small.override {
          extraEnv = {
            DXVK_HUD = "compiler";
            MANGOHUD = true;
--- a/modules/nixos/services/authentication/himmelblau/default.nix
+++ b/modules/nixos/services/authentication/himmelblau/default.nix
@ -1,15 +1,10 @@
-{
-  inputs,
-  lib,
-  config,
-  namespace,
-  ...
-}: let
+{ inputs, lib, config, namespace, ... }: let
  inherit (lib) mkEnableOption mkIf;

  cfg = config.${namespace}.services.authentication.himmelblau;
-in {
-  imports = [inputs.himmelblau.nixosModules.himmelblau];
+in
+{
+  imports = [ inputs.himmelblau.nixosModules.himmelblau ];

  options.${namespace}.services.authentication.himmelblau = {
    enable = mkEnableOption "enable azure entra ID authentication";
@ -19,7 +14,7 @@ in {
    services.himmelblau = {
      enable = true;
      settings = {
-        domain = "";
+        domains = [];
        pam_allow_groups = [];
        local_groups = [];
      };
--- a/modules/nixos/services/authentication/zitadel/default.nix
+++ b/modules/nixos/services/authentication/zitadel/default.nix
@ -560,6 +560,8 @@ in
        tofu = lib.getExe pkgs.opentofu;
      in
      ''
+        #!/usr/bin/env bash
+
        if [ "$(systemctl is-active zitadel)" != "active" ]; then
          echo "Zitadel is not running"
          exit 1
--- a/modules/nixos/services/development/forgejo/default.nix
+++ b/modules/nixos/services/development/forgejo/default.nix
@ -184,14 +184,6 @@ in {
      };
    };

-    users = {
-      users."gitea-runner" = {
-        isSystemUser = true;
-        group = "gitea-runner";
-      };
-      groups."gitea-runner" = {};
-    };
-
    sops.secrets = {
      "forgejo/action_runner_token" = {
        owner = "gitea-runner";
--- a/modules/nixos/services/media/default.nix
+++ b/modules/nixos/services/media/default.nix
@ -1,19 +1,13 @@
-{
-  pkgs,
-  lib,
-  namespace,
-  config,
-  inputs,
-  system,
-  ...
-}: let
+{ pkgs, lib, namespace, config, inputs, system, ... }:
+let
  inherit (lib) mkIf mkEnableOption mkOption;
  inherit (lib.types) str;

  cfg = config.${namespace}.services.media;

-  arr = ["radarr"];
-in {
+  arr = ["radarr" ];
+in
+{
  options.${namespace}.services.media = {
    enable = mkEnableOption "Enable media services";

@ -79,128 +73,113 @@ in {
        arr
        |> lib.imap (i: service: {
          name = service;
-          value =
-            {
-              enable = true;
-              openFirewall = true;
+          value = {
+            enable = true;
+            openFirewall = true;

-              environmentFiles = [
-                config.sops.templates."${service}/config.env".path
-              ];
+            environmentFiles = [
+              config.sops.templates."${service}/config.env".path
+            ];

-              settings = {
-                auth.authenticationMethod = "External";
+            settings = {
+              auth.authenticationMethod = "External";

-                server = {
-                  bindaddress = "0.0.0.0";
-                  port = 2000 + i;
-                };
-
-                postgres = {
-                  host = "localhost";
-                  port = "5432";
-                  user = service;
-                  maindb = service;
-                  logdb = service;
-                };
+              server = {
+                bindaddress = "0.0.0.0";
+                port = 2000 + i;
              };
-            }
-            // (
-              if service != "prowlarr"
-              then {
-                user = cfg.user;
-                group = cfg.group;
-              }
-              else {}
-            );
-        })
-        |> lib.listToAttrs;
-    in
-      arr-services
-      // {
-        bazarr = {
-          enable = true;
-          openFirewall = true;
-          user = cfg.user;
-          group = cfg.group;
-          listenPort = 2005;
-        };

-        # port is harcoded in nixpkgs module
-        jellyfin = {
-          enable = true;
-          openFirewall = true;
-          user = cfg.user;
-          group = cfg.group;
-        };
-
-        flaresolverr = {
-          enable = true;
-          openFirewall = true;
-          port = 2007;
-        };
-
-        qbittorrent = {
-          enable = true;
-          openFirewall = true;
-          webuiPort = 2008;
-
-          serverConfig = {
-            LegalNotice.Accepted = true;
-
-            Prefecences.WebUI = {
-              Username = "admin";
+              postgres = {
+                host = "localhost";
+                port = "5432";
+                user = service;
+                maindb = service;
+                logdb = service;
+              };
            };
-          };
-
-          user = cfg.user;
-          group = cfg.group;
-        };
-
-        # port is harcoded in nixpkgs module
-        sabnzbd = {
-          enable = true;
-          openFirewall = true;
-          configFile = "${cfg.path}/sabnzbd/config.ini";
-
-          user = cfg.user;
-          group = cfg.group;
-        };
-
-        postgresql = let
-          databases = arr |> lib.concatMap (s: [s "${s}-log"]);
-        in {
-          enable = true;
-          ensureDatabases = arr;
-          ensureUsers =
-            arr
-            |> lib.map (service: {
-              name = service;
-              ensureDBOwnership = true;
-            });
-        };
-
-        caddy = {
-          enable = true;
-          virtualHosts = {
-            "jellyfin.kruining.eu".extraConfig = ''
-              reverse_proxy http://[::1]:8096
-            '';
-          };
-        };
+          }
+          // (if service != "prowlarr" then { user = cfg.user; group = cfg.group; } else {});
+        })
+        |> lib.listToAttrs
+      ;
+    in 
+    arr-services // {
+      bazarr = {
+        enable = true;
+        openFirewall = true;
+        user = cfg.user;
+        group = cfg.group;
+        listenPort = 2005;
      };

-    systemd.services.radarrApplyTerraform = let
+      # port is harcoded in nixpkgs module
+      jellyfin = {
+        enable = true;
+        openFirewall = true;
+        user = cfg.user;
+        group = cfg.group;
+      };
+
+      flaresolverr = {
+        enable = true;
+        openFirewall = true;
+        port = 2007;
+      };
+
+      qbittorrent = {
+        enable = true;
+        openFirewall = true;
+        webuiPort = 2008;
+
+        serverConfig = {
+          LegalNotice.Accepted = true;
+        };
+
+        user = cfg.user;
+        group = cfg.group;
+      };
+
+      # port is harcoded in nixpkgs module
+      sabnzbd = {
+        enable = true;
+        openFirewall = true;
+        configFile = "${cfg.path}/sabnzbd/config.ini";
+
+        user = cfg.user;
+        group = cfg.group;
+      };
+
+      postgresql = 
+      let
+        databases = arr |> lib.concatMap (s: [ s "${s}-log" ]);
+      in
+      {
+        enable = true;
+        ensureDatabases = arr;
+        ensureUsers = arr |> lib.map (service: {
+          name = service;
+          ensureDBOwnership = true;
+        });
+      };
+
+      caddy = {
+        enable = true;
+        virtualHosts = {
+          "jellyfin.kruining.eu".extraConfig = ''
+            reverse_proxy http://[::1]:8096
+          '';
+        };
+      };
+    };
+
+    systemd.services.radarrApplyTerraform = 
+    let
      # this is a nix package, the generated json file to be exact
      terraformConfiguration = inputs.terranix.lib.terranixConfiguration {
        inherit system;

        modules = [
-          ({
-            config,
-            lib,
-            ...
-          }: {
+          ({ config, lib, ... }: {
            config = {
              variable = {
                api_key = {
@ -228,11 +207,12 @@ in {
          })
        ];
      };
-    in {
+    in
+    {
      description = "Radarr terraform apply";

-      wantedBy = ["multi-user.target"];
-      wants = ["radarr.service"];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "radarr.service" ];
      
      script = ''
        #!/usr/bin/env bash
@ -275,70 +255,53 @@ in {
    systemd.services.jellyfin.serviceConfig.killSignal = lib.mkForce "SIGKILL";

    sops = {
-      secrets = let
-        arrSecrets =
-          arr
-          |> lib.map (service: {
-            name = "${service}/apikey";
-            value = {
-              owner = cfg.user;
-              group = cfg.group;
-              restartUnits = ["${service}.service"];
-            };
-          })
-          |> lib.listToAttrs;
-      in
-        arrSecrets
-        // {
-          # "qbittorrent/password" = {};
-          "qbittorrent/password_hash" = {};
-        };
-
-      templates = let
-        apikeys =
-          arr
-          |> lib.map (service: {
-            name = "${service}/config.env";
-            value = {
-              owner = cfg.user;
-              group = cfg.group;
-              restartUnits = ["${service}.service"];
-              content = ''
-                ${lib.toUpper service}__AUTH__APIKEY="${config.sops.placeholder."${service}/apikey"}"
-              '';
-            };
-          })
-          |> lib.listToAttrs;
-
-        tfvars =
-          arr
-          |> lib.map (service: {
-            name = "${service}/config.tfvars";
-            value = {
-              owner = cfg.user;
-              group = cfg.group;
-              restartUnits = ["${service}ApplyTerraform.service"];
-              content = ''
-                api_key = "${config.sops.placeholder."${service}/apikey"}"
-              '';
-            };
-          })
-          |> lib.listToAttrs;
-
-        qbittorrent = {
-          "qbittorrent/password.conf" = {
+      secrets =
+        arr
+        |> lib.map (service: {
+          name = "${service}/apikey";
+          value = {
            owner = cfg.user;
            group = cfg.group;
-            restartUnits = ["qbittorrent.service"];
-            path = "${config.services.qbittorrent.profileDir}/qBittorrent/config/password.conf";
-            content = ''
-              [Preferences]
-              WebUI\Password_PBKDF2="${config.sops.placeholder."qbittorrent/password_hash"}"
-            '';
+            restartUnits = [ "${service}.service" ];
          };
-        };
-      in
-        apikeys // tfvars // qbittorrent;
+        })
+        |> lib.listToAttrs
+      ;
+
+      templates = 
+        let
+          apikeys = 
+            arr 
+            |> lib.map (service: {
+              name = "${service}/config.env";
+              value = {
+                owner = cfg.user;
+                group = cfg.group;
+                restartUnits = [ "${service}.service" ];
+                content = ''
+                  ${lib.toUpper service}__AUTH__APIKEY="${config.sops.placeholder."${service}/apikey"}"
+                '';
+              };
+            })
+            |> lib.listToAttrs;
+
+          tfvars = 
+            arr
+            |> lib.map(service: {
+              name = "${service}/config.tfvars";
+              value = {
+                owner = cfg.user;
+                group = cfg.group;
+                restartUnits = [ "${service}ApplyTerraform.service" ];
+                content = ''
+                  api_key = "${config.sops.placeholder."${service}/apikey"}"
+                '';
+              };
+            })
+            |> lib.listToAttrs;
+        in
+        apikeys // tfvars
+      ;
    };
  };
 }
--- a/modules/nixos/services/media/mydia/default.nix
+++ b/modules/nixos/services/media/mydia/default.nix
@ -21,24 +21,12 @@ in {
  config = mkIf cfg.enable {
    services.mydia = {
      enable = true;
+      package = inputs.mydia.packages.${system}.default;

      port = 2010;
      listenAddress = "0.0.0.0";
      openFirewall = true;

-      mediaLibraries = [
-        "/var/mydia/movies"
-        "/var/mydia/series"
-      ];
-
-      database = {
-        # type = "sqlite";
-        # uri = "file:///var/lib/mydia/mydia.db";
-        type = "postgres";
-        uri = "postgres://mydia@localhost:5432/mydia?sslmode=disable";
-        passwordFile = config.sops.secrets."mydia/qbittorrent_password".path;
-      };
-
      secretKeyBaseFile = config.sops.secrets."mydia/secret_key_base".path;
      guardianSecretKeyFile = config.sops.secrets."mydia/guardian_secret".path;

@ -49,38 +37,16 @@ in {
        clientSecretFile = config.sops.secrets."mydia/oidc_secret".path;
        scopes = ["openid" "profile" "email"];
      };
-
-      downloadClients = {
-        qbittorrent = {
-          type = "qbittorrent";
-          host = "localhost";
-          port = 2008;
-          username = "admin";
-          passwordFile = config.sops.secrets."mydia/qbittorrent_password".path;
-          useSsl = false;
-        };
-      };
    };

-    sops.secrets = let
-      base =
-        ["secret_key_base" "guardian_secret" "oidc_id" "oidc_secret"]
-        |> lib.map (name:
-          lib.nameValuePair "mydia/${name}" {
-            owner = config.services.mydia.user;
-            group = config.services.mydia.group;
-            restartUnits = ["mydia.service"];
-          })
-        |> lib.listToAttrs;
-    in
-      base
-      // {
-        "mydia/qbittorrent_password" = {
+    sops.secrets =
+      ["secret_key_base" "guardian_secret" "oidc_id" "oidc_secret"]
+      |> lib.map (name:
+        lib.nameValuePair "mydia/${name}" {
          owner = config.services.mydia.user;
          group = config.services.mydia.group;
          restartUnits = ["mydia.service"];
-          key = "qbittorrent/password";
-        };
-      };
+        })
+      |> lib.listToAttrs;
  };
 }
--- a/systems/x86_64-linux/ulmo/secrets.yml
+++ b/systems/x86_64-linux/ulmo/secrets.yml
@ -24,9 +24,6 @@ mydia:
    oidc_secret: ENC[AES256_GCM,data:PgI4hmP/3wt9uj+1QvCYcT8Wav0hgCRADouzWM3V695SSfXfbwDgez8tA/tm1/1jymAU2F2sZH8G2hZ1cdHyHQ==,iv:h3o3jsTmnoNE3+mGX12J3ZU0/6PlQNjdndEvaj/czj0=,tag:p3+p4E8fBtR7a8UpM8cUsg==,type:str]
    secret_key_base: ENC[AES256_GCM,data:yG7HJ5r74Qtxbeyf8F6dA0uHv2pQ8YAJKlKiKjS+m24JRvJWQaTThJ+c5HbuUa6R3e9XtVHchhlVPkF0Is/b+g==,iv:v65xdRr4JdKZmBtjZ08/J3LLqnphSGt9QfVPNQ2x/xg=,tag:n7tD2dhr4IJn1LWM9WW8UA==,type:str]
    guardian_secret: ENC[AES256_GCM,data:OjnNFSHlecL+qXwlhTm++itRM6ga5E5KrSJxbgIUpbMEkIWgu3xhRtnPdipXbedgall0XdO/s+jnWCagZX94BA==,iv:DukdKvm9vey8BWUiml20tgA/Vji1XVX4+sUPge9nTk0=,tag:q3HdvgUYqR0APiaFz0ul5Q==,type:str]
-qbittorrent:
-    password_hash: ENC[AES256_GCM,data:QWuQYmfBn9eLDYztH7TmQvw74MvmzCQ98OlBtyjm1Icr2c63epRuHWzQbm+Q+1jrCSiQreOB3ZyjLzkeV6SlLonryUSD71uBWVwctgPXO0XDrxE1Vi6dkiwC3TF65JTMDhyjDLEj1YkiMP25Fz5NidJTP/r9GlXTfM7gjWo=,iv:bpgL5IoAv+1PUtgNIjLcbzN8C9z55ndypz4LEELAhLc=,tag:VB+XTCwLeIEYKnOr/0f7zA==,type:str]
-    password: ENC[AES256_GCM,data:UepYY6UjJV/jo2aXTOEnKRtsjSqOSYPQlKlrAa7rf9rdnt2UXGjCkvN+A72pICuIBCAmhXZBAUMvmWTV9trk6NREHe0cY1xTC7pNv3x9TM/ZQmH498pbT/95pYAKwouHp9heJQ==,iv:FzjF+xPoaOp+gplxpz940V2dkWSTWe8dWUxexCoxxHc=,tag:TDZsboq9fEmmBrwJN/HTpQ==,type:str]
 sops:
    age:
        - recipient: age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq
@ -47,7 +44,7 @@ sops:
            TTRWaHhpNWlkVDFmMFN4ZTNHMUxyNVkKV693pzTKRkZboQCMPr9IyMGSgxfuHXcb
            Y6BNcp6Qg6PWtX5QI7wRkPNINAK1TEbRBba+b8h6gMmVU4DliQyFiQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-04T11:24:52Z"
-    mac: ENC[AES256_GCM,data:jIgkl1lcVDSlKqJs9fjaHUAZsGL+22T86/qqKyDziHl0+VU763Ezwm8P+la+55jIIT2zLhFcUjhn2BabBi90OeEPztAC4rGpZj6+ZZ0GDCj/JhjPAAo3LgAKOCG0Xgf8MZWr/rXd6bLhW7Qj36PMJnap26rjEiUZeSvpWS2dz8g=,iv:CDx8fBI9Dl1uwrbMD1fa7/h3C7haK3xZxJI59mtL1LA=,tag:2UDRFJoevGEBKZA/9eUiOw==,type:str]
+    lastmodified: "2025-12-01T14:27:13Z"
+    mac: ENC[AES256_GCM,data:v8t65zlWw6UuFeFQ5oBNVGjnuewPlZZG7ea8P4cEHXN+JnSAE67HivSCyjhUAFmX/UbksxnSLYdl72swTb9ASv6JaW2FVJsaF+5zmZbuM5pAjZl4MR6Y7+Vc9YqAi+axnSE1s8pRe9U1PYmcbLWaY9kRZdccavfM2bsoAIpJRTk=,iv:EevmWMh6ygEAlf9RE4qZ1KVKm6yDR5dTZeraoFHmdRg=,tag:sCdtEYc9iNjfEvyYyXH8rQ==,type:str]
    unencrypted_suffix: _unencrypted
    version: 3.11.0
Author	SHA1	Message	Date
Chris Kruining	d9dff63cea	.	2025-12-01 20:56:56 +01:00
Chris Kruining	f288c688d0	fix: zitadel script	2025-12-01 15:31:14 +01:00
Chris Kruining	17e059995f	chore: revert bash option	2025-12-01 15:30:47 +01:00
chris	1b2f4c0381	chore(secrets): set secret "mydia/oidc_secret" for machine "ulmo"	2025-12-01 14:27:13 +00:00
chris	179dd7be1f	chore(secrets): set secret "mydia/oidc_id" for machine "ulmo"	2025-12-01 14:26:40 +00:00
Chris Kruining	b739cd4190	fix: forEach implementation in zitadel module	2025-12-01 14:49:33 +01:00
Chris Kruining	9f1a6e85ee	kaas	2025-12-01 14:14:32 +01:00
chris	331a912c82	chore(secrets): set secret "mydia/guardian_secret" for machine "ulmo"	2025-12-01 09:05:12 +00:00
chris	c215f5f358	chore(secrets): set secret "mydia/secret_key_base" for machine "ulmo"	2025-12-01 09:04:53 +00:00
chris	bb75261d95	chore(secrets): set secret "mydia/secret_key_base" for machine "ulmo"	2025-12-01 09:04:18 +00:00
chris	5d9c1fb6fc	chore(secrets): set secret "mydia/oidc_secret" for machine "ulmo"	2025-12-01 09:03:28 +00:00
chris	41bd07afb4	chore(secrets): set secret "mydia/oidc_id" for machine "ulmo"	2025-12-01 09:03:21 +00:00
Chris Kruining	1e5ba64175	feat: fix most issues with mydia	2025-11-27 16:28:33 +01:00
Chris Kruining	829a8dab4e	chore: refactor code	2025-11-27 11:05:35 +01:00
Chris Kruining	be346e0e29	still complaining about missing ffmpeg....	2025-11-26 16:35:52 +01:00
Chris Kruining	2d3726d535	feat: remove bun2nix this is not the route I ended up going for, so I removed the dependency again	2025-11-26 16:34:58 +01:00
Chris Kruining	06cd3dd1ac	feat: start implementation of package for mydia	2025-11-26 16:02:14 +01:00