diff --git a/flake.nix b/flake.nix
index 60e9853..07479a7 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,9 +99,6 @@
 
         # 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 abeb606..cd6fa1a 100644
--- a/homes/x86_64-linux/chris@manwe/default.nix
+++ b/homes/x86_64-linux/chris@manwe/default.nix
@@ -35,7 +35,6 @@
       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
deleted file mode 100644
index b04b375..0000000
--- a/modules/home/application/nheko/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ 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 ];
-  };
-}
diff --git a/modules/home/home-manager/default.nix b/modules/home/home-manager/default.nix
index 5f3be03..93bae2e 100644
--- a/modules/home/home-manager/default.nix
+++ b/modules/home/home-manager/default.nix
@@ -4,9 +4,7 @@ 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
deleted file mode 100644
index 1a5a964..0000000
--- a/modules/nixos/home-manager/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  config = {
-    home-manager.backupFileExtension = "back";
-  };
-}
diff --git a/modules/nixos/services/development/forgejo/default.nix b/modules/nixos/services/development/forgejo/default.nix
index f143b12..5c7d7aa 100644
--- a/modules/nixos/services/development/forgejo/default.nix
+++ b/modules/nixos/services/development/forgejo/default.nix
@@ -11,10 +11,8 @@ in
   };
 
   config = mkIf cfg.enable {
-    ${namespace}.services = {
-      persistance.postgresql.enable = true;
-      virtualisation.podman.enable = true;
-    };
+    ${namespace}.services.virtualisation.podman.enable = true;
+    ${namespace}.services.persistance.postgresql.enable = true;
 
     environment.systemPackages = with pkgs; [ forgejo ];
 
diff --git a/runners/default.nix b/modules/nixos/services/development/forgejo/runners/default.nix
similarity index 100%
rename from runners/default.nix
rename to modules/nixos/services/development/forgejo/runners/default.nix
diff --git a/modules/nixos/services/persistance/postgesql/default.nix b/modules/nixos/services/persistance/postgesql/default.nix
index dbd6604..ce198a8 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.persistance.postgresql;
+  cfg = config.${namespace}.services.peristance.postgresql;
 in
 {
-  options.${namespace}.services.persistance.postgresql = {
+  options.${namespace}.services.peristance.postgresql = {
     enable = mkEnableOption "Postgresql";
   };