diff --git a/flake.nix b/flake.nix
index 85eb03d..8ddaac4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,9 +22,9 @@
       import pkgs {
         inherit system;
         config.allowUnfree = true;
-        overlays = extraOverlays ++ (lib.attrValues self.overlays);
+        overlays = extraOverlays;
       };
-    pkgs = mkPkgs nixpkgs [self.overlays.default];
+    pkgs = mkPkgs nixpkgs [];
     pkgs-unstable = mkPkgs nixpkgs-unstable [];
 
     lib = nixpkgs.lib.extend (final: prev: {
@@ -48,21 +48,5 @@
     nixosConfigurations = mapHosts ./hosts {};
 
     devShells."${system}".default = import ./shell.nix { inherit lib pkgs; };
-
-
-
-#    nixosConfigurations = {
-#      pc = nixpkgs.lib.nixosSystem {
-#        specialArgs = {inherit inputs;};
-#        modules = [
-#          ./hosts/pc/default.nix
-#          inputs.home-manager.nixosModules.default
-#          inputs.stylix.nixosModules.stylix
-#        ];
-#      };
-#    };
-
-
-    
   };
 }
diff --git a/modules/home-manager/desktop.nix b/modules/_home-manager/desktop.nix
similarity index 100%
rename from modules/home-manager/desktop.nix
rename to modules/_home-manager/desktop.nix
diff --git a/modules/home-manager/gpg.nix b/modules/_home-manager/gpg.nix
similarity index 100%
rename from modules/home-manager/gpg.nix
rename to modules/_home-manager/gpg.nix
diff --git a/modules/home-manager/terminals/default.nix b/modules/_home-manager/terminals/default.nix
similarity index 100%
rename from modules/home-manager/terminals/default.nix
rename to modules/_home-manager/terminals/default.nix
diff --git a/modules/programs/communication.nix b/modules/_programs/communication.nix
similarity index 100%
rename from modules/programs/communication.nix
rename to modules/_programs/communication.nix
diff --git a/modules/programs/default.nix b/modules/_programs/default.nix
similarity index 67%
rename from modules/programs/default.nix
rename to modules/_programs/default.nix
index f8ce47f..0a37f03 100644
--- a/modules/programs/default.nix
+++ b/modules/_programs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, options, lib, pkgs, ... }:
 let
   inherit (lib.modules) mkIf;
 in
@@ -9,7 +9,7 @@ in
     enable = mkEnableOption "Rust developmnt";
   };
 
-  config = mkIf conf.modules.programs.enable {
+  config = mkIf config.modules.programs.enable {
 
   };
 }
diff --git a/modules/programs/gaming.nix b/modules/_programs/gaming.nix
similarity index 100%
rename from modules/programs/gaming.nix
rename to modules/_programs/gaming.nix
diff --git a/modules/programs/harden.nix b/modules/_programs/harden.nix
similarity index 100%
rename from modules/programs/harden.nix
rename to modules/_programs/harden.nix
diff --git a/modules/programs/media.nix b/modules/_programs/media.nix
similarity index 100%
rename from modules/programs/media.nix
rename to modules/_programs/media.nix
diff --git a/modules/programs/nextcloud.nix b/modules/_programs/nextcloud.nix
similarity index 100%
rename from modules/programs/nextcloud.nix
rename to modules/_programs/nextcloud.nix
diff --git a/modules/programs/office.nix b/modules/_programs/office.nix
similarity index 100%
rename from modules/programs/office.nix
rename to modules/_programs/office.nix
diff --git a/modules/programs/security.nix b/modules/_programs/security.nix
similarity index 100%
rename from modules/programs/security.nix
rename to modules/_programs/security.nix
diff --git a/modules/programs/shell.nix b/modules/_programs/shell.nix
similarity index 100%
rename from modules/programs/shell.nix
rename to modules/_programs/shell.nix
diff --git a/modules/programs/shell/rust.nix b/modules/_programs/shell/rust.nix
similarity index 100%
rename from modules/programs/shell/rust.nix
rename to modules/_programs/shell/rust.nix
diff --git a/modules/programs/theme.nix b/modules/_programs/theme.nix
similarity index 100%
rename from modules/programs/theme.nix
rename to modules/_programs/theme.nix
diff --git a/modules/programs/wallpaper.jpg b/modules/_programs/wallpaper.jpg
similarity index 100%
rename from modules/programs/wallpaper.jpg
rename to modules/_programs/wallpaper.jpg
diff --git a/modules/develop/default.nix b/modules/develop/default.nix
index 1383502..2dec8bb 100644
--- a/modules/develop/default.nix
+++ b/modules/develop/default.nix
@@ -10,7 +10,7 @@ in
     xdg.enable = mkEnableOption "XDG-related conf" // { default = true; };
   };
 
-  config = mkIf conf.modules.develop.xdg.enable {
+  config = mkIf config.modules.develop.xdg.enable {
 
   };
 }
diff --git a/modules/develop/rust.nix b/modules/develop/rust.nix
index 15ba508..fa806ef 100644
--- a/modules/develop/rust.nix
+++ b/modules/develop/rust.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, ... }:
+{ inputs, config, options, lib, pkgs, ... }:
 let
   inherit (lib.attrsets) attrValues;
   inherit (lib.modules) mkIf mkMerge;
@@ -12,7 +12,7 @@ in
   };
 
   config = mkMerge [
-    (mkIf config.modules.develop.rust.enable (
+    (mkIf config.modules.develop.rust.enable {
       nixpkgs.overlays = [ inputs.rust.overlays.default ];
 
       user.packages = attrValues {
@@ -24,7 +24,7 @@ in
         rs = "rustc";
         ca = "cargo";
       };
-    ))
+    })
 
     (mkIf config.modules.develop.cdg.enable {
       env = {
diff --git a/modules/home-manager/nextcloud.nix b/modules/home-manager/nextcloud.nix
deleted file mode 100644
index 3ba8387..0000000
--- a/modules/home-manager/nextcloud.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ ... }:
-{
-  home.file.".netrc".text = ''
-    login root
-    password KaasIsAwesome!
-  '';
-
-  systemd.user = {
-    services.nextcloud-autosync = {
-      Unit = {
-        Description = "Automatic nextcloud sync";
-        After = "network-online.target";
-      };
-      Service = {
-        Type = "simple";
-        ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /var/music /home/chris/Music https://cloud.kruining.eu";
-        TimeoutStopSec = "180";
-        KillMode = "process";
-        KillSignal = "SIGINT";
-      };
-      Install.WantedBy = [ "multi-user.target" ];
-    };
-    timers.nextcloud-autosync = {
-      Unit.Description = "Automatic nextcloud sync";
-      Timer.OnBootSec = "5min";
-      Timer.OnUnitActiveSec = "60min";
-      Install.WantedBy = [ "multi-user.target" "timers.target" ];
-    };
-  };
-}
diff --git a/modules/services/auth.nix b/modules/services/auth.nix
index 023496a..44d0f03 100644
--- a/modules/services/auth.nix
+++ b/modules/services/auth.nix
@@ -9,11 +9,9 @@ in
     enable = mkEnableOption "Media auth";
   };
 
-  config = mkMerge [
-    (mkIf config.modules.services.auth.enable (
-      environment.systemPackages = with pkgs; [
-        authelia
-      ];
-    ))
-  ];
+  config = mkIf config.modules.services.auth.enable {
+    environment.systemPackages = with pkgs; [
+      authelia
+    ];
+  };
 }
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 516778a..c4d83c1 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, options, lib, pkgs, ... }:
 let
   inherit (lib.modules) mkIf;
 in
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
new file mode 100644
index 0000000..c65f926
--- /dev/null
+++ b/modules/services/nextcloud.nix
@@ -0,0 +1,41 @@
+{ config, options, lib, pkgs, ... }:
+let
+  inherit (lib.modules) mkIf;
+in
+{
+  options.modules.services.nextcloud = let
+    inherit (lib.options) mkEnableOption;
+  in {
+    enable = mkEnableOption "Nextcloud";
+  };
+
+  config = mkIf config.modules.services.nextcloud.enable {
+    home.file.".netrc".text = ''
+      login root
+      password KaasIsAwesome!
+    '';
+
+    systemd.user = {
+      services.nextcloud-autosync = {
+        Unit = {
+          Description = "Automatic nextcloud sync";
+          After = "network-online.target";
+        };
+        Service = {
+          Type = "simple";
+          ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /var/music /home/chris/Music https://cloud.kruining.eu";
+          TimeoutStopSec = "180";
+          KillMode = "process";
+          KillSignal = "SIGINT";
+        };
+        Install.WantedBy = [ "multi-user.target" ];
+      };
+      timers.nextcloud-autosync = {
+        Unit.Description = "Automatic nextcloud sync";
+        Timer.OnBootSec = "5min";
+        Timer.OnUnitActiveSec = "60min";
+        Install.WantedBy = [ "multi-user.target" "timers.target" ];
+      };
+    };
+  };
+}
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index b2694f7..e747ca4 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -27,7 +27,6 @@ in
       enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
 
       history = {
         size = 10000;
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index 4c5446c..dcaaa55 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -15,7 +15,7 @@ in
 
   config = mkIf cfg.enable {
     user.packages = attrValues {
-      inherit (pkgs) easyeffects
+      inherit (pkgs) easyeffects;
     };
 
     security.rtkit.enable = true;
diff --git a/modules/system/boot.nix b/modules/system/boot.nix
index edb3223..e638edf 100644
--- a/modules/system/boot.nix
+++ b/modules/system/boot.nix
@@ -1,4 +1,4 @@
-{}:
+{ config, options, lib, pkgs, ... }:
 {
   boot.loader.systemd-boot-enable = true;