Successfully separated home-manager configs from system configs

modules/home/environment/stylix.nix

@@ -1,18 +1,49 @@
-{lib, config, pkgs, ... }: {
+{lib, self, config, pkgs, ... }:
+
+let
+  scheme = "tokyo-night-dark";
+  wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
+in
+{
   options = {
     movOpts.stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options";
   };
   config = lib.mkIf config.movOpts.stylixHomeConfig.enable {
     stylix = {
       enable = true;
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/${scheme}.yaml";
+      image = wallpaper;
+      polarity = "dark";
       autoEnable = true;
+      opacity.terminal = 0.50;
       targets = {
-        #  fzf.enable = true;
-        #  kitty.enable = true;
-        #  vesktop.enable = true;
         waybar.enable = false;
         btop.enable = false;
       };
+      cursor = {
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Ice";
+      };
+      fonts = {
+        monospace = {
+          package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+          name = "JetBrains Mono Nerd Font";
+        };
+        sansSerif = {
+          package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+          name = "JetBrains Mono Nerd Font";
+        };
+        serif = {
+          package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+          name = "JetBrains Mono Nerd Font";
+        };
+        sizes = {
+          desktop = 10;
+          applications = 14;
+          terminal = 14;
+          popups = 16;
+        };
+      };
     };
   };
 }

modules/home/programs/firefox.nix

@@ -1,4 +1,4 @@
-{lib, config, nur, username, self, ... }: {
+{lib, config, nur, username, self, pkgs, ... }: {
   options = {
     movOpts.firefoxConfig.enable = lib.mkEnableOption "enables my firefox configuration";
   };
@@ -83,17 +83,6 @@
             url = "https://www.nerdfonts.com/cheat-sheet";
           }
         ];
-        extensions = with nur.repos.rycee.firefox-addons; [
-          darkreader
-          adnauseam
-          cookie-autodelete
-          disconnect
-          firefox-color
-          vimium
-          firenvim
-          privacy-badger
-          new-tab-override
-        ];
         extraConfig = ''
            "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html";
            "browser.active_color" = "#EE0000";

modules/server/cdn/jellyfin.nix

@@ -2,7 +2,7 @@
 
 {
   options = {
-    jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config";
+    movOpts.jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config";
   };
   config = lib.mkIf config.movOpts.jellyfinConfig.enable {
     services.jellyfin = {

modules/server/default.nix

@@ -5,7 +5,8 @@
     ./cdn
     ./glasshaus
   ];
-
-  jellyfinConfig.enable = lib.mkDefault false;
-  caddyConfig.enable = lib.mkDefault false;
+  movOpts = {
+    jellyfinConfig.enable = lib.mkDefault false;
+    caddyConfig.enable = lib.mkDefault false;
+  };
 }

modules/server/glasshaus/caddy.nix

@@ -2,7 +2,7 @@
 
 {
   options = {
-    caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name";
+    movOpts.caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name";
   };
   config = lib.mkIf config.movOpts.caddyConfig.enable {
     services.caddy = {