restructure desktop/wm and remove nur

flake update
flake add hydraJobs
2024-05-19 17:57:35 +02:00 · 2024-05-09 21:28:57 +02:00 · 2024-05-05 20:12:39 +02:00 · 2024-05-05 20:09:55 +02:00 · 2024-05-05 20:09:02 +02:00 · 2024-05-05 20:05:19 +02:00
76 changed files with 716 additions and 359 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1712079060,
-        "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
+        "lastModified": 1715290355,
+        "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "1381a759b205dff7a6818733118d02253340fd5e",
+        "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
        "type": "github"
      },
      "original": {
@@ -25,29 +25,17 @@
    },
    "crane": {
      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
        "nixpkgs": [
          "lanzaboote",
          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "lanzaboote",
-          "rust-overlay"
        ]
      },
      "locked": {
-        "lastModified": 1681177078,
-        "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
+        "lastModified": 1711299236,
+        "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
+        "rev": "880573f80d09e18a11713f402b9e6172a085449f",
        "type": "github"
      },
      "original": {
@@ -78,14 +66,66 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713532798,
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "revCount": 57,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -102,11 +142,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
        "type": "github"
      },
      "original": {
@@ -115,16 +155,52 @@
        "type": "github"
      }
    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715865404,
+        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1713493429,
+        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -151,6 +227,24 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@@ -160,11 +254,33 @@
        ]
      },
      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
        "type": "github"
      },
      "original": {
@@ -201,11 +317,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712989663,
-        "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
        "type": "github"
      },
      "original": {
@@ -221,11 +337,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712386041,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "lastModified": 1715381426,
+        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
        "type": "github"
      },
      "original": {
@@ -235,6 +351,27 @@
        "type": "github"
      }
    },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "impermanence": {
      "locked": {
        "lastModified": 1708968331,
@@ -258,11 +395,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712909442,
-        "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=",
+        "lastModified": 1716107076,
+        "narHash": "sha256-aB15oIMUv6N/UFsLHzgcGRUvU4YfOjE3gEirIP/k82s=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55",
+        "rev": "e8de93b7b4c384650977a20c1f192e23c6e7a12f",
        "type": "github"
      },
      "original": {
@@ -284,16 +421,16 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1682802423,
-        "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
+        "lastModified": 1713369831,
+        "narHash": "sha256-G4OGxvlIIjphpkxcRAkf1QInYsAeqbfNh6Yl1JLy2uM=",
        "owner": "nix-community",
        "repo": "lanzaboote",
-        "rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
+        "rev": "850f27322239f8cfa56b122cc9a278ab99a49015",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "v0.3.0",
+        "ref": "master",
        "repo": "lanzaboote",
        "type": "github"
      }
@@ -307,11 +444,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1712654305,
-        "narHash": "sha256-CNdpLnGOUZfIhBanAFVF7t1xstaQGL4w6sQPrVeLlus=",
+        "lastModified": 1715787097,
+        "narHash": "sha256-TPp2j0ttvBvkk4oXidvo8Y071zEab0BtcNsC3ZEkluI=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "ee0068ca87bdabbde3cc39b7af807c0302d0304c",
+        "rev": "fa673bf8656fe6f28253b83971a36999bc9995d2",
        "type": "github"
      },
      "original": {
@@ -320,6 +457,27 @@
        "type": "github"
      }
    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715901937,
+        "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "nix-github-actions": {
      "inputs": {
        "nixpkgs": [
@@ -344,11 +502,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1712909959,
-        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
+        "lastModified": 1716034089,
+        "narHash": "sha256-QBfab6V4TeQ6Y4NiXVrEATdQuhCNFNaXt/L1K/Zw+zc=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
+        "rev": "b55712de78725c8fcde422ee0a0fe682046e73c3",
        "type": "github"
      },
      "original": {
@@ -360,11 +518,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1712741485,
-        "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@@ -376,27 +534,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "lastModified": 1710695816,
+        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1712791164,
-        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "lastModified": 1715961556,
+        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
        "type": "github"
      },
      "original": {
@@ -406,18 +564,58 @@
        "type": "github"
      }
    },
-    "nur": {
+    "nixvim": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_2",
+        "flake-root": "flake-root",
+        "home-manager": "home-manager_3",
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks",
+        "treefmt-nix": "treefmt-nix"
+      },
      "locked": {
-        "lastModified": 1712990206,
-        "narHash": "sha256-yQblp6dXqy8/dgqtXTPPyoz5c1u35L7xAVbtDidgmjE=",
+        "lastModified": 1716125991,
+        "narHash": "sha256-PmB9vmp383foiVi64RawbnkC+6SiYiWUjdzw2xgl3eM=",
        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "9aebb2fd194d95452f1952f28a5164e20a451a0e",
+        "repo": "nixvim",
+        "rev": "88ade1dfaa017499326103a078c66dd5d4d0606e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "repo": "NUR",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715870890,
+        "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
        "type": "github"
      }
    },
@@ -439,11 +637,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1681413034,
-        "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
+        "lastModified": 1710923068,
+        "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
+        "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
        "type": "github"
      },
      "original": {
@@ -464,7 +662,7 @@
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "nur": "nur"
+        "nixvim": "nixvim"
      }
    },
    "rust-overlay": {
@@ -479,11 +677,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1682129965,
-        "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
+        "lastModified": 1711246447,
+        "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "2c417c0460b788328220120c698630947547ee83",
+        "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4",
        "type": "github"
      },
      "original": {
@@ -552,6 +750,42 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715940852,
+        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -9,11 +9,6 @@
 {
  description = "Kabbone's peronal NixOS Flake config";

- # nixConfig = {
- #     extra-substituters = [ "https://app.cachix.org/cache/0uptime" ];
- #     extra-trusted-public-keys = [ "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" ];
- # };
-  
  inputs =                                                                  # All flake references used to build my NixOS setup. These are dependencies.
    {
      nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";                  # Nix Packages
@@ -37,10 +32,6 @@
        inputs.nixpkgs.follows = "nixpkgs-unstable";
      };

-      nur = {
-        url = "github:nix-community/NUR";                                   # NUR Packages
-      };
-
      agenix = {
        url = "github:ryantm/agenix";
        inputs.nixpkgs.follows = "nixpkgs";
@@ -52,12 +43,17 @@
      };

      lanzaboote = {
-          url = "github:nix-community/lanzaboote/v0.3.0";
+          url = "github:nix-community/lanzaboote/master";
          inputs.nixpkgs.follows = "nixpkgs";
       };
+
+       nixvim = {
+           url = "github:nix-community/nixvim";
+           inputs.nixpkgs.follows = "nixpkgs-unstable";
+       };
    };

-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, nur, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
    let                                                                     # Variables that can be used in the config files
      user = "kabbone";
      userdmz = "diablo";
@@ -68,10 +64,11 @@
      nixosConfigurations = (                                               # NixOS configurations
        import ./hosts {                                                    # Imports ./hosts/default.nix
          inherit (nixpkgs) lib;
-          inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable nur user userdmz userserver location agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
+          inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable user userdmz userserver location agenix jovian-nixos microvm impermanence lanzaboote nixvim;   # Also inherit home-manager so it does not need to be defined here.
          nix.allowedUsers = [ "@wheel" ];
          security.sudo.execWheelOnly = true;
        }
      );
    };
+
 }
--- a/hosts/configuration_desktop.nix
+++ b/hosts/configuration_desktop.nix
@@ -69,12 +69,11 @@
    carlito                                 # NixOS
    vegur                                   # NixOS
    source-code-pro
-    jetbrains-mono
    font-awesome                            # Icons
    hack-font
    corefonts                               # MS
    intel-one-mono
-    office-code-pro
+    cascadia-code
    (nerdfonts.override {                   # Nerdfont Icons override
      fonts = [
        "FiraCode"
@@ -183,11 +182,6 @@
    '';
  };
  nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
-  nixpkgs.config.packageOverrides = pkgs: {
-    nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
-      inherit pkgs;
-    };
-  };

  system = {                                # NixOS settings
    autoUpgrade = {                         # Allow auto update
--- a/hosts/configuration_server.nix
+++ b/hosts/configuration_server.nix
@@ -58,7 +58,7 @@
    carlito                                 # NixOS
    vegur                                   # NixOS
    source-code-pro
-    jetbrains-mono
+    cascadia-code
    font-awesome                            # Icons
    hack-font
    corefonts                               # MS
@@ -132,11 +132,6 @@
    '';
  };
  nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
-  nixpkgs.config.packageOverrides = pkgs: {
-    nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
-      inherit pkgs;
-    };
-  };

  system = {                                # NixOS settings
    autoUpgrade = {                         # Allow auto update
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -11,7 +11,7 @@
 #            └─ ./home.nix 
 #

-{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, nur, user, userdmz, userserver, location, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:
+{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, user, userdmz, userserver, location, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }:

 let
  system = "x86_64-linux";                                  # System architecture
@@ -28,12 +28,12 @@ in
 {
  desktop = lib.nixosSystem {                                # Desktop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix microvm nixpkgs lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote nixvim; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      microvm.nixosModules.host
      lanzaboote.nixosModules.lanzaboote
+      #nixvim.nixosModules.nixvim
      ./desktop
      ./configuration_desktop.nix
      ../modules/hardware/remoteBuilder.nix
@@ -43,9 +43,6 @@ in
      

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -58,21 +55,17 @@ in

  laptop = lib.nixosSystem {                                # Laptop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      ./laptop
      ./configuration_desktop.nix
-      #../modules/hardware/remoteClient.nix
+      ../modules/hardware/remoteClient.nix
      nixos-hardware.nixosModules.common-cpu-intel
      nixos-hardware.nixosModules.common-gpu-intel
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -85,23 +78,19 @@ in

  steamdeck = nixpkgs-unstable.lib.nixosSystem {            # steamdeck profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix jovian-nixos lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      jovian-nixos.nixosModules.default
      lanzaboote.nixosModules.lanzaboote
      ./steamdeck
      ./configuration_desktop.nix
-      #../modules/hardware/remoteClient.nix
+      ../modules/hardware/remoteClient.nix
      nixos-hardware.nixosModules.common-cpu-amd
      nixos-hardware.nixosModules.common-gpu-amd
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager-unstable.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -114,20 +103,16 @@ in

  server = lib.nixosSystem {                                # Desktop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs impermanence; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
    modules = [
      agenix.nixosModules.default
      microvm.nixosModules.host
-      nur.nixosModules.nur
      ./server
      ./configuration_server.nix
      nixos-hardware.nixosModules.common-cpu-amd
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -138,13 +123,13 @@ in
    ];
  };

-  server_big = lib.nixosSystem {                                # Desktop profile
+  kabtop = lib.nixosSystem {                                # Desktop profile
    inherit system;
    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
    modules = [
      agenix.nixosModules.default
      microvm.nixosModules.host
-      ./server_big
+      ./kabtop
      ./configuration_server.nix
      nixos-hardware.nixosModules.common-cpu-amd
      nixos-hardware.nixosModules.common-pc-ssd
@@ -160,22 +145,18 @@ in
    ];
  };

-  nasbackup = lib.nixosSystem {                                # Desktop profile
+  nasbak = lib.nixosSystem {                                # Desktop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      ./nasbackup
      ./configuration_desktop.nix
-      #../modules/hardware/remoteClient.nix
+      ../modules/hardware/remoteClient.nix
      nixos-hardware.nixosModules.common-cpu-intel
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -188,20 +169,16 @@ in

  jupiter = lib.nixosSystem {                                # Desktop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      ./jupiter
      ./configuration_desktop.nix
-      #../modules/hardware/remoteClient.nix
+      ../modules/hardware/remoteClient.nix
      nixos-hardware.nixosModules.common-cpu-intel
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
@@ -214,19 +191,15 @@ in

  dmz = lib.nixosSystem {                                # Desktop profile
    inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs impermanence; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; };
    modules = [
      agenix.nixosModules.default
-      nur.nixosModules.nur
      microvm.nixosModules.host
      ./dmz
      ./configuration_server.nix
      nixos-hardware.nixosModules.common-pc-ssd

      home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [
-            nur.overlay
-          ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.extraSpecialArgs = { inherit user; };
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -17,14 +17,14 @@
 #           └─ default.nix
 #

-{ config, nixpkgs, pkgs, user, lib, ... }:
+{ config, nixpkgs, pkgs, user, lib, nixvim, ... }:

 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    #[(import ../../modules/desktop/hyprland/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/sway/default.nix)] ++        # Window Manager
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    [(import ../../modules/wm/sway/default.nix)] ++         # Window Manager
+    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
+    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
    (import ../../modules/hardware);                             # Hardware devices

  boot = {                                  # Boot options
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -16,8 +16,8 @@
 {
  imports =
    [
-      #../../modules/desktop/hyprland/home.nix # Window Manager
-      ../../modules/desktop/sway/home.nix # Window Manager
+      #../../modules/wm/hyprland/home.nix # Window Manager
+      ../../modules/wm/sway/home.nix # Window Manager
      ../../modules/home.nix # Window Manager
    ];

--- a/hosts/dmz/default.nix
+++ b/hosts/dmz/default.nix
@@ -22,7 +22,8 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # Docker
    (import ../../modules/services/dmz) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -123,7 +123,7 @@
 #      package = pkgs.papirus-icon-theme;
 #    };
 #    font = {
-#      name = "FiraCode Nerd Font";         # or FiraCode Nerd Font Mono Medium
+#      name = "Cascadia Code";         # or FiraCode Nerd Font Mono Medium
 #    };                                        # Cursor is declared under home.pointerCursor
 #  };
  systemd.user.services.mpris-proxy = {
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -22,7 +22,7 @@
 {
  imports =                                                         # For now, if applying to other ssystem, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    #(import ../../modules/desktop/virtualisation) ++   # Docker
+    #(import ../../modules/wm/virtualisation) ++   # Docker
    (import ../../modules/services/nas) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

--- a/hosts/server_big/default.nix
+++ b/hosts/server_big/default.nix
@@ -22,7 +22,8 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++  # kvm module options
    (import ../../modules/services/server) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

@@ -40,6 +41,10 @@

  environment = {
    etc = {
+      "fail2ban/filter.d/open-webui.conf" = {
+        source = ../../modules/services/server/fail2ban/filter/open-webui.conf;
+        mode = "0444";
+      };
      "fail2ban/filter.d/gitea.conf" = {
        source = ../../modules/services/server/fail2ban/filter/gitea.conf;
        mode = "0444";
@@ -80,6 +85,12 @@
           findtime = "15m";
        };
        jails = {
+            open-webui = ''
+              enabled = true
+              filter = open-webui
+              backend = systemd
+              action = iptables-allports
+            '';
            gitea = ''
              enabled = true
              filter = gitea
--- a/hosts/server_big/hardware-configuration.nix
+++ b/hosts/server_big/hardware-configuration.nix
--- a/hosts/server_big/home.nix
+++ b/hosts/server_big/home.nix
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -22,9 +22,10 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    #[(import ../../modules/desktop/hyprland/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/sway/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    #[(import ../../modules/wm/hyprland/default.nix)] ++        # Window Manager
+    [(import ../../modules/wm/sway/default.nix)] ++        # Window Manager
+    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # kvm module options
    (import ../../modules/hardware);                                # Hardware devices

  boot = {                                  # Boot options
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -16,8 +16,8 @@
 {
  imports =
    [
-      #../../modules/desktop/hyprland/home.nix # Window Manager
-      ../../modules/desktop/sway/home.nix # Window Manager
+      #../../modules/wm/hyprland/home.nix # Window Manager
+      ../../modules/wm/sway/home.nix # Window Manager
      ../../modules/home.nix # Window Manager
    ];

--- a/hosts/nas/default.nix
+++ b/hosts/nas/default.nix
@@ -22,7 +22,7 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    (import ../../modules/wm/virtualisation) ++   # Docker
    (import ../../modules/services/nas) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

--- a/hosts/nasbackup/default.nix
+++ b/hosts/nasbackup/default.nix
@@ -22,7 +22,7 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    #[(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
    (import ../../modules/services/nasbackup) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

--- a/hosts/nasbackup/hardware-configuration.nix
+++ b/hosts/nasbackup/hardware-configuration.nix
@@ -27,10 +27,12 @@
    NAS-RAID1 = {
      device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
      keyFile = "/root/NASKeyfile";
+      bypassWorkqueues = true;
    };
    NAS-RAID2 = {
      device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
      keyFile = "/root/NASKeyfile";
+      bypassWorkqueues = true;
    };
  };
  boot.kernelModules = [ "kvm-intel" ];
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -22,7 +22,7 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
    (import ../../modules/services/server) ++                       # Server Services
    (import ../../modules/hardware);                                # Hardware devices

--- a/hosts/steamdeck/default.nix
+++ b/hosts/steamdeck/default.nix
@@ -22,9 +22,10 @@
 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/steam/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/kde/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/wm/steam/default.nix)] ++            # jovian steam
+    [(import ../../modules/wm/kde/default.nix)] ++              # Window Manager
+    (import ../../modules/wm/virtualisation) ++                 # libvirt + Docker
+    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
    (import ../../modules/hardware);                                 # Hardware devices

  boot = {                                  # Boot options
@@ -87,5 +88,5 @@
    tailscale.enable = true;

  };
-  security.pam.enableSSHAgentAuth = true;
+  security.pam.sshAgentAuth.enable = true;
 }
--- a/hosts/steamdeck/hardware-configuration.nix
+++ b/hosts/steamdeck/hardware-configuration.nix
@@ -26,6 +26,7 @@
 			  devices."crypted" = {
 				  device = "/dev/disk/by-partlabel/disk-nvme0n1-luks";
 				  allowDiscards = true;
+                  bypassWorkqueues = true;
 			  };
 		  };
 	  };
--- a/hosts/steamdeck/home.nix
+++ b/hosts/steamdeck/home.nix
@@ -16,8 +16,8 @@
 {
  imports =
    [
-      ../../modules/desktop/steam/home.nix # Window Manager
-      ../../modules/desktop/kde/home.nix # Window Manager
+      ../../modules/wm/steam/home.nix # Window Manager
+      ../../modules/wm/kde/home.nix # Window Manager
      ../../modules/home.nix # Window Manager
    ];

--- a/modules/editors/nvim/config/bufferline.nix
+++ b/modules/editors/nvim/config/bufferline.nix
@@ -0,0 +1,5 @@
+{
+  plugins.bufferline = {
+    enable = true;
+  };
+}
--- a/modules/editors/nvim/config/default.nix
+++ b/modules/editors/nvim/config/default.nix
@@ -0,0 +1,16 @@
+{ nvim, ... }:
+{
+  # Import all your configuration modules here
+  programs.nixvim = {
+      enable = true;
+      colorschemes.gruvbox.enable = true;
+
+      imports = [
+        ./bufferline.nix
+        ./plugins.nix
+        ./options.nix
+        ./keymaps.nix
+        ./highlight.nix
+      ];
+  };
+}
--- a/modules/editors/nvim/config/highlight.nix
+++ b/modules/editors/nvim/config/highlight.nix
@@ -0,0 +1,8 @@
+{
+  highlight = {
+    Comment.fg = "#ff00ff";
+    Comment.bg = "#000000";
+    Comment.underline = true;
+    Comment.bold = true;
+  };
+}
--- a/modules/editors/nvim/config/keymaps.nix
+++ b/modules/editors/nvim/config/keymaps.nix
@@ -0,0 +1,8 @@
+{
+  keymaps = [
+    {
+      action = "<cmd>Telescope live_grep<CR>";
+      key = "<leader>g";
+    }
+  ];
+}
--- a/modules/editors/nvim/config/options.nix
+++ b/modules/editors/nvim/config/options.nix
@@ -0,0 +1,14 @@
+{
+    config = {
+        globals.mapleader = " ";
+        viAlias = true;
+        vimAlias = true;
+
+        opts = {
+            number = true;         # Show line numbers
+            relativenumber = true; # Show relative line numbers
+
+            shiftwidth = 2;        # Tab width should be 2
+        };
+    };
+}
--- a/modules/editors/nvim/config/plugins.nix
+++ b/modules/editors/nvim/config/plugins.nix
@@ -0,0 +1,51 @@
+{
+    plugins = {
+        lualine.enable = true;
+
+        cmp = {
+            enable = true;
+            autoEnableSources = true;
+            settings = {
+                sources = [
+                  {name = "nvim_lsp";}
+                  {name = "path";}
+                  {name = "buffer";}
+                  {name = "luasnip";}
+                ];
+
+                mapping = {
+                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
+                    "<C-Space>" = "cmp.mapping.complete()";
+                    "<C-e>" = "cmp.mapping.close()";
+                    "<CR>" = "cmp.mapping.confirm({ select = true })";
+                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+                };
+            };
+        };
+
+        lsp = {
+            enable = true;
+
+            servers = {
+                tsserver.enable = true;
+
+                lua-ls = {
+                    enable = true;
+                    settings.telemetry.enable = false;
+                };
+#                rust-analyzer = {
+#                    enable = true;
+#                    installCargo = true;
+#                };
+            };
+        };
+
+        telescope.enable = true;
+
+        treesitter.enable = true;
+
+        luasnip.enable = true;
+    };
+}
--- a/modules/hardware/remoteClient.nix
+++ b/modules/hardware/remoteClient.nix
@@ -16,14 +16,9 @@
      protocol = "ssh-ng";
    } ];
    settings = {
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      extra-trusted-public-keys = [
        "hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII="
      ];
-      substituters = [
-        "https://cache.nixos.org"
-        #"ssh-ng://nixremote@hades.home.opel-online.de"
-      ];
      trusted-users = [
        "kabbone"
      ];
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -24,7 +24,7 @@
    theme = {
      theme = mkOption { type = types.str; default = "catppuccin-mocha"; };
      icon-theme = mkOption { type = types.str; default = "Papirus-Dark"; };
-      font = mkOption { type = types.str; default = "FiraCode Nerd Font 11"; };
+      font = mkOption { type = types.str; default = "Cascadia Code 11"; };
      wallpaper = mkOption { type = types.str; default = ""; };
    };
  };
--- a/modules/programs/alacritty.nix
+++ b/modules/programs/alacritty.nix
@@ -16,8 +16,9 @@
      package = pkgs.alacritty;
      settings = {
        font = rec {                          # Font - Laptop has size manually changed at home.nix
-          #normal.family = "Source Code Pro";
-          normal.family = "FiraCode Nerd Font";
+          #normal.family = "FiraCode Nerd Font";
+          normal.family = "Cascadia Code";
+          #normal.family = "Intel One Mono";
          #bold = { style = "Bold"; };
 #         size = 8;
        };
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -17,5 +17,5 @@
   #./waybar.nix
   #./games.nix
 ]
-# Waybar.nix is pulled from modules/desktop/..
+# Waybar.nix is pulled from modules/wm/..
 # Games.nix is pulled from desktop/default.nix
--- a/modules/services/dmz/default.nix
+++ b/modules/services/dmz/default.nix
@@ -12,6 +12,7 @@

 [
  ./microvm.nix
+  ./hydra.nix
 ]

 # picom, polybar and sxhkd are pulled from desktop module
--- a/modules/services/dmz/hydra.nix
+++ b/modules/services/dmz/hydra.nix
@@ -0,0 +1,11 @@
+{ lib, config, pkgs, ... }:
+
+{
+    services.hydra = {
+      enable = true;
+      hydraURL = "http://localhost:3000";
+      notificationSender = "hydra@localhost";
+      useSubstitutes = true;
+    };
+
+}
--- a/modules/services/server/default.nix
+++ b/modules/services/server/default.nix
@@ -18,7 +18,7 @@
  ./matrix.nix
  ./coturn.nix
  ./jitsi.nix
-  #./ollama.nix
+  ./ollama.nix
 ]

 # picom, polybar and sxhkd are pulled from desktop module
--- a/modules/services/server/fail2ban/filter/gitea.conf
+++ b/modules/services/server/fail2ban/filter/gitea.conf
@@ -1,5 +1,4 @@
 [Definition]
 failregex =  .*(Failed authentication attempt|invalid credentials|Attempted access of unknown user).* from <HOST>
 ignoreregex =
-#journalmatch = _SYSTEMD_UNIT=gitea.servie
-journalmatch = 
+journalmatch = _SYSTEMD_UNIT=gitea.service + _COMM=gitea
--- a/modules/services/server/fail2ban/filter/open-webui.conf
+++ b/modules/services/server/fail2ban/filter/open-webui.conf
@@ -0,0 +1,4 @@
+[Definition]
+failregex =  <HOST> - .*(401 Unauthorized|invalid credentials|Attempted access of unknown user).*
+ignoreregex =
+journalmatch = _SYSTEMD_UNIT=podman-open-webui.service + _COMM=podman-open-webui
--- a/modules/services/server/ollama.nix
+++ b/modules/services/server/ollama.nix
@@ -4,19 +4,24 @@ let
  ollamahostname = "llm.kabtop.de";
 in
 {
-    services.ollama = {
-        enable = true;
-        listenAddress = "127.0.0.1:11434";
+  virtualisation.oci-containers.containers."open-webui" = {
+    autoStart = true;
+    image = "ghcr.io/open-webui/open-webui:ollama";
+    volumes = [
+      "/var/lib/open-webui:/app/backend/data"
+    ];
+    hostname = "open-webui";
+    ports = [ "8081:8080" ];
  };

-    services.nginx = {
+  services = {
+    nginx = {
      virtualHosts = {
-            ollamahostname = {
+          ${ollamahostname} = {
              enableACME = true;
              forceSSL = true;
-                listen = [ {
-                    addr = "127.0.0.1"; port = 11434;
-                } ];
+              locations."/".proxyPass = "http://localhost:8081";
+          };
      };
    };
  };
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -0,0 +1,16 @@
+{ pkgs, lib, config, ... }:
+
+{
+    options = {
+        desktop = {
+            wm = lib.mkOption { type = types.str; default = "sway"; };
+            taskbar = lib.mkOption { type = types.str; default = "waybar"; };
+            launcher = lib.mkOption { type = types.str; default = "bemenu"; };
+        };
+    };
+
+    config = {
+        imports =
+          (import ./ + (desktop.wm)) ++
+    };
+}
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
--- a/modules/desktop/gnome/home.nix
+++ b/modules/desktop/gnome/home.nix
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
--- a/modules/desktop/hyprland/home.nix
+++ b/modules/desktop/hyprland/home.nix
--- a/modules/desktop/kde/default.nix
+++ b/modules/desktop/kde/default.nix
--- a/modules/desktop/kde/home.nix
+++ b/modules/desktop/kde/home.nix
--- a/modules/desktop/scripts/2in1screen
+++ b/modules/desktop/scripts/2in1screen
--- a/modules/desktop/steam/default.nix
+++ b/modules/desktop/steam/default.nix
@@ -40,6 +40,4 @@
      steamdeck-firmware
    ];

-    services.pipewire.wireplumber.package = lib.mkForce pkgs.wireplumber;
-
 }
--- a/modules/desktop/steam/home.nix
+++ b/modules/desktop/steam/home.nix
--- a/modules/desktop/sway/default.nix
+++ b/modules/desktop/sway/default.nix
@@ -11,10 +11,10 @@
 #               └─ hyprland.nix *
 #

-{ config, lib, user, pkgs, ... }:
+{ config, lib, user, pkgs, desktop, ... }:

 {
-  imports = [ ../../programs/waybar.nix ];
+  imports = [ ../waybar.nix ];

  hardware.opengl = {
    enable = true;
@@ -40,6 +40,7 @@
      rocmPackages.clr.icd
      rocmPackages.clr
      clinfo
+      waybar
    ];
  };

--- a/modules/desktop/sway/home.nix
+++ b/modules/desktop/sway/home.nix
@@ -73,7 +73,7 @@
        terminal = "${pkgs.alacritty}/bin/alacritty";
    
        fonts = {
-            names = [ "Source Code Pro" ];
+            names = [ "Cascadia Code" ];
            size = 10.0;
        };
        
--- a/modules/desktop/virtualisation/default.nix
+++ b/modules/desktop/virtualisation/default.nix
@@ -13,5 +13,5 @@

 [
  ./docker.nix
-#  ./qemu.nix
+  ./qemu.nix
 ]
--- a/modules/desktop/virtualisation/docker.nix
+++ b/modules/desktop/virtualisation/docker.nix
--- a/modules/wm/virtualisation/kvm-amd.nix
+++ b/modules/wm/virtualisation/kvm-amd.nix
@@ -0,0 +1,12 @@
+#
+# KVM module options amd
+#
+
+{ config, pkgs, user, ... }:
+
+{                                             # Add libvirtd and kvm to userGroups
+  boot.extraModprobeConfig = ''
+    options kvm_amd nested=0 avic=1 npt=1
+  '';                                         # Needed to run OSX-KVM 
+}
+
--- a/modules/wm/virtualisation/kvm-intel.nix
+++ b/modules/wm/virtualisation/kvm-intel.nix
@@ -0,0 +1,13 @@
+#
+# KVM module options intel 
+#
+
+{ config, pkgs, user, ... }:
+
+{                                             # Add libvirtd and kvm to userGroups
+  boot.extraModprobeConfig = ''
+    options kvm_intel nested=1
+    options kvm_intel emulate_invalid_guest_state=0
+    options kvm ignore_nsrs=1
+  '';                                         # Needed to run OSX-KVM 
+}
--- a/modules/desktop/virtualisation/qemu.nix
+++ b/modules/desktop/virtualisation/qemu.nix
@@ -5,12 +5,6 @@
 { config, pkgs, user, ... }:

 {                                             # Add libvirtd and kvm to userGroups
-  boot.extraModprobeConfig = ''
-    options kvm_intel nested=1
-    options kvm_intel emulate_invalid_guest_state=0
-    options kvm ignore_nsrs=1
-  '';                                         # Needed to run OSX-KVM 
-
  users.groups.libvirtd.members = [ "root" "${user}" ];

  virtualisation = {
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -9,14 +9,6 @@
    waybar
  ];

-#  nixpkgs.overlays = [                                      # Waybar needs to be compiled with the experimental flag for wlr/workspaces to work
-#    (self: super: {
-#      waybar = super.waybar.overrideAttrs (oldAttrs: {
-#        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-#      });
-#    })
-#  ];
-
  home-manager.users.${user} = {                           # Home-manager waybar config
    programs.waybar = {
      enable = true;
--- a/secrets/keys/nixremote.age
+++ b/secrets/keys/nixremote.age
--- a/secrets/keys/nixservepriv.age
+++ b/secrets/keys/nixservepriv.age
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -27,7 +27,7 @@ let
  steamdeck = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINcbvtlL9xFq6kcvE6x20/Es5PVWMhbBvra8HjGUm4NB";
  laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLDA3tmyCR4ogX7mgwaEhsceqALQvq9IqXhg8rF0OIi";
  homerunner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP5MASizLhydfxn0AWcG6LfeC4fghLTDVsLbEHDnIAhc";
-  serverrunner="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJacRr6zXpyWsN9lcu+zZ+Mu09FselLq1b6jDvOLiKPs";
+  serverrunner="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHfLhlJX2VlZE4myreojQ0hqCSL28kE9Y3F65uumgrSK";
  systems = [ 
      server
      server2
--- a/secrets/services/coturn/static-auth.age
+++ b/secrets/services/coturn/static-auth.age
@@ -1,24 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 neExcQ jgztcKV0tcryBZnQ2mGs5F7LsPYWu/JqK95NxB6EoH4
-RKMN+WLjRByYXvsjRuhUPoUJ/DklaadGSiWzLFvHZTo
-> ssh-ed25519 WiIaQQ 1Fg119/Cnw1cfpVykkIb5AXkriQKyDaXd8TuUIEyMUs
-85mjxVDXYnqep46a/Ajm01AH5vgKtYHPcp9V1f66lLs
+-> ssh-ed25519 neExcQ FMwvw6TmjR3KbTH9UgtlHGmC3ZM9s1+g2Lb2B4oSJWI
+l9TBPRZpSM1Wky9J+uNaKSYVI65MlLxTU7Kh2uC9Ijs
+-> ssh-ed25519 WiIaQQ J3tqbCwliMu7Hp/diV45LB0z2EWpLAwivGxxNQm1O28
+O7EDQl7x7htiIyVOQfSWHQbIxVWEnDJ/rOwE7Jey6go
 -> ssh-rsa VtjGpQ
-G+a3nCQWXedZWfbebjK/mEqUileI21xiGvuYea50Y4FCQND41X4paGfLo+uOPrvd
-amjOf2GOa5DkwDp7HM4C/VVZ3BOYmoBUMJF9ooGqtNxeR/HEsUCwlP6amDDeErKa
-2hZDcyTTDIjzQXibPnD/qBNeVibO3PdJ8fbXuE3s9wPviLJivaJ7cg+LVq4Wf0Yj
-vHZs0R6rhwwL5FGYAFvbmPGUnYXmMOPzBAefhxP+GfSZj7OrpwxPDV8nt8vVxUXc
-6hKEe+mg1MXqk7ev+eAc2o54KurgqPH7AzbegOrqurcnetDPm+U3lkBDSn3DcIA3
-ZWFNXx/Jofnst24pWltIaQGnQbJmFNf1dkCbp2T9RUYpJoIAyqYpc2Z+HhO4Td3a
-RAh9KBOCgveq4P0bkWylxfzk6RsFcIeX339VM2kKJnmDUM8Z6Ps2Ezxq6m0CXkVJ
-AWzWwSDzHlc0sLWPBAbgFeddseY1ru799CN5ItFvkAgRxY7tv9mjDmHfcg0KoZ8k
-PPSz1+Fr39xei3VfZvhW7c5pHJpZ0jeu0CryKodtnCs5HRUNnxwt7d4vEm93taN+
-Zg5EiZ3akQnolrP6/f8ScdsJPItIKWwu77FETxuc9UJ2zf1zgpwSLtlv42vCrDCZ
-xsM3m8sExJNyv0IV4mzlBrq8FUpeXiSE3qUzBnbTKSM
-> piv-p256 grR75w AzzN1+S+UFMWcq8y1n/prptwKjF4OIBiQ90WNJmlwU0+
-0S0YRr2n6OOFiB6fzx/KiskZgf/7aJZ1Z4gUmViX+is
-> piv-p256 RQguQQ AjvTHL6Pq2qOEKCzf2XdY7o42gvzaCPZNdtcOrbGHe1o
-WPTe0ipjV+E9+J4ZLjqc8Jg2pbi0VmJD+YuPkV2ufrI
--- T6VKEpDM7kKjDsvyDaIip73ea6W9ddd1LwNSsUjs/Po
-ֆ?G<>+<2B>koҴa<EFBFBD>
-'<27><><EFBFBD><EFBFBD>Q<EFBFBD><51>o<7F><6F><EFBFBD><EFBFBD>G<14><>m<EFBFBD>0<EFBFBD>3k<33><6B><<3C>E23SFi<46><69>׆<EFBFBD>h5z<35><7A><EFBFBD><19><>]<5D><><EFBFBD><EFBFBD><EFBFBD><06>b/<2F><><EFBFBD>ie<69><65>pg@<40>*<2A>4H
+BE/OvVUprp821b/gLSDol0R0P65wwtYHKulHt2Y1Ik02w/A/GCJbVX1hAbxkhRnR
+5em/iKrbG5J3kabFgV/2VLB21yzcrdip0Cvzbgn0HsZ7I0PS80W+Nz054cdH6QV/
+A+iveZxwS0x5VWI1//mmPp6YGeEOw89r/KyIZ7As8gTmVzQoVEeaqUsP9A2/+VuG
+J6gbE6vCb5jxJ7OrLZbtBjfJhac3g7KHfy9QcLNRDSR+r0YVYOElUSyYdz3DUbJp
+vCkNdm2s00wzAobyK5KLx4k9UB+1kJRPjP52Uxt4A+pEjIviH1vTnHzQb+vL4LuR
+qR6spF4vXHj14eGva51+8bxuUBj3kx9zS4XFTLug9B9xe8XgiPJDq109/fzCLkyr
+CZwmvAIUbghLzVw5ub4It+79GKxYXH9GjkWmVQX1J1a6ls7Fvy8pW90Fh2N5M+wk
+FTQru+OuwfllWUZaUWpE1mUzu65CZ84Kfg5slm3oY/y8E6UEmHiwdpCD1Y7mxGwl
+hlQAhOzXyiNDHtWdvRaA66if7+heTvkEoKD5/owUJ0tJTMyvZgah0r2OGbKWluTv
+w6DMlKQFtnnW437t3QZFEWmz6r8UV53CzVIjcOv6Nd8za20RKofmOCeyVJ5GRNk
+weL94rH3Mv5YKh3/mJGj4fsYgka3uRO+rV6G7fNZcfQ
+-> piv-p256 grR75w AnCspIRjswTZ8aEXA15AQiJDKmUiHQhvKg4Rhfre3kCu
+Prp1jHRXIdTXapLZgjWwjy091uc37kCIvGstSOxmNbI
+-> piv-p256 RQguQQ AxfKlFTYgyFzB7sxct0s3/QcoVs1AFwSysZTTBhJjwZz
+GYuHnz8yk5TsY/y2oibHnkFh+Ah956ZiSKXzbT5Fu+A
+--- ++NTK2N0Od5wJsDHGXUg5AbVPNRl2siwehTeRHNMkec
+T<13><>rI<72>ؓb4 <20>t<EFBFBD>!5d<35>C<EFBFBD><43>/w[mA/<2F><><07>\]<5D><>N<EFBFBD>!<21>~岆<02><><EFBFBD><EFBFBD><06>r<EFBFBD><72>i<EFBFBD><69>m`<60><>Y<EFBFBD><EFBFBD>
--- a/secrets/services/gitea/databasePassword.age
+++ b/secrets/services/gitea/databasePassword.age
--- a/secrets/services/gitea/homerunner-token.age
+++ b/secrets/services/gitea/homerunner-token.age
@@ -1,21 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 1fxDZw cMpYaAsZX1DfALzeIbDzzyTtLxJ1LF8q9OzI84w9CE0
-AwT1ki3vJ7eTyBU7Qpb+cU5B36KSy52gAm4NtD741hM
+-> ssh-ed25519 1fxDZw HPqtOnCf0xv43GQmB6iSSLGK6r/5pCFFZJC37ioMIw0
+VjvteDjUqqkBas9FzZKxlA1y5/TwIB44I7yNH3KBDYA
 -> ssh-rsa VtjGpQ
-fHIq/CD4ScNmOktk0W4RM7TFymmO8K2odjy93u+gHEaOdSzxOAbK1cwQellCejzZ
-VmXOY79xGEW0N1m9Ufvn/xRBy0zFYBU+jDe/DGyE1dfsr8MSK5kPV8mlbV7Ds07f
-wRs2cPS3ND9Fvv3ho6VhqSza1xm70QLiNmJAOUuSgkMovzssHmL5DOnghwnkgDNV
-1g81ApBCFRCA25Cs188Bficy/q8Wignh+Jl+bvUMGnRWNhepQ+6Y1rFIwfHXw7KK
-WDY7RJdf2mfQO/KhAfn+HDrE51Zm2HdidbR5oQ7KR3QyplUMxp58MuIiEX+pxpu1
-a/7Le6cUb6XDJ86c3XvPxkYrE16j6YYkLKRC2NPJMWeZmtPe61FPzG1svUPtOt8O
-BfivVh2gHtVww0XmQljI8R0cCpcArnjIN/0bG3qQSPg6FApqyA8abP6mZSq3vb/u
-XHPiMI4Up0cQV/5sLaWgwLvI/tMSpKdKQlru0o+I52xZH5SNb+QtG9FVFvL94NtS
-lGzuvcqmMTwhKjKi9E4ZVEtjKNt9914ya7a5KlWB2qQkFssWlcvFa0Xc6iwIHX+5
-TQpUl8TdZQtmr+5kDGz2psdlnIhpWUlIcVvLjCzjcjszTOMpIOUiHQ+wx3+vevh9
-X58Y/GN/pj7I4grJa09rnr29y0jMnN53CuXQT4G8eB4
-> piv-p256 grR75w A1WjqyV9WqdKb7rsGJZfmlhiahvD8kIIwZhXItuGQ6A2
-zGS+UHFTEyamuq9OktfzNhPGTvOVcastafGVLSLVupc
-> piv-p256 RQguQQ A/auHj5h2wGNT9zUSrbAdnWJ06SUi/kzm2Z6kAdN8VoZ
-Nr3B0v3f73+MmRS4rRYHuEwCnhbL42KDA9q/ac7KAz8
--- ve058coYpAkA4i4jtJlYVMEdtfU6T1endhoIe4Ctj6g
-ly#<23><1D><>uXT<58>A<EFBFBD>O<EFBFBD>Z<EFBFBD>G<EFBFBD>t<EFBFBD><74>_<EFBFBD>{<7B>u<EFBFBD><75><EFBFBD>ٟ<EFBFBD><D99F>Q<0B>\<5C><><EFBFBD><EFBFBD><07><>r<EFBFBD>w<16>[d<7F><64><EFBFBD>bM@<40><><EFBFBD><EFBFBD><EFBFBD><07><><EFBFBD>T×|<05><>نu
+Xx8tuS0ClpvIEn/diIhCInLuiNym22i0SQZCkFCz5V0FKNM0L9hzlqU2A2wLemgz
+iy1So0jNJWGt9ylUCyPI9ucyLUgoXFXiQjaMkI85yj+xuUDHkmereRMW3AQD+2LL
+NHsmQQchtmQg/gCZY0MS7gq++ULDwlakAkwMP0U6T19i299eBSBL4Zoj00rKNlx
+KLe0jbNlIe1uhVLYRfyz3S0I9z8gWDSQ8soFoqrJwKVHsO7wmH/3a0dCEWSHRRVm
+MRfU/Oy7A8U+iD37z9DxSN2O6hKRLMDu/NyTXUV95ImYwOcA7ya4nShwpB7vZLop
+Vu/BtX5HZ7JvBK3kApyR+Da5LYsBhqrDmqXqtykjn8TM0WG65jLKp5XolEcGEfUe
+KrqVMhVm+d2AijpRvsbOv13B7UmZkxBP9+6/o7uujv9nV5uSoGwv9tZn9ubeZyXo
+U7q3MaURqbgv6YV+h/aJ1X0URmPMyjUgkCLI3HbKJV+ZQH1jbNsn0aiVU0d0MXBb
+cE1NIZdfrQ/+Mp14KuiKoY/ycrJPQkg+Au8LANSk/pzH/lvGO1EP50eBRz4hIqEg
+RaNII+fQosyr10HPvlgMfEZQnDoG6H+Tvhgt4S6Ex9lyjKASnx/SQyRwhd9SPgDb
+bArbSq4lJ59rqw7TX2IrkjDgvv/FMqdcxjW+kIOTWDQ
+-> piv-p256 grR75w A1d8pk5Qfx1xq9vApCkKKj6gx1elqSYxLezwoChk3k7Z
+AeYO+rslswXdRJK/pwe9m3CNHIKsrRkt1lamyysDNQk
+-> piv-p256 RQguQQ AukcSmMTNQQZdr5zDOjMTnsOFZp5H5D5ohuVdIQUpUYM
+aJqrWcaXdpfS2vakEu5vi/AMHnoUUrUpm0bRRcCxiE8
+--- fNTWHdKIXpbJsZo2WnMAPXTNMtr0hKkgivCIi1qiQps
+X<1E><>R0j<30>ebMB7v6<76><04>Ȧ~
+몀<1E>8<=
+2i<1E><><EFBFBD>2<EFBFBD>J<EFBFBD>]L<><4C>p
--- a/secrets/services/gitea/mailerPassword.age
+++ b/secrets/services/gitea/mailerPassword.age
--- a/secrets/services/gitea/serverrunner-token.age
+++ b/secrets/services/gitea/serverrunner-token.age
@@ -1,21 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 URAPyw q6GBwPiLV9mwXNkJxMR0HKczC+8UELrc2lFMXYtn4l8
-Fg1LWxdM4A65xlrpuUmtw4sUEzyFWvUiV3SmYToNKNA
+-> ssh-ed25519 0qfOZA UTOzjwhqcVLmpf3P/nzO3aGKzKH0YKq04sUbFvMa/FE
+a2MMcZXucDEXmy/uU7JapMsboImCGsUiPA2Pr/wB5yQ
 -> ssh-rsa VtjGpQ
-QZLsrgM1xwq9eN+4U+0B5FosDV+uB/ySfXHz4bCeDpN7rGO9TJnKHI99bRWc3XZw
-ooc5FM+jti8/nIU/Gyk4WOHLPYduPe+BOw5xPEGCVd2rn3bm42V/KckDYuAl09FJ
-vP1W1zDkvpHJbFiO7ad8c9iK5kr7KU60AtSN4kJyoIesL9s6K+kCMZ1odbrE3pJ7
-VPCj4HhaV3nL42tHnupsFmWuU6GencUCWWlqi92s0mgWrGsOHqB/qR6eSzBGy4a5
-saNKSE5f7uXOGEtN/bGvulShs77uD801Uc7FCjpvPN84bzIwY+VScE5xlONwIfXV
-ayQAtRDlNdsYcPw7NY5nE+o8TDUT29qH84Xn7c1qeC1/9FygEUoHFJpuqI7zDnw5
-6dyWzSQeOqPJTcOVlKwr2IltTL4MOJdy+u36awNflW5y6wcNakziGoZUqxKm84sz
-UigfilWrzPfOT48IikFG5ToJuvYz2VyUCzq0KgVqkifIljWd0AALotqAxJOdzy+s
-iOycsVQzI5BcaSqtBLXgt2t8OAo+wgZyAjCKTZDF5mPhk7U1QF0z0/NOcIrxSR+D
-otIF+EIttBDC3t2HAdIxglMxM7ibE6bCwebCDuNpnQlLoY0rvfxGuU0f30f1XVyE
-VRSN/icUkMLa1hm1A7W3T4De3N2z+kBN86xBVrpdILM
-> piv-p256 grR75w A5n1qH04NhMjwh2mNoGOJN9Ofpi0GOzWcTfCW1krNrGe
-8L4b+0n8ufby6d5lzDTLNxgNCtw/mkLyh0aZn4mzo3g
-> piv-p256 RQguQQ Ayx2cPaemr6ww5LBQW/0fvEkap3iQhpFXgMwBCrYnuhg
-nnUREYSDvSFX6mP8Ml3KuhJQZpkOC81PjYt804WB2Mg
--- dF24BThWb7swXtgAyxu/B49foT/AAEWVcNimdd1qeSA
-W0e<30><65><EFBFBD>Q<EFBFBD>el{S<>F*<2A>09MB<4D>gZF|P<>zd<7A>cy<63><79><EFBFBD>^<5E>y<EFBFBD>$<24>'<0F>HB<01>Y<EFBFBD><59><0F>L<>C<>ÿ<><C3BF>A<>ȃ<02><>\<EFBFBD>
+Nr2g/ocV0oTbZydmcRnESyI4VOJdMGafozm80EMarbQfmeeRCfi76jxct/gpnL00
+P/2d/3pfvqbpuGZRg+Q/BCY0Vm2AujJ1P2UTxpnzC42iZu7qKWd5EY4z0Hok53kg
+McPh+pgNhugLr4Yh2KHpT27FfJpD/Pmjajg7G78Q9P5uel6SKXIW4uFO4Lp2yLC/
+vC52XMqxLrR9moCTr72dQPzd0IIhQ2vN9EtZkBnxUW6zt3ILAYJ06VLAGvVwXIWl
+0Wjs3G5g5v+H2e+Em5vIy1hdub/3orEL4racHO0m0binK/IVRJY7sjZDVDrrerFS
+SqPORQ3a7jmuHFeHxwAlRcmh/O1gEgAnCZTZRfQzgXI+nfPEzuL0yENd/ksUPBdm
+q2zQSv1rrj/tLMtxk4vpG8FkPp5UctaYignvHAp95xC+TR14aDUdT4x4MGboHIxu
+l6Q3evVJzblwIl3JbzpP3yOA2k25Y1KI+nVDrTqAdi+Yy4jtIOA+XancIHrpLzAO
+21JO1wwGtAsjUDCdhnYSyMcOiRLRHzPoK7o/BGx6b1Uqk2WmWhZnZft9MHPp2RtX
+Gv3PBMVjz2CO+f3d8B4akPSApgQ9fw1Vje5fY0CDWdORV7tHDCKb6fmTua2d73Iz
+ANrKYonqWhjf3F9u7zzM8/xd593AH/Y+aJo+z0S+Z6I
+-> piv-p256 grR75w Ap4du3RBcNdRvbwjQTpP5PPXtNCRuoQePt6ULYEpNM1r
+4Qe4c6j7df/TajuxM5Q1qnC/TCBNNI5K9WCDqD4VM1M
+-> piv-p256 RQguQQ AoR+aGTAQ6VELef54cGpukkWjeKz37tDbW93ncGWFsrI
+KbF1N14PYEQ28a/MePeq7hW9LAgUaNriFo6UO0eBvt4
+--- F8GiyUf87+vhg22ldWuC2j5K8WGAK3y5lRDG6yrzBPQ
+a<18>$<24>-<2D><>|<7C>h.cr38<33><38><EFBFBD><EFBFBD>Pw<50>3<EFBFBD><19>Nh<4E><68><EFBFBD>B<EFBFBD>j	!z^<5E><> b<>8c<38><63><EFBFBD>m<EFBFBD>s<EFBFBD><03><EFBFBD>
+<EFBFBD>\<5C>3<EFBFBD><18><><EFBFBD>f<>x3|<7C>Ne<4E>
+=:<3A>
--- a/secrets/services/matrix/mautrix-signal.age
+++ b/secrets/services/matrix/mautrix-signal.age
--- a/secrets/services/matrix/mautrix-telegram.age
+++ b/secrets/services/matrix/mautrix-telegram.age
--- a/secrets/services/matrix/mautrix-whatsapp.age
+++ b/secrets/services/matrix/mautrix-whatsapp.age
--- a/secrets/services/matrix/signal-registration.age
+++ b/secrets/services/matrix/signal-registration.age
--- a/secrets/services/matrix/synapse.age
+++ b/secrets/services/matrix/synapse.age
--- a/secrets/services/matrix/telegram-registration.age
+++ b/secrets/services/matrix/telegram-registration.age
--- a/secrets/services/matrix/whatsapp-registration.age
+++ b/secrets/services/matrix/whatsapp-registration.age
--- a/secrets/services/nextcloud/adminpassFile.age
+++ b/secrets/services/nextcloud/adminpassFile.age
@@ -1,23 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 neExcQ kA7gnUEYCy6RalFh6kxodgZoAezBjWWhBCRNey/OeQA
-ojF3TqAmG/CdHajKt+DoRQqSyASuErCNn1AmY9INExc
-> ssh-ed25519 WiIaQQ FLyAC63/e9jua/u+8ENvTTiEKQltWEIFN6OahJl81X0
-cjRVgitd2zUWuRM/YiEsgiXvQra6+xDC2LATgClQJ/g
+-> ssh-ed25519 neExcQ 8cKmhu5xTxTuvVbBhVZM2W2qzRQRVX9BSojcK6YgCys
+kwfUlvEPLVbaq/rjQAu4s2NhGbxFfdEeLyU1eUH2gF0
+-> ssh-ed25519 WiIaQQ TvRNnifxg4OPDvwvuUIdJgwrpj8KegqfjVEB/in9UEw
+U0iqVaHbZS/SvCH4UAzjJQ9nPiHv779v6s5PwjTxf5k
 -> ssh-rsa VtjGpQ
-TFuVVkA3q8W87mLUK+GeebEPb5YRxG+avEpRyxUcMlFJ5mI3ouF81ub6RTKYh2ap
-TdLsCyPmw4nyNHFiRNU8xaIkABJTIa6B30jYx1vizWc5ofZG+JFyD43lDyOS2cK+
-Z6PgaTm9h7iUQue75XdtDJTtjJEgy3wqfkjRetmMSiOGjX2X880gWXTlUdCDQfNc
-pOfQSyG46BYbrJ6Su3C6xwCjI1xAM6U013jXuX4tRycc9pWWNZAKmralCBJlX4v9
-mX7oSiYq9jJLXKWntKt7ju9AtA3fkVTK0i90CpcCTWi9iyzqb+CVAQTgY6BK9J6W
-s0ca7i0RqtFP+TzolcNJwej0BHK1MT+SH/4LvtWgzq1AS0lwSTZ6vkLIX5aHSl2v
-QB0cofMfE5/AI5i4WU5OPq8Eq9+jDYqJY4197/8ZIKOoBElKQO1e4Hs4m+UmRKll
-n23uLeJ+tUEUmULYQ9T/byyuPiSIP7rOX07yt1ia+TeGoKFS6cgGkdqbUHaMgiBH
-0PzK+cM1jzdTNbqI6q005FMSJ6RMDQpen4/5UK1Vh2IWp977WlL49vVOcUGlwyWJ
-KE7egtoJO3v7a4lVMcO4sA+b3NF/8PPXo0yLqXQeNyfPcuZPCaGbkFyLE4hEHIgD
-RHKR+qaAeEOnJQ1Vj7XmplAqPWDEnhPjZNHWPbRV44k
-> piv-p256 grR75w A7PYHri1S0sZB+j+u397FidPU8X3zsmrk7lwksILwQfX
-c8F3TGjKTHggMreRtCQmMk8Rq/ti5QXhVMiNTqYnAuY
-> piv-p256 RQguQQ An45rf2ChsswikN4AbiObbC7mjWN3iERwgxDIM5VAJdW
-APA9HCuSB4YmzEA9L/U9lW/xNgVEuxAsVHbrWCOmotI
--- SxzH5s7gz2JN1aBarkzD+KmTEAtJoY0iBylc5dQ2dDk
-<EFBFBD>wg<07>2Wz&<26><06><><EFBFBD>f%<25><><EFBFBD>3<EFBFBD><17>	:<3A>Hwt#C~^;<3B>5<EFBFBD><35>
+QZHM+/KssZmfX436QJGBGbhlx36oxCg4jgdbRwa/acI2s6ppawdnFzyWZBhv/Xzk
+wYcT9c2ciuy/aEx6uX7fSAiKQbfq0d9KEp+d2xwlpL02656hJ3Jya3U4RApvEFeC
+lNjyWgLKuyxYeC20f3/NMg2AnickMicbw4WCzG+HWnVCnxDe2JW+ZbXPsoBg9IbW
+BO05nRKB0jonuA5NDvHZ+a/1xf/4qarj9vmwnsoK7jU6TGK2r+iPHuppC/LTgofm
+2kXKDP/gpRpIblHr2QukoGeWmXPGeF5PXXCPC5eor1jAhwrBTBY1hL29mhb6mK5M
+qvX5wvayHgIHvX73fn2oexepc3QXjazCKSdVSykj/s0N0//0fbtYJe8qIbgfeNen
+Lvn9DgsDvQfC83Iikh3r3V4RtmHiD12gA3qxc3tZSQLftbedTbylGnMmCZr2c9w0
+4396ZfUfjXk2Px/XCiy6WBghW62QQ4Q6fGYWBViL1OWCoudNNRCfD72E3jdfj2l2
+cScM+huEDU58dxpHM/6yLT+97Tta7JDpgz2ueMUfKFCUnopKNKBPoaZfFzvi+nCw
+vRHVdt5CpN4oJc+mokWCGNt4fK5nyvyO6nDe9cHel91sfS2nCiukf8IKmEDlZQGd
+jEMLZjAkuEHwa8Powxi14egunANQPgLSM5EuStDmhlU
+-> piv-p256 grR75w A2nunTE+4FmZOKWQhinSlizVprH0lX81NKsVEDijzDQK
+8+Rdpp1JCxbbxeTVl0WGpQHDlqb5e22zLbBkwBPDYkc
+-> piv-p256 RQguQQ Ar8nU9oNd+TEfTsdIM4ka/J4IArbeQKfn2W93TYOkajJ
+5YnDAocS0lDBrO/M6sNWyn/Vxa1qLiudf2Via9UOUW4
+--- yDdPOHLA10Rxzl+kEyCUx/lmLZaVWucWY1Sj9rdo4hU
+B<EFBFBD><EFBFBD><EFBFBD>s<>dG<03><><EFBFBD>m`<60><>),NU@<40><0C><>a<EFBFBD>Pv(<28><>rM<72><4D>
--- a/secrets/services/nextcloud/dbpassFile.age
+++ b/secrets/services/nextcloud/dbpassFile.age
@@ -1,24 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 neExcQ tIT1GU9EH+d3ySASWAFeBWVpjZph41EAS4KMgf8PYgg
-yu4Gg/0WUwXzN4+Qc6/+V2kqWANi5ABAHqVztZn4XNk
-> ssh-ed25519 WiIaQQ ozjI+Fc8fz6bSZi02AMNQHLOh+SOiGlccReNlazykkk
-bSviH79sSX1foZhI7GNWmy0Qw3N5jMzWz9SsD7tgrb4
+-> ssh-ed25519 neExcQ VfWt68buOl2UetDKcQWuWRSOeJi4HhQxiZVI4lIfcUU
+GTWI83cLyP2Kjd6twRpaWpBq+U/BYcfDJeljQ1CZ1bw
+-> ssh-ed25519 WiIaQQ nqwbWtevakrHk3sODtw7l40klSb4cIyi4uSsnpcS8QI
+PxfriZ8CdPhPTNtjQL3lsyjfjkpBsnmJc0TRNM1pyHM
 -> ssh-rsa VtjGpQ
-kMkhRGQr6kE7VCWYD8/0NC9U5cp9sfmjWtqwI9kSA9o88o12yPdwkTSB77zePNrG
-Tdi2jUi6V3iOBu3XmLazjivDoH1M9p/8XjczBztWaNRHZd+0F+/tKUCtriwjslQX
-STVIIuuMxmMyFR1j7LeRg6FQYzvV5pIoHXA6QKnkjWQbtPjEAeStZ/v5XzQUBfvo
-Ll0jLp2P6wDaxVwBxu5O6NTkzJ55VGI4KWshaSCIgYWtrud/waZTf7S2rX6vIvk2
-yp+vHvUwyULVuxoUVBbkLC3ZBfBke004bB3lhWJlJ5Ws4gUAXxLlpZmGRdC+LOzC
-031EJRKUUWdmQUBXOrA+SFKrEkgcyq9DsnkQyE2jeQXTtJuyy8zpJbPEB594KPEu
-J1Z4Ej96iCEOgRqwzj33X9rtGACnRBD9WHR8ARCIioXIxP9DQ0GfcfR6gx2aW3BP
-ulLw5IiLMp1LoKZyBJ/ORbM26VqiAFsRdpduVVZjj/WuBlOU9WNg8DsjWfueagGJ
-4SbkxoYwGUA4mNtsxh3FdLq6QODABUB+jmIL+NTG7ngNdjablziMTJ8tGynp5yoH
-xn0dHqtl3lmWqS4SOXoeQu9CKV5dR/glJz2t0gVbe3hBQAb9Q/G5vQRt+ZeALnbR
-MLHeVcVIyLgA5xQ4WKif8CFLAJjdsl3m4QF1q3M7EbQ
-> piv-p256 grR75w Amb9EMc3fjOn1vVuueuMUfsXDNwZz+eK/naS5eW64iZc
-ujei8tkec88biJcA7KAXur/1/Tra+zNy3Bq9baZyhyo
-> piv-p256 RQguQQ Auz4GPIzwMHMvADc6p8MGek3RSgFNq70omjzQZWIqnZI
-M1XN3nR1oAe4qC1MYgCstwtP87Aaidy8tTPGONubeWo
--- kLFiVE6Nl4A6aG/ZOkE1ZI2YzRjEHbawysT3+hIMbFc
-Q<EFBFBD>}c<><63>Ȅ(F1<46>!<21><><EFBFBD>F<EFBFBD><46>Փ<EFBFBD><D593>^Y\<5C><>(n<>Wdy<><79>;qƟ<71>f<EFBFBD>L9
-<EFBFBD><EFBFBD>0<>(
+QRSdhHdAcGlw2c1hxGNmtAp5tPcjQ7CI+v9JkOyOH9W9KF3uOfshrpkz/psFPd+s
+6eqQDAwEAgla4pO6FHj/H2PK9KDHY3j2e8BZyvJ8ZsefUsSAYJ92hcD3fdISL+kc
+FMx4Dlm9LSeGGqElbPotyU69t2O/WLF01HqLDVgHrlyTzWvQMhvATA5Yzcj1Izb
+0AlA7IOE174E448/Ovo5a2T+DF0w2vLEPruH90Kvs2lui+i8yC3StgBwB6flmSfc
+dSR5qO0XCZ8gK/kkdsz2iZonsBCbEugQayN+EoE8vop6YlPW36EtO8IJnVnKmVEX
+vy/Rj3dubm5Wsp2hAyeXSXx3ity5fdSJ3TVY7TiPLPlt1yik3Wggtv0DlgZK0AML
+x1OJbrZRrzDZKYzxXw69+lOiV5XfVUfk9PXC+IAj3xf/dEz93b6Pief+PbOQg+tz
+INDWkL67/Yx6rEf41iLCsQananBV16IeM2SndRyrmT/1OCcLUR/8xqBHfOg/K0kp
+lHL7D7/neqRh2E8KOEciHgWFqWT/tV5XpyZVvA8OiYLoVbmLG55q4pexrDfQ9OgT
+ZDIL94VjiBDH5BmPfxLhRZP/58EhLSDH3WziIWnv6Y2Y1bAl5qiRU4tEV0RCHqyJ
+xEeLcqI5uFwDmmt881zlyAb38oQCGq/YRXhGygwwn18
+-> piv-p256 grR75w Ayt9mI1/BJg96jlkLVjf7xhDoklNuoFe3ZeKLYzFqDPO
+S3vFS+S4ZVC2O00P5u5GKaLtbabBPUCuuFNFFxcmmUw
+-> piv-p256 RQguQQ AqsDGN35gXkyWaKSRVATyt1Ap5gzLKiAx+UHwhVXdhhG
+YUqypxYBQ2RYbnMclNa8PSLV6atbVRCho4wHUCZegkU
+--- Bay62OwVx/Q8Nf5MHRu7VOWzwh1LtkWbxQytL16Y5Zg
+<01>n(/GZv<5A><76> <20>!<15><><02><><EFBFBD><EFBFBD>fs<66><73><EFBFBD>#<23><><EFBFBD>v5<76>K_<4B><5F>t<EFBFBD>k<EFBFBD><6B><EFBFBD>s7P<37><50><EFBFBD><14><><07>k
--- a/secrets/services/nextcloud/onlyofficedb.age
+++ b/secrets/services/nextcloud/onlyofficedb.age
@@ -1,23 +1,24 @@
 age-encryption.org/v1
-> ssh-ed25519 neExcQ PaDnbr/esvrveIOI+dRO/kpATlnScoAZqt/BhFIcdy0
-Mf9EHEb8w7hz68P712DXusisLReJMULg/uw2FVhu8pI
-> ssh-ed25519 WiIaQQ nKLQ/MT+VWxKGl26fDqae0oVyb+RIsKEICN3d5FlZyg
-ldx5KNip3LN6dh0LThaeRVBvO1eBOv7nPLIUsMWWykA
+-> ssh-ed25519 neExcQ XvGpJsiChcxBbL7c5CK2mUvdFHV5ypmx5tpWVfwuESg
+1WI2nm5/oPtCqXD0N2WStDOh91UT7IIS4/vFwWL6UA8
+-> ssh-ed25519 WiIaQQ SLJfhzdJpYzzzqFqrR67GrAuTWFJYfX10iidobo5xxs
+KF+r/AOKKLHqSf1h5AOJd/3IZTKm442ejUnWVhk04/o
 -> ssh-rsa VtjGpQ
-Tv00PqDbjc6vKJQ28KaSWK5/z9xv2SKYK3Q8QMHwAOQjbfJKUfXx4fb1qWXwW6Gs
-XVVET8tInXGpEeamGwI1UvRrSqeY9JvAo9vYYcaMe1cFun8T7WFL0AWtYS0X91qC
-6EtXmMmaQn5RYIv3qHUTYiuHQbCBe2tFkU71ewii2sp+DIovOvtoeyegHny7bqst
-V4tv5FF/Axh082Vymkqkz4+genRWfvs6Quwu+Zwyx1NEostl+skVKudHyJBCUCqx
-vbLiNW0o9RxmE9xsQgH/RPgTGGqJycruHTJVhkoETKRkGFXTPsUIhRaxPyTcZKtF
-b8+W3Zo3/cPfhRAuHrhHVoDHfOGystOpom5hPe4GnsgUcn3YhTnUWEek8zlnI4UM
-6cOF5F7//P7+e7AckC0dZA56rS7GSws4ppsuTjjLiP5jFPcwDltyCJP1XhWiJlkv
-gFShw8pZraFENfdZFXRz/Pwc9B9xMwEa+Ck4xZEe7Co6JW553hdu2Eq36N+5UAha
-UkVFVBNUHgt/0zDBCES3EBXC9aTG7Pfodmcu5kaa17OtED+QfuG0C9KSxRWSwWN7
-HWfu6/G67hpG+ObwnZ63BujMh/HxKMTrMFhAVe7+o8R6UJb3bHuCSEV6tz1fpWDw
-jc/+y7+34GRkc5j/Qhi2Ij3LEKp/jXLUOT5hgB5wr/k
-> piv-p256 grR75w A6pkR+eI3eV9xgBuMRmjteXKBiZ2ff0k13JmRT75NZzk
-CsAEWengjsuS6xAI8V0tNimik+8oPvlqCtTagH9nzxw
-> piv-p256 RQguQQ AqKlZEQpRysmQkxhm5Pf8ZrAxNggkEELp1JHq9hOvoiN
-puxQFLpRGtxmW21nX2WK+/Ccr9m8w6QB0hIOYd8/FDo
--- hRz92/r+97HpbOy4llcGlWxdyne4Umip8KEYvn8v1a0
-H<EFBFBD><EFBFBD><19><><EFBFBD><EFBFBD><EFBFBD>K#	Y<>\<5C><1D><>b<EFBFBD> yx<79>f<EFBFBD><66><EFBFBD><EFBFBD>g$<24><><EFBFBD>;d<>K<EFBFBD>0Q<30>Z<EFBFBD>*<1D><02><><EFBFBD><EFBFBD>檡
+AKdJLoXUUX82mhV84R8noG1qLnD/uvArV0gsYxJuS0hTnkZOyxV1XgqgH6UrgaUw
+G6Q7aYbiNYMA4+6rhyWOnH8I5QRcCVEK5y8jtiyTEU3QaPAXVhEq1NpfzrsyHd7w
+CB8mfSSAG9jE1owvuuubxEqx4YKu1oH9kh37GIeKmJlz67qJGqT6BnRMMxpU46xA
+C0+c/3CURj4N4fFtxWNVpxb8v4tUYRmA1Jq/FnqqdAqFIyw466eQVglT8YDQJvHs
+ufyR7Gnbk94qvXXg5G878eviQL2T+c/xEtVEyLeHs017dNq5FxeBBzEMwqAKshCh
+OtH4AJt+U0Rzq0JTIpRH/0V1exK1PM/9DL1KBQPAlfUBb9iYwKsQo6LieXS+Qowo
+qMTPD3xSfOD6uzmKhXCdWKZWZT6S2hwHjeXzXjYjkhErjbwjj5c2v4UpXpwdVlNN
+zocqPxVGCplFuiME0vLsuztiWtei2yH9ZgFKxNS/kxm8GfhyelAnAQng3r25YYwZ
+nLgGP0bcADAgwgXGTFxlyY2qoM9MKgnbjhtfwImLlF+WbC+IOUwBDklSgq830MKO
+ZQVccNwuZoO+jivXpfGM4XApK7pUXlz/0nc8jRE7u2zXpXLqv+fLXxgTXFYlrogT
+66dmjeUBrB/kMS2IP52ZdpdO3eGY1a75H5W+DtMeAOU
+-> piv-p256 grR75w A4Gic6auHqevWiBh3WizXvYxjX6e6JToxNBXEMM5SZxL
+0epbF/vqJyp3Cn4Hr3ay751J1I089Hxus1vn8jgCa8g
+-> piv-p256 RQguQQ A12b6QQk3G0/ksYw0D0Rfx0DKMYK5Lnfi2q2tdtMoEfr
+zqAf5KbFsPpemu2I9YaBNipQsiz2Lo3JbuxZ1gMNQl4
+--- a92cT7ctHL8S0/tTCY/rkfy94THEcoaIEPL3vLrW9Z8
+<EFBFBD>
+u+	T<><54>:<1A>M<EFBFBD><4D>ϵO<>+t<>X'<27>r<EFBFBD><72>
--- a/secrets/services/nextcloud/onlyofficejwt.age
+++ b/secrets/services/nextcloud/onlyofficejwt.age
@@ -1,23 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 neExcQ KUYIznFsvSk+w0vI2OoeVJI2BzqPyVcqy2MPiWI54Uw
-HGz2Bjtz8w9Ix18Vj9eHRpqlF4veJYb25cx9mOtECsY
-> ssh-ed25519 WiIaQQ 5PialK8TLy7qTwysxTbk8s7upI/CqJwQ5dw9GB7eCUE
-Eghu7qNi4NhCTdxeoIOauZN67hIuCjz52ypHrN0wtos
+-> ssh-ed25519 neExcQ 39vMfysEahyydxnqENrwNOZi9yWpZSIWsNQxkMFBQik
+bvJK5Gya20UhZ/dWKHAQZ7CPa7v/pISwB90WJejYA5k
+-> ssh-ed25519 WiIaQQ KZ6RU6kDjHVfy5YwlmjQhH6YBVkJqrRonUl02iYA2m0
+GGsCI2D1tN4lGpsHJph6pq9N8UYdG2mfIY3U9urTR08
 -> ssh-rsa VtjGpQ
-AbOjkHBxvPe4Zh27X0/vrXFS503WTI6uYCCSyKVAOtjL1m0Dw2LQgefsvpX46ioU
-AgAvGH8UdSm09OL2LOZxEkNNAsYPiPsjQ1iQUm4lnVSPUkOzjD3X4olJtnJhH87r
-0U6LKCapGI4EGnRfrffh40OTsbsPtrkWrsG+J8DNCOo+rpe8cZ10Mw3TW72WmGVn
-1tcEqFyvEkRciOVXoDQWKvyM6MkY59bEm3wZtztppRFXlPvkJOBC//xZn0thwyAt
-WLZTbpa647diszT9mTwfY5kkBB0XfxbGb2TV7c6T87NdgH+89DFhX3OmUghnV7j0
-0aZ7fihRsBG3665HYO0ohmBPSYwSQ5LA/opTQ4/djXUIT6dHNQtqNQEyxXrDqv7s
-ZXKHGy86NBsltwb+6JfAmGhgJaha2koRhsm00B310uSg5ew1dsTZxFfMIS5c2NRu
-MY/Ev5lxvsl8sHOOe3bRFCEnUl5zrGtG5qHJk0fSMtCuJock/QGSf5UZdSda4Ucz
-xbXnoHSNjACK6IeRh1ZecHQHp4O5WIyAn26Wa/nq+d0d3JgVbkDfgysO8UU1hCY2
-MZmTe5NrNpvwjO7E+p+aGFpbBrANG/qrbCDfdSYRi+iPHgORxtIpvT0RtJPuiGIa
-zlo+2QuePJWudwYCL+R8Hj3sQWfrSXgevWspY2O6avg
-> piv-p256 grR75w A6ALBMRRD+paPUN7vIpltqv/V5B0+C/XB1sebO4w8laO
-+Vd+Guwuil2V/TKPzrAIpStBPMRjuBAYITNxG55949s
-> piv-p256 RQguQQ A4Fa+PwupjPAZvGrwZS3qSe6ZIyj790FPDSQRkzhyWBr
-wY8KN6FzkbBknxdVrOtQ3rjM5s1EaPI3uRln6MUjdsA
--- yy/nHaELgLTk11GU5J3lwGHaQN204wJm27uzyiJ6/S0
-<EFBFBD>!a<><61><EFBFBD>q<1A>C慐<1<><31><EFBFBD>T<EFBFBD>p<EFBFBD><10><>C<EFBFBD>><3E>)7<><<3C>X<EFBFBD><58><EFBFBD><EFBFBD>J<EFBFBD><4A>2'<1D><><11>Z<EFBFBD><EFBFBD>
+a0oXJCsFZdtpHuZIASZUp5C96ZP1QU1I3RSpIe59hnnpGLbXZE2qntXBfQ9ojkBW
+bgNdxvAcWLaYAiCbe6Bo3S9+Q2svJQlEqIZ59o2H9jh+swSoLfWgi0Blo/56B0GQ
+UrltI0ftMhM20TaszHwmVhvo3yODcZpNhjAMNVkQuAov9BSQdgGRgivBnt1FfYYI
+f6nqfrE5JVoemk72Ip4jQFVWylK7drEU9W2WlwOsF9zkHOJxdNWiaaHpmnsgOEzA
+BIdVqYZTtRElqDKM3j4SdE7hL6i4fIb4QAsfX5XI09eUDQLSRGF2o3lqQ4FVx+hb
+YE31vr6yQEObTCbrf7zmKIK5UwgQbMf8+WbCxDdxF7FqTKrg7jVhPtu+n6UsJlzv
+CXsJkKYZwyESZ5oNjCyqYkkkQP0JChl886OPFY507/Xn3gl3qj/Sh7FZyUuLZ92X
+aTHCJ5AHGwQKFnVO1YLXWDcn0F3NIq90YHJ1NsxNvNXZJmcCyBTMtDJGq3q/6Xqz
+qXpVoT/9XHHStrKYvi2lut/PFMC6nciixmiNaVbE5Aok5eNhG8wUTsUVRIr8+O/i
+07aQBeg7RJ7lW6oQ4/kdfufQbQHuQNchQzkdvQf3azXCXBTJ/+Z6uQuVg32MVsjq
+fRO2BtrWjsAVThpeVAdfQb2b43wmL9HBhivqYaBK1gI
+-> piv-p256 grR75w A9sg2H7x+75AK9ErkbqMkC06KEDy2Q34seCXCGUguz6H
+1TchlkXOzymAT+eDr4bpwugeLQ7gAKRvdYC2xcd9DL8
+-> piv-p256 RQguQQ A364N/An/SMqBAp0yrLB0/osdlmz/MgZFG4RB6Os2fLX
+V4qtGLbpJrTTFWCfTMcWpuVUiLflDdxXkMqPOtG1R/k
+--- O4Xqa0RavBa09l9txN/oIQjAeZIYsur2UsxaSRmhAdE
+<EFBFBD><EFBFBD><0F><>`<60><><EFBFBD><EFBFBD>Dk<44><08>/9<><39><EFBFBD>o Qz<51>#fIN<49><4E>J<EFBFBD><4A>3<EFBFBD>Koڵ@<40>><3E>Zz<5A><7A>Ip<49><70><EFBFBD>h<EFBFBD><EFBFBD>
--- a/secrets/services/postgresql/initScript.age
+++ b/secrets/services/postgresql/initScript.age
Author	SHA1	Message	Date
Kabbone	0249d17ac1	restructure desktop/wm and remove nur	2024-05-19 17:57:35 +02:00
Kabbone	a3f253bd53	flake update	2024-05-09 21:28:57 +02:00
Kabbone	034bc1e4e0	flake add hydraJobs	2024-05-05 20:12:39 +02:00
Kabbone	bd07e688fc	flake add hydraJobs	2024-05-05 20:09:55 +02:00
Kabbone	32133438d9	flake add hydraJobs	2024-05-05 20:09:02 +02:00
Kabbone	d95cca9908	flake add hydraJobs	2024-05-05 20:05:19 +02:00
Kabbone	6f278377d7	flake add hydraJobs	2024-05-05 20:04:01 +02:00
Kabbone	731e4e33c5	flake add hydraJobs	2024-05-05 20:02:15 +02:00
Kabbone	bca0dddb1f	flake add hydraJobs	2024-05-05 20:01:08 +02:00
Kabbone	b88a5b9a2a	flake add hydraJobs	2024-05-05 19:58:51 +02:00
Kabbone	f864f543b8	hosts: dmz: enable hydra	2024-05-05 19:39:35 +02:00
Kabbone	941276e83f	flake update lanzaboote to master	2024-05-03 14:51:11 +02:00
Kabbone	f54df874d4	flake update, lanzaboote to master	2024-05-02 15:29:56 +02:00
Kabbone	a83c214180	flake update	2024-05-02 14:18:50 +02:00
Kabbone	8e7629da2e	font: try cascadia code	2024-05-02 14:16:25 +02:00
Kabbone	941e8a5dca	remoteClient enable Client again	2024-05-02 11:38:40 +02:00
Kabbone	522966f808	virtualisation: typo kvm module import	2024-05-02 10:13:43 +02:00
Kabbone	62acac7285	virtualisation: restructure kvm module options and enable libvirt by default	2024-05-02 09:56:41 +02:00
Kabbone	08aa2cd458	hosts: nasbak: add bypass workqueue	2024-05-02 09:46:49 +02:00
Kabbone	d65b9b558d	hosts: nasbak: change name to match hostname	2024-05-01 16:16:33 +02:00
Kabbone	64545e3086	flake update	2024-04-30 22:01:00 +02:00
Kabbone	02267d4825	hosts: server: change to kabtop	2024-04-21 15:06:42 +02:00
Kabbone	0a0ba2b5a1	flake update	2024-04-20 19:09:16 +02:00
Kabbone	1f7f453fc3	nvim: initial config	2024-04-20 19:09:03 +02:00
Kabbone	a667691f49	hosts: steamdeck: disable luks workqueue	2024-04-20 14:17:30 +02:00
Kabbone	d296306cb6	hosts: steamdeck: remove wireplumber overwrite	2024-04-20 13:08:38 +02:00
Kabbone	b1574ab9e1	flake update	2024-04-20 13:08:03 +02:00
Kabbone	55b518345b	remoteClient change to extra-*	2024-04-20 13:06:33 +02:00
Kabbone	b4892083e8	flake update	2024-04-19 20:49:30 +02:00
Kabbone	8d4d1e4be8	service: ollama + open-webui	2024-04-14 21:04:25 +02:00
Kabbone	653476ec32	service: fail2ban gitea match	2024-04-14 21:03:59 +02:00
Kabbone	949691b4c2	secrets: rekey	2024-04-13 13:58:47 +02:00