modules: add new theme module

Old one was upstreamed to Matugen.
Also remove lib/default as it was kinda junk.

Author: fufexan

Diff for: home/editors/helix/default.nix

@@ -32,7 +32,7 @@
       theme =
         "catppuccin_"
         + (
-          if config.programs.matugen.variant == "light"
+          if config.theme.name == "light"
           then "latte"
           else "mocha"
         );

Diff for: home/profiles/default.nix

@@ -1,21 +1,21 @@
 {
   self,
   inputs,
-  default,
   withSystem,
   ...
 }: let
   # get these into the module system
-  specialArgs = {inherit inputs self default;};
+  specialArgs = {inherit inputs self;};
 
   sharedModules = [
     ../.
     {_module.args = specialArgs;}
     inputs.ags.homeManagerModules.default
     inputs.anyrun.homeManagerModules.default
+    inputs.hyprland.homeManagerModules.default
+    inputs.matugen.nixosModules.default
     inputs.nix-index-db.hmModules.nix-index
     inputs.spicetify-nix.homeManagerModule
-    inputs.hyprland.homeManagerModules.default
     self.nixosModules.theme
   ];
 

Diff for: home/programs/anyrun/default.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  default,
   inputs,
   config,
   ...
@@ -23,13 +22,13 @@
       closeOnClick = true;
     };
 
-    extraCss = builtins.readFile (./. + "/style-${config.programs.matugen.variant}.css");
+    extraCss = builtins.readFile (./. + "/style-${config.theme.name}.css");
 
     extraConfigFiles."applications.ron".text = ''
       Config(
         desktop_actions: false,
         max_entries: 5,
-        terminal: Some("${default.terminal.name}"),
+        terminal: Some("wezterm"),
       )
     '';
   };

Diff for: home/programs/gtk.nix

@@ -2,9 +2,7 @@
   pkgs,
   config,
   ...
-}: let
-  inherit (config.programs.matugen) variant;
-in {
+}: {
   home.pointerCursor = {
     package = pkgs.bibata-cursors;
     name = "Bibata-Modern-Classic";
@@ -31,7 +29,7 @@ in {
 
     theme = {
       name =
-        if variant == "light"
+        if config.theme.name == "light"
         then "adw-gtk3"
         else "adw-gtk3-dark";
       package = pkgs.adw-gtk3;

Diff for: home/programs/media/spicetify.nix

@@ -8,7 +8,7 @@
   programs.spicetify = let
     spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
     variant =
-      if config.programs.matugen.variant == "light"
+      if config.theme.name == "light"
       then "latte"
       else "mocha";
   in {

Diff for: home/programs/office/zathura.nix

@@ -24,7 +24,7 @@
     extraConfig =
       "include catppuccin-"
       + (
-        if config.programs.matugen.variant == "light"
+        if config.theme.name == "light"
         then "latte"
         else "mocha"
       );

Diff for: home/programs/wayland/hyprland/binds.nix

@@ -1,4 +1,4 @@
-{default, ...}: let
+let
   screenshotarea = "hyprctl keyword animation 'fadeOut,0,0,default'; grimblast --notify copysave area; hyprctl keyword animation 'fadeOut,1,4,default'";
 
   # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
@@ -45,7 +45,7 @@ in {
 
         # utility
         # terminal
-        "$mod, Return, exec, run-as-service ${default.terminal.name}"
+        "$mod, Return, exec, run-as-service wezterm"
         # logout menu
         "$mod, Escape, exec, wlogout -p layer-shell"
         # lock screen
@@ -86,7 +86,7 @@ in {
 
     bindr = [
       # launcher
-      "$mod, SUPER_L, exec, pkill .${default.launcher}-wrapped || run-as-service ${default.launcher}"
+      "$mod, SUPER_L, exec, pkill .anyrun-wrapped || run-as-service anyrun"
     ];
 
     bindl = [

Diff for: home/programs/wayland/hyprland/rules.nix

@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.programs.matugen) variant;
-in {
+{
   wayland.windowManager.hyprland.settings = {
     # layer rules
     layerrule = let
@@ -10,11 +8,6 @@ in {
       "xray 1, ^(bar|gtk-layer-shell)$"
       "ignorealpha 0.2, ${layers}"
       "ignorealpha 0.5, ^(music|calendar|system-menu|anyrun)$"
-      # "ignorealpha 0${
-      #   if variant == "dark"
-      #   then ".5"
-      #   else ""
-      # }, ^(anyrun)$"
     ];
 
     # window rules

Diff for: home/programs/wayland/hyprland/settings.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  inherit (config.programs.matugen) variant;
+  variant = config.theme.name;
   c = config.programs.matugen.theme.colors.colors_android.${variant};
   pointer = config.home.pointerCursor;
 in {

Diff for: home/programs/wayland/swaylock.nix

@@ -1,18 +1,17 @@
 {
   config,
-  default,
   pkgs,
   ...
 }: {
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;
     settings = let
-      c = config.programs.matugen.theme.colors.colors.dark;
+      c = config.programs.matugen.theme.colors.colors.${config.theme.name};
     in {
       clock = true;
       font = "Inter";
-      image = default.wallpaper;
+      image = config.theme.wallpaper;
       indicator = true;
 
       bs-hl-color = c.error;

Diff for: home/services/system/dunst.nix

@@ -6,7 +6,7 @@
   # notification daemon
   services.dunst = let
     xcolors = pkgs.lib.colors.xcolors config.programs.matugen.theme.colors;
-    inherit (config.programs.matugen) variant;
+    variant = config.theme.name;
     c = xcolors.colors.${variant};
   in {
     enable = true;

Diff for: home/services/wayland/hyprpaper.nix

@@ -2,12 +2,12 @@
   pkgs,
   inputs,
   lib,
-  default,
+  config,
   ...
 }: {
   xdg.configFile."hypr/hyprpaper.conf".text = ''
-    preload = ${default.wallpaper}
-    wallpaper = , ${default.wallpaper}
+    preload = ${config.theme.wallpaper}
+    wallpaper = , ${config.theme.wallpaper}
   '';
 
   systemd.user.services.hyprpaper = {

Diff for: home/specialisations.nix

@@ -1,7 +1,7 @@
 {
   pkgs,
-  # default,
   lib,
+  config,
   ...
 }: {
   # light/dark specialisations
@@ -17,17 +17,31 @@
     '';
   in {
     light.configuration = {
-      programs.matugen.variant = "light";
+      theme.name = "light";
       home.activation = {inherit dconfLight;};
     };
     dark.configuration = {
-      programs.matugen.variant = "dark";
+      theme.name = "dark";
       home.activation = {inherit dconfDark;};
     };
   };
 
-  # programs.matugen = {
-  #   enable = false;
-  #   wallpaper = default.wallpaper;
-  # };
+  theme = {
+    # specific to unsplash
+    wallpaper = let
+      params = "?q=85&fm=jpg&crop=fit&cs=srgb&w=2560";
+      url = "https://images.unsplash.com/photo-1608507974219-2df72d775da0${params}.jpg";
+      sha256 = "0dr4svc3sbygkxyrjxillrdx4940rvw0avf2grrrx2l88z64srmq";
+      ext = lib.last (lib.splitString "." url);
+    in
+      builtins.fetchurl {
+        name = "wallpaper-${sha256}.${ext}";
+        inherit url sha256;
+      };
+  };
+
+  programs.matugen = {
+    enable = false;
+    wallpaper = config.theme.wallpaper;
+  };
 }

Diff for: home/terminal/emulators/alacritty.nix

@@ -1,10 +1,4 @@
-{
-  pkgs,
-  default,
-  ...
-}: let
-  inherit (default.terminal) font size opacity;
-in {
+{pkgs, ...}: {
   programs.alacritty = {
     enable = true;
     settings = {
@@ -21,14 +15,14 @@ in {
       scrolling.history = 10000;
 
       font = {
-        normal.family = font;
-        bold.family = font;
-        italic.family = font;
-        inherit size;
+        normal.family = "JetBrains Mono";
+        bold.family = "JetBrains Mono";
+        italic.family = "JetBrains Mono";
+        size = 10;
       };
 
       draw_bold_text_with_bright_colors = true;
-      window.opacity = opacity;
+      window.opacity = 0.9;
 
       imports = [
         (pkgs.fetchurl {

Diff for: home/terminal/emulators/foot.nix

@@ -1,8 +1,4 @@
-{
-  default,
-  config,
-  ...
-}: let
+{config, ...}: let
   colors = {
     dark = {
       foreground = "cdd6f4"; # Text
@@ -52,7 +48,7 @@ in {
 
     settings = {
       main = {
-        font = "${default.terminal.font}:size=${toString default.terminal.size}";
+        font = "JetBrains Mono:size=10";
         box-drawings-uses-font-glyphs = "yes";
         pad = "0x0 center";
         notify = "notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
@@ -79,9 +75,9 @@ in {
 
       colors =
         {
-          alpha = default.terminal.opacity;
+          alpha = 0.9;
         }
-        // colors.${config.programs.matugen.variant};
+        // colors.${config.theme.name};
     };
   };
 }

Diff for: home/terminal/emulators/kitty.nix

@@ -1,9 +1,9 @@
-{default, ...}: {
+{
   programs.kitty = {
     enable = true;
     font = {
-      inherit (default.terminal) size;
-      name = default.terminal.font;
+      size = 10;
+      name = "JetBrains Mono";
     };
 
     settings = {
@@ -20,7 +20,7 @@
       selection_background = "none";
 
       # colors
-      background_opacity = toString default.terminal.opacity;
+      background_opacity = "0.9";
     };
 
     theme = "Catppuccin-Mocha";

Diff for: home/terminal/emulators/wezterm.nix

@@ -1,5 +1,4 @@
 {
-  default,
   inputs,
   pkgs,
   ...
@@ -34,10 +33,10 @@
         color_scheme = scheme_for_appearance(get_appearance()),
         default_cursor_style = 'SteadyBar',
         enable_scroll_bar = true,
-        font_size = ${toString default.terminal.size},
+        font_size = 10,
         hide_tab_bar_if_only_one_tab = true,
         scrollback_lines = 10000,
-        window_background_opacity = ${toString default.terminal.opacity},
+        window_background_opacity = 0.9,
       }
     '';
   };

Diff for: home/terminal/programs/bat.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   variant =
-    if config.programs.matugen.variant == "light"
+    if config.theme.name == "light"
     then "latte"
     else "mocha";
 in {

Diff for: home/terminal/programs/btop.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   variant =
-    if config.programs.matugen.variant == "light"
+    if config.theme.name == "light"
     then "latte"
     else "mocha";
 in {

Diff for: home/terminal/programs/git.nix

@@ -13,7 +13,7 @@
 
     delta = {
       enable = true;
-      options.${config.programs.matugen.variant} = true;
+      options.${config.theme.name} = true;
     };
 
     extraConfig = {

Diff for: home/terminal/programs/xdg.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  default,
   ...
 }: let
   browser = ["firefox"];
@@ -69,7 +68,7 @@ in {
   home.packages = [
     # used by `gio open` and xdp-gtk
     (pkgs.writeShellScriptBin "xdg-terminal-exec" ''
-      ${default.terminal.name} ${default.terminal.exec} "$@"
+      wezterm start "$@"
     '')
     pkgs.xdg-utils
   ];