From 2ca6339fe60844664cfbe738158f4daf2846b4a8 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 7 Sep 2025 18:11:36 +0200
Subject: [PATCH 1/5] fix typo

---
 modules/nixos/services/persistance/postgesql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/services/persistance/postgesql/default.nix b/modules/nixos/services/persistance/postgesql/default.nix
index ce198a8..dbd6604 100644
--- a/modules/nixos/services/persistance/postgesql/default.nix
+++ b/modules/nixos/services/persistance/postgesql/default.nix
@@ -2,10 +2,10 @@
 let
   inherit (lib) mkIf mkEnableOption;
 
-  cfg = config.${namespace}.services.peristance.postgresql;
+  cfg = config.${namespace}.services.persistance.postgresql;
 in
 {
-  options.${namespace}.services.peristance.postgresql = {
+  options.${namespace}.services.persistance.postgresql = {
     enable = mkEnableOption "Postgresql";
   };
 

From 0689c338ac44bebdac34dbbcfb5c99bb4fcd4321 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 7 Sep 2025 18:12:08 +0200
Subject: [PATCH 2/5] solve compilation errors

---
 modules/nixos/services/development/forgejo/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/services/development/forgejo/default.nix b/modules/nixos/services/development/forgejo/default.nix
index 5c7d7aa..f143b12 100644
--- a/modules/nixos/services/development/forgejo/default.nix
+++ b/modules/nixos/services/development/forgejo/default.nix
@@ -11,8 +11,10 @@ in
   };
 
   config = mkIf cfg.enable {
-    ${namespace}.services.virtualisation.podman.enable = true;
-    ${namespace}.services.persistance.postgresql.enable = true;
+    ${namespace}.services = {
+      persistance.postgresql.enable = true;
+      virtualisation.podman.enable = true;
+    };
 
     environment.systemPackages = with pkgs; [ forgejo ];
 

From 288e354edf03cfa0f4ba4b89f154748893d7e85c Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 7 Sep 2025 20:06:56 +0200
Subject: [PATCH 3/5] add nheko

---
 flake.nix                                  |  7 +++++--
 homes/x86_64-linux/chris@manwe/default.nix |  1 +
 modules/home/application/nheko/default.nix | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 modules/home/application/nheko/default.nix

diff --git a/flake.nix b/flake.nix
index 07479a7..60e9853 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,11 +63,11 @@
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    
+
     grub2-themes = {
       url = "github:vinceliuice/grub2-themes";
     };
-    
+
     nixos-wsl = {
       url = "github:nix-community/nixos-wsl";
       inputs = {
@@ -99,6 +99,9 @@
 
         # I think this is because of zen
         "qtwebengine-5.15.19"
+
+        # For Nheko, the matrix client
+        "olm-3.2.16"
       ];
     };
 
diff --git a/homes/x86_64-linux/chris@manwe/default.nix b/homes/x86_64-linux/chris@manwe/default.nix
index cd6fa1a..abeb606 100644
--- a/homes/x86_64-linux/chris@manwe/default.nix
+++ b/homes/x86_64-linux/chris@manwe/default.nix
@@ -35,6 +35,7 @@
       bitwarden.enable = true;
       discord.enable = true;
       ladybird.enable = true;
+      nheko.enable = true;
       obs.enable = true;
       onlyoffice.enable = true;
       signal.enable = true;
diff --git a/modules/home/application/nheko/default.nix b/modules/home/application/nheko/default.nix
new file mode 100644
index 0000000..b04b375
--- /dev/null
+++ b/modules/home/application/nheko/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, namespace, osConfig ? {}, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.application.nheko;
+in
+{
+  options.${namespace}.application.nheko = {
+    enable = mkEnableOption "enable nheko (matrix client)";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [ nheko ];
+  };
+}

From 7f6f1166a4a6a7d18cf67776c9527b039fddd800 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 7 Sep 2025 20:34:37 +0200
Subject: [PATCH 4/5] add backup extension for home manager

---
 modules/home/home-manager/default.nix  | 6 ++++--
 modules/nixos/home-manager/default.nix | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 modules/nixos/home-manager/default.nix

diff --git a/modules/home/home-manager/default.nix b/modules/home/home-manager/default.nix
index 93bae2e..5f3be03 100644
--- a/modules/home/home-manager/default.nix
+++ b/modules/home/home-manager/default.nix
@@ -4,7 +4,9 @@ let
 in
 {
   systemd.user.startServices = "sd-switch";
-  programs.home-manager.enable = true;
+  programs.home-manager = {
+    enable = true;
+  };
 
   home.stateVersion = mkDefault (osConfig.system.stateVersion or "25.05");
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/home-manager/default.nix b/modules/nixos/home-manager/default.nix
new file mode 100644
index 0000000..1a5a964
--- /dev/null
+++ b/modules/nixos/home-manager/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  config = {
+    home-manager.backupFileExtension = "back";
+  };
+}

From ce7b147d0496f3ce80211197449df0cd62595756 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sun, 7 Sep 2025 20:47:45 +0200
Subject: [PATCH 5/5] move runner

---
 .../services/development/forgejo/runners => runners}/default.nix  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {modules/nixos/services/development/forgejo/runners => runners}/default.nix (100%)

diff --git a/modules/nixos/services/development/forgejo/runners/default.nix b/runners/default.nix
similarity index 100%
rename from modules/nixos/services/development/forgejo/runners/default.nix
rename to runners/default.nix