Improve modularity

flake.nix

@@ -38,7 +38,7 @@
           inputs.catppuccin.nixosModules.catppuccin
           
           # Stylix
-          # inputs.stylix.nixosModules.stylix
+          inputs.stylix.nixosModules.stylix
 
           #Aagl
           inputs.aagl.nixosModules.default

hosts/default/configuration.nix

@@ -17,15 +17,13 @@
       ../../modules/gaming
 
       # Gnome customization
-      ../../modules/nixos/gnome.nix
+      ../../modules/gnome
+
+      # Catppuccin
+      ../../modules/ricing/catppuccin
 
       # Home-manager
       inputs.home-manager.nixosModules.default
-
-      # Stylix colors
-      #../../modules/nixos/stylix/ghibli.nix
-      #../../modules/nixos/stylix/kuromi.nix
-      #../../modules/nixos/stylix/dracula.nix
     ];
 
   # Bootloader.
@@ -174,11 +172,6 @@
     lm_sensors
   ];
 
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-  };
-
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [

hosts/default/home.nix

@@ -3,11 +3,7 @@
 {
   imports =
   [
-    ../../modules/home-manager/git.nix
-    ../../modules/home-manager/shell/zsh.nix
-    ../../modules/home-manager/vscode.nix
-    #../../modules/home-manager/themes/basic-gtk.nix
-    ../../modules/home-manager/catppuccin-mocha.nix
+    ../../modules/home-manager
   ];
 
   # Allow Unfree

modules/home-manager/catppuccin-mocha.nix

@@ -1,51 +0,0 @@
-{ inputs, ... }:
-
-{
-    imports = [
-        inputs.catppuccin.homeManagerModules.catppuccin
-    ];
-
-    catppuccin = {
-        enable = true;
-        flavor = "mocha";
-
-        pointerCursor.enable = true;
-    };
-
-    gtk = {
-        enable = true;
-
-        catppuccin = {
-            enable = true;
-            flavor = "mocha";  
-            gnomeShellTheme = true;
-
-            icon = {
-                enable = true;
-                flavor = "mocha";
-            };
-        };
-    };
-
-    programs.kitty.catppuccin.enable = true;
-    programs.kitty.catppuccin.flavor = "mocha";
-
-    programs.neovim.catppuccin.enable = true;
-    programs.neovim.catppuccin.flavor = "mocha";
-
-    programs.rofi.catppuccin.enable = true;
-    programs.rofi.catppuccin.flavor = "mocha";
-
-    programs.starship.catppuccin.enable = true;
-    programs.starship.catppuccin.flavor = "mocha";
-
-    programs.waybar.catppuccin.enable = true;
-    programs.waybar.catppuccin.flavor = "mocha";
-
-    programs.zsh.syntaxHighlighting.catppuccin.enable = true;
-    programs.zsh.syntaxHighlighting.catppuccin.flavor = "mocha";
-
-    qt.style.catppuccin.enable = true;
-    qt.style.catppuccin.accent = "mocha";
-    qt.style.catppuccin.apply = true;
-}

modules/home-manager/default.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+    imports = [
+        ./git
+        ./ricing/catppuccin
+        ./shell
+        ./vscode
+    ];
+}

modules/home-manager/ricing/catppuccin/default.nix

@@ -0,0 +1,59 @@
+{ inputs, ... }:
+
+{
+    imports = [
+        inputs.catppuccin.homeManagerModules.catppuccin
+    ];
+
+    catppuccin = {
+        enable = true;
+        accent = "rosewater";
+        flavor = "latte";
+
+        pointerCursor.enable = true;
+    };
+
+    gtk = {
+        enable = true;
+
+        catppuccin = {
+            enable = true;
+            accent = "rosewater";
+            flavor = "latte";
+            gnomeShellTheme = true;
+
+            icon = {
+                enable = true;
+                accent = "rosewater";
+                flavor = "latte";
+            };
+        };
+    };
+
+    programs.kitty.catppuccin = {
+        enable = true;
+        flavor = "latte";
+    };
+
+    programs.neovim.catppuccin = {
+        enable = true;
+        flavor = "latte";
+    };
+
+    programs.starship.catppuccin = {
+        enable = true;
+        flavor = "latte";
+    };
+
+    programs.zsh.syntaxHighlighting.catppuccin = {
+        enable = true;
+        flavor = "latte";
+    };
+
+    qt.style.catppuccin = {
+        enable = true;
+        accent = "rosewater";
+        apply = true;
+        flavor = "latte";
+    };
+}

modules/home-manager/shell/default.nix

@@ -1,10 +1,6 @@
 { pkgs, ... }:
 
 {
-    imports = [
-        #./themes/dracula.nix
-    ];
-
     # Download zsh packages
     home.packages = with pkgs; [
         zsh

modules/home-manager/shell/themes/dracula.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-{
-    programs.starship = {
-        enable = true;
-        enableZshIntegration = true;
-        settings = {
-            aws.style = "bold #FF9580";        
-            cmd_duration.style = "bold #FFFF80";   
-            directory.style = "bold #FFCA80";    
-            hostname.style = "bold #9580FF";     
-            git_branch.style = "bold #80FFEA";     
-            git_status.style = "bold #FF80BF";     
-            username = {
-                format = "[$user]($style) on ";
-                style_user = "bold #8AFF80";     
-            };
-            character = {
-                success_symbol = "[λ](bold #F8F8F2)";  
-                error_symbol = "[λ](bold #FF9580)";    
-            };
-        };
-    };
-}

modules/home-manager/themes/basic-gtk.nix

@@ -1,11 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-    gtk.enable = true;
-
-    gtk.theme.package = lib.mkDefault pkgs.adw-gtk3;
-    gtk.theme.name = lib.mkDefault "adw-gtk3-dark";
-
-    gtk.iconTheme.package = pkgs.tela-circle-icon-theme;
-    gtk.iconTheme.name = "Tela-circle-dark";
-}

modules/nixos/alienware/alienware.nix

@@ -1,25 +0,0 @@
-{ lib, ... }:
-
-{
-    imports = [
-        ./nh.nix
-    ];
-
-    swapDevices = [{
-        device = "/var/lib/swapfile";
-        size = 20*1024;
-    }];
-
-    hardware = {
-        enableRedistributableFirmware = lib.mkDefault true;
-    };
-
-    services = {
-        fwupd = {
-            enable = lib.mkDefault true;
-        };
-        thermald = {
-            enable = lib.mkDefault true;
-        };
-    };
-}

modules/nixos/alienware/nh.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-    programs.nh = {
-        enable = true;
-        clean.enable = true;
-        clean.extraArgs = "--keep-since 4d --keep 3";
-    };
-}

modules/nixos/stylix/dracula.nix

@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-
-{
-    stylix.enable = true;
-    stylix.image = ./wallpapers/dracula-pro.png;
-
-    stylix.cursor.package = pkgs.bibata-cursors;
-    stylix.cursor.name = "Bibata-Modern-Ice";
-
-    stylix.fonts = {
-        monospace = {
-            package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; };
-            name = "JetBrainsMono Nerd Font";
-        };
-        sansSerif = {
-            package = pkgs.dejavu_fonts;
-            name = "DejaVu Serif";
-        };
-        serif = {
-            package = pkgs.dejavu_fonts;
-            name = "Dejavu Serif";
-        };
-    };
-
-    stylix.fonts.sizes = {
-        applications = 12;
-        terminal = 15;
-        desktop = 10;
-        popups = 10;
-    };
-
-    stylix.opacity = {
-        applications = 1.0;
-        terminal = 1.0;
-        desktop = 1.0;
-        popups = 1.0;
-    };
-
-    stylix.polarity = "dark";
-}

modules/nixos/stylix/ghibli.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-
-{
-    stylix.enable = true;
-    stylix.image = ./wallpapers/ghibli-3.png;
-
-    stylix.cursor.package = pkgs.bibata-cursors;
-    stylix.cursor.name = "Bibata-Modern-Ice";
-
-    stylix.fonts = {
-        monospace = {
-            package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; };
-            name = "JetBrainsMono Nerd Font";
-        };
-        sansSerif = {
-            package = pkgs.dejavu_fonts;
-            name = "DejaVu Serif";
-        };
-        serif = {
-            package = pkgs.dejavu_fonts;
-            name = "Dejavu Serif";
-        };
-    };
-
-    stylix.polarity = "dark";
-}

modules/ricing/catppuccin/default.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{   
+    # global
+    catppuccin = {
+        enable = true;
+        accent = "rosewater";
+        flavor = "latte";
+    };
+}

modules/ricing/stylix/default.nix

@@ -1,11 +1,11 @@
 { pkgs, ... }:
 
 {
-    stylix.homeManagerIntegration.followSystem = true;
+    imports = [
+        ./themes
+    ];
 
-    stylix.enable = true;
-    stylix.autoEnable = true;
-    stylix.image = ./wallpapers/kuromi.jpg;
+    stylix.homeManagerIntegration.followSystem = true;
 
     stylix.cursor.package = pkgs.bibata-cursors;
     stylix.cursor.name = "Bibata-Modern-Ice";

modules/ricing/stylix/themes/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+    imports = [
+        #./dracula.nix
+        #./ghibli.nix
+        ./kuromi.nix
+    ];
+}

modules/ricing/stylix/themes/dracula.nix

@@ -0,0 +1,5 @@
+{ lib, pkgs, ... }:
+
+{
+    stylix.image = ./wallpapers/dracula-pro.png;
+}

modules/ricing/stylix/themes/ghibli.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+    stylix.image = ./wallpapers/ghibli-3.png;
+}

modules/ricing/stylix/themes/kuromi.nix

@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+
+let 
+    cfg = config.kuromi; 
+in {
+    options = {
+        kuromi.enable = lib.mkEnableOption "Enable Module";
+    };
+
+    config = lib.mkIf cfg.enable {
+        stylix.enable = true;
+        stylix.image = ../../wallpapers/kuromi.jpg;
+    };
+}