refactor(darwin,nixos): simplify module imports and theme configs

home/apps/ghostty.nix

@@ -7,7 +7,6 @@
     enable = device.is "ryu";
     installBatSyntax = false;
     settings = {
-      theme = "catppuccin-mocha";
       font-family = [
         "Hasklug Nerd Font Mono"
       ];

home/apps/kitty.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   device,
   inputs,
@@ -9,13 +10,13 @@
     # enable = false;
     font = {
       # name = "FiraCode Nerd Font Mono";
-      name = "Hasklug Nerd Font Mono";
+      # name = "Hasklug Nerd Font Mono";
       # name = "Monaspace Krypton Var Light";
-      size = 13;
+      size = lib.mkDefault 13;
     };
     settings = {
-      background_opacity = "0.8";
-      background = "#000000";
+      background_opacity = lib.mkDefault "0.8";
+      background = lib.mkDefault "#000000";
       shell = "${pkgs.fish}/bin/fish";
       hide_window_decorations = "yes";
       cursor_trail = 1;

home/apps/zed.nix

@@ -101,7 +101,7 @@
       telemetry = {
         metrics = false;
       };
-      buffer_font_size = 15;
+      buffer_font_size = lib.mkDefault 15;
       # language_models = {
       #   ollama = {
       #     api_url = "https://ollama.ryu.darksailor.dev";
@@ -143,7 +143,7 @@
           };
         };
       };
-      theme = "Catppuccin Mocha";
+      theme = lib.mkDefault "Catppuccin Mocha";
     };
     userTasks = let
       zed =

home/module.nix

@@ -0,0 +1,20 @@
+{
+  device,
+  inputs,
+  ...
+}: {
+  nixpkgs.config.allowUnfree = true;
+  home-manager = {
+    backupFileExtension = "bak";
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs;
+      inherit device;
+      stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system};
+    };
+    users.${device.user}.imports = [
+      ./.
+    ];
+  };
+}

home/programs/bat.nix

@@ -7,13 +7,6 @@
   programs.
     bat = {
     enable = true;
-    config = {theme = "catppuccin";};
-    themes = {
-      catppuccin = {
-        src = "${pkgs.catppuccinThemes.bat}/themes";
-        file = "Catppuccin Mocha.tmTheme";
-      };
-    };
     # extraPackages = with pkgs.bat-extras; [batman batgrep batwatch];
   };
 }

home/programs/starship.nix

@@ -8,24 +8,17 @@
     enable = true;
     enableFishIntegration = true;
     enableNushellIntegration = true;
-    settings = let
-      flavour = "mocha"; # Replace with your preferred palette
-    in
-      {
-        # Check https://starship.rs/config/#prompt
-        format = "$all$character";
-        palette = "catppuccin_${flavour}";
-        character = {
-          success_symbol = "[[OK](bold green) ❯](maroon)";
-          error_symbol = "[❯](red)";
-          vimcmd_symbol = "[❮](green)";
-        };
-        directory = {
-          truncation_length = 4;
-          style = "bold lavender";
-        };
-      }
-      // builtins.fromTOML (builtins.readFile
-        (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
+    settings = {
+      format = "$all$character";
+      character = {
+        success_symbol = "[[OK](bold green) ❯](maroon)";
+        error_symbol = "[❯](red)";
+        vimcmd_symbol = "[❮](green)";
+      };
+      directory = {
+        truncation_length = 4;
+        style = "bold lavender";
+      };
+    };
   };
 }

home/programs/yazi.nix

@@ -9,8 +9,8 @@
     enable = true;
     enableFishIntegration = true;
     enableNushellIntegration = true;
-    theme = builtins.fromTOML (builtins.readFile "${pkgs.catppuccinThemes.yazi}/themes/mocha/catppuccin-mocha-mauve.toml");
-    settings = lib.mkIf (device.is "ryu") {
+    theme = lib.mkDefault builtins.fromTOML (builtins.readFile "${pkgs.catppuccinThemes.yazi}/themes/mocha.toml");
+    settings = {
       plugin = {
         prepend_preloaders = [
           {

home/services/gtk.nix

@@ -6,16 +6,16 @@
 }: {
   gtk = {
     enable = device.is "ryu";
-    theme = {
-      name = "catppuccin-mocha-mauve-standard+normal";
-      package = pkgs.catppuccinThemes.gtk;
-      # package = pkgs.catppuccin-gtk.override {
-      #   variant = "mocha";
-      #   size = "standard";
-      #   accents = ["mauve"];
-      #   tweaks = ["normal"];
-      # };
-    };
+    # theme = {
+    #   name = "catppuccin-mocha-mauve-standard+normal";
+    #   package = pkgs.catppuccinThemes.gtk;
+    #   # package = pkgs.catppuccin-gtk.override {
+    #   #   variant = "mocha";
+    #   #   size = "standard";
+    #   #   accents = ["mauve"];
+    #   #   tweaks = ["normal"];
+    #   # };
+    # };
 
     iconTheme = {
       name = "Papirus-Dark";

home/services/hyprland.nix

@@ -32,7 +32,7 @@
     systemd.enable = true;
 
     settings = {
-      source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
+      # source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
       render = {
         direct_scanout = true;
         cm_fs_passthrough = 1;
@@ -91,8 +91,8 @@
         gaps_in = 5;
         gaps_out = 20;
         border_size = 2;
-        "col.active_border" = "$mauve $mauve 45deg";
-        "col.inactive_border" = "$crust";
+        # "col.active_border" = "$mauve $mauve 45deg";
+        # "col.inactive_border" = "$crust";
       };
 
       ecosystem = {