refactor(home): Use new helpers; formatting

modules/home-manager/alacritty.nix

@@ -2,17 +2,19 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.programs.alacritty.rose-pine;
   enable = cfg.enable && config.programs.alacritty.enable;
-in {
+
-  options.programs.alacritty.rose-pine = lib.rp.mkRosePineOpt {name = "alacritty";};
+  themeName = lib.rp.getKebabTheme cfg.flavor;
+in
+{
+  options.programs.alacritty.rose-pine = lib.rp.mkRosePineOpt { name = "alacritty"; };
 
   config = lib.mkIf enable {
-    programs.alacritty.settings =
+    programs.alacritty.settings = lib.importTOML "${sources.alacritty}/dist/${themeName}.toml";
-      if (cfg.flavor == "main")
-      then lib.importTOML "${sources.alacritty}/dist/rose-pine.toml"
-      else lib.importTOML "${sources.alacritty}/dist/rose-pine-${cfg.flavor}.toml";
   };
 }

modules/home-manager/bat.nix

@@ -2,16 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.programs.bat.rose-pine;
   enable = cfg.enable && config.programs.bat.enable;
-  themeName =
+
-    if (cfg.flavor == "main")
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    then "rose-pine"
+in
-    else "rose-pine-${cfg.flavor}";
+{
-in {
+  options.programs.bat.rose-pine = lib.rp.mkRosePineOpt { name = "bat"; };
-  options.programs.bat.rose-pine = lib.rp.mkRosePineOpt {name = "bat";};
 
   config = lib.mkIf enable {
     programs.bat = {

modules/home-manager/btop.nix

@@ -2,19 +2,18 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
   cfg = config.programs.btop.rose-pine;
   enable = cfg.enable && config.programs.btop.enable;
 
-  themeFile =
+  themeFile = "${lib.rp.getKebabTheme cfg.flavor}.theme";
-    if (cfg.flavor == "main")
-    then "rose-pine.theme"
-    else "rose-pine-${cfg.flavor}.theme";
   themePath = "/${themeFile}";
   theme = sources.btop + themePath;
-in {
+in
-  options.programs.btop.rose-pine = lib.rp.mkRosePineOpt {name = "btop";};
+{
+  options.programs.btop.rose-pine = lib.rp.mkRosePineOpt { name = "btop"; };
 
   config = lib.mkIf enable {
     xdg.configFile."btop/themes${themePath}".source = theme;

modules/home-manager/cava.nix

@@ -2,16 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.programs.cava.rose-pine;
   enable = cfg.enable && config.programs.cava.enable;
-  flavor =
+
-    if (cfg.flavor == "main")
+  flavor = if (cfg.flavor == "main") then "rosepine" else cfg.flavor;
-    then "rosepine"
+in
-    else cfg.flavor;
+{
-in {
+  options.programs.cava.rose-pine = lib.rp.mkRosePineOpt { name = "cava"; };
-  options.programs.cava.rose-pine = lib.rp.mkRosePineOpt {name = "cava";};
 
   config.programs.cava = lib.mkIf enable {
     settings.color = lib.rp.fromINIRaw (sources.cava + "/${flavor}");

modules/home-manager/cursor.nix

@@ -3,14 +3,14 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   inherit (lib) rp mkIf;
+
   cfg = config.rose-pine.pointerCursor;
-  flavor =
+  flavor = if (cfg.flavor == "dawn") then "Dawn" else "";
-    if (cfg.flavor == "dawn")
+in
-    then "Dawn"
+{
-    else "";
-in {
   options.rose-pine.pointerCursor = rp.mkRosePineOpt {
     name = "pointer cursors";
     # NOTE: we exclude this from the global `rose-pine.enable` as there is no

modules/home-manager/dunst.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.services.dunst.rose-pine;
   enable = cfg.enable && config.services.dunst.enable;
-  themeName =
+
-    if (cfg.flavor == "main")
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    then "rose-pine"
+in
-    else "rose-pine-${cfg.flavor}";
+{
-in {
+  options.services.dunst.rose-pine = lib.rp.mkRosePineOpt { name = "dunst"; } // {
-  options.services.dunst.rose-pine =
-    lib.rp.mkRosePineOpt {name = "dunst";}
-    // {
     prefix = lib.mkOption {
       type = lib.types.str;
       default = "00";
@@ -28,7 +27,6 @@ in {
     # Using a prefix like this is necessary because drop-ins' precedence depends
     # on lexical order such that later drop-ins override earlier ones.
     # This way, users have better control over precedence.
-    "dunst/dunstrc.d/${cfg.prefix}-rose-pine.conf".source =
+    "dunst/dunstrc.d/${cfg.prefix}-rose-pine.conf".source = sources.dunst + "/${themeName}.conf";
-      sources.dunst + "/${themeName}.conf";
   };
 }

modules/home-manager/fcitx5.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.i18n.inputMethod.fcitx5.rose-pine;
   enable = cfg.enable && config.i18n.inputMethod.enabled == "fcitx5";
-  themeName =
+
-    if (cfg.flavor == "main")
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    then "rose-pine"
+in
-    else "rose-pine-${cfg.flavor}";
+{
-in {
+  options.i18n.inputMethod.fcitx5.rose-pine = lib.rp.mkRosePineOpt { name = "Fcitx5"; } // {
-  options.i18n.inputMethod.fcitx5.rose-pine =
-    lib.rp.mkRosePineOpt {name = "Fcitx5";}
-    // {
     apply = lib.mkOption {
       type = lib.types.bool;
       default = true;
@@ -31,7 +30,7 @@ in {
     };
 
     xdg.configFile."fcitx5/conf/classicui.conf" = lib.mkIf cfg.apply {
-      text = lib.generators.toINIWithGlobalSection {} {
+      text = lib.generators.toINIWithGlobalSection { } {
         globalSection.Theme = themeName;
       };
     };

modules/home-manager/fish.nix

@@ -2,18 +2,18 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.programs.fish.rose-pine;
   enable = cfg.enable && config.programs.fish.enable;
 
-  themeName =
+  themeName = "Rosé Pine ${lib.rp.mkUpper (lib.rp.getFlavor cfg.flavor)}";
-    if (cfg.flavor == "main")
-    then "Rosé Pine"
-    else "Rosé Pine ${lib.rp.mkUpper cfg.flavor}";
   themePath = "/themes/${themeName}.theme";
-in {
+in
-  options.programs.fish.rose-pine = lib.rp.mkRosePineOpt {name = "fish";};
+{
+  options.programs.fish.rose-pine = lib.rp.mkRosePineOpt { name = "fish"; };
 
   config = lib.mkIf enable {
     xdg.configFile."fish${themePath}".source = "${sources.fish}${themePath}";

modules/home-manager/foot.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.foot.rose-pine;
   enable = cfg.enable && config.programs.foot.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.foot.rose-pine = lib.rp.mkRosePineOpt { name = "foot"; };
-in {
-  options.programs.foot.rose-pine = lib.rp.mkRosePineOpt {name = "foot";};
 
   config.programs.foot = lib.mkIf enable {
     settings.main.include = sources.foot + "/${themeName}.ini";

modules/home-manager/fzf.nix

@@ -2,14 +2,16 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
+
   cfg = config.programs.fzf.rose-pine;
   enable = cfg.enable && config.programs.fzf.enable;
   palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
-in {
+in
-  options.programs.fzf.rose-pine =
+{
-    lib.rp.mkRosePineOpt {name = "fzf";};
+  options.programs.fzf.rose-pine = lib.rp.mkRosePineOpt { name = "fzf"; };
 
   config.programs.fzf.colors =
     lib.mkIf enable

modules/home-manager/globals.nix

@@ -1,6 +1,7 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   config = {
-    assertions = [(lib.rp.assertMinimumVersion "24.05")];
+    assertions = [ (lib.rp.assertMinimumVersion "24.05") ];
   };
 
   options.rose-pine = {
@@ -18,7 +19,8 @@
       description = "Global Rose Pine accent";
     };
 
-    sources = let
+    sources =
+      let
         defaultSources = import ../../.sources;
       in
       lib.mkOption {

modules/home-manager/gtk.nix

@@ -3,21 +3,20 @@
   pkgs,
   lib,
   ...
-}: let
+}:
-  inherit
+let
-    (lib)
+  inherit (lib)
     rp
     mkIf
     mkMerge
     ;
+
   cfg = config.gtk.rose-pine;
   enable = cfg.enable && config.gtk.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
-in {
   options.gtk.rose-pine =
     rp.mkRosePineOpt {
       name = "gtk";
@@ -39,9 +38,11 @@ in {
         package = pkgs.rose-pine-gtk-theme;
       };
 
-      xdg.configFile = let
+      xdg.configFile =
+        let
           gtk4Dir = "${config.gtk.theme.package}/share/themes/${themeName}/gtk-4.0";
-      in {
+        in
+        {
           "gtk-4.0/gtk.css".source = "${gtk4Dir}/gtk.css";
         };
     })

modules/home-manager/helix.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.helix.rose-pine;
   enable = cfg.enable && config.programs.helix.enable;
 
-  themeName =
+  themeName = lib.rp.getSnakeTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose_pine"
+{
-    else "rose_pine_${cfg.flavor}";
+  options.programs.helix.rose-pine = lib.rp.mkRosePineOpt { name = "helix"; };
-in {
-  options.programs.helix.rose-pine = lib.rp.mkRosePineOpt {name = "helix";};
 
   config = lib.mkIf enable {
     programs.helix = {

modules/home-manager/hyprland.nix

@@ -2,20 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.wayland.windowManager.hyprland.rose-pine;
   enable = cfg.enable && config.wayland.windowManager.hyprland.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.wayland.windowManager.hyprland.rose-pine = lib.rp.mkRosePineOpt { name = "hyprland"; } // {
-in {
-  options.wayland.windowManager.hyprland.rose-pine =
-    lib.rp.mkRosePineOpt {name = "hyprland";}
-    // {
     accent = lib.rp.mkAccentOpt "hyprland";
   };
 

modules/home-manager/k9s.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.k9s.rose-pine;
@@ -16,8 +17,9 @@
   themeFile = "rose-pine.yaml";
   themePath = "k9s/skins/${themeFile}";
   theme = sources.k9s + "/skin.yml";
-in {
+in
-  options.programs.k9s.rose-pine = lib.rp.mkRosePineOpt {name = "k9s";};
+{
+  options.programs.k9s.rose-pine = lib.rp.mkRosePineOpt { name = "k9s"; };
 
   config = lib.mkIf enable (
     lib.mkMerge [

modules/home-manager/kitty.nix

@@ -2,20 +2,19 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.kitty.rose-pine;
   enable = cfg.enable && config.programs.kitty.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
-    then "rose-pine"
-    else "rose-pine-${cfg.flavor}";
   themePath = "themes/${themeName}.conf";
   theme = sources.kitty + "/dist/${themeName}.conf";
-in {
+in
-  options.programs.kitty.rose-pine = lib.rp.mkRosePineOpt {name = "kitty";};
+{
+  options.programs.kitty.rose-pine = lib.rp.mkRosePineOpt { name = "kitty"; };
 
   config = lib.mkIf enable {
     xdg.configFile."kitty/${themePath}".source = theme;

modules/home-manager/mako.nix

@@ -3,23 +3,21 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.services.mako.rose-pine;
   enable = cfg.enable && config.services.mako.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
-    then "rose-pine"
-    else "rose-pine-${cfg.flavor}";
   theme = lib.rp.fromINI (sources.mako + "/theme/${themeName}.theme");
 
   # Settings that need to be extracted and put in extraConfig
-  extraConfigAttrs = lib.attrsets.getAttrs ["urgency=high"] theme;
+  extraConfigAttrs = lib.attrsets.getAttrs [ "urgency=high" ] theme;
-in {
+in
-  options.services.mako.rose-pine =
+{
-    lib.rp.mkRosePineOpt {name = "mako";};
+  options.services.mako.rose-pine = lib.rp.mkRosePineOpt { name = "mako"; };
 
   # Will cause infinite recursion if config.services.mako is directly set as a
   # whole.
@@ -29,7 +27,7 @@ in {
     borderColor = theme.border-color;
     progressColor = theme.progress-color;
     extraConfig = builtins.readFile (
-      (pkgs.formats.ini {}).generate "mako-extra-config" extraConfigAttrs
+      (pkgs.formats.ini { }).generate "mako-extra-config" extraConfigAttrs
     );
   };
 }

modules/home-manager/neovim.nix

@@ -3,11 +3,13 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   cfg = config.programs.neovim.rose-pine;
   enable = cfg.enable && config.programs.neovim.enable;
-in {
+in
-  options.programs.neovim.rose-pine = lib.rp.mkRosePineOpt {name = "neovim";};
+{
+  options.programs.neovim.rose-pine = lib.rp.mkRosePineOpt { name = "neovim"; };
 
   config.programs.neovim = lib.mkIf enable {
     plugins = with pkgs.vimPlugins; [

modules/home-manager/polybar.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.services.polybar.rose-pine;
   enable = cfg.enable && config.services.polybar.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.services.polybar.rose-pine = lib.rp.mkRosePineOpt { name = "polybar"; };
-in {
-  options.services.polybar.rose-pine = lib.rp.mkRosePineOpt {name = "polybar";};
 
   config.services.polybar.extraConfig = lib.mkIf enable (
     builtins.readFile "${sources.polybar}/schemes/${themeName}.ini"

modules/home-manager/rio.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.rio.rose-pine;
   enable = cfg.enable && config.programs.rio.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.rio.rose-pine = lib.rp.mkRosePineOpt { name = "rio"; };
-in {
-  options.programs.rio.rose-pine = lib.rp.mkRosePineOpt {name = "rio";};
 
   config = lib.mkIf enable {
     programs.rio.settings = lib.importTOML "${sources.rio-terminal}/${themeName}.toml";

modules/home-manager/rofi.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.rofi.rose-pine;
   enable = cfg.enable && config.programs.rofi.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.rofi.rose-pine = lib.rp.mkRosePineOpt { name = "rofi"; };
-in {
-  options.programs.rofi.rose-pine = lib.rp.mkRosePineOpt {name = "rofi";};
 
   config.programs.rofi = lib.mkIf enable {
     theme = {

modules/home-manager/starship.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.starship.rose-pine;
   enable = cfg.enable && config.programs.starship.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.starship.rose-pine = lib.rp.mkRosePineOpt { name = "starship"; };
-in {
-  options.programs.starship.rose-pine = lib.rp.mkRosePineOpt {name = "starship";};
 
   config.programs.starship.settings = lib.mkIf enable (
     lib.importTOML "${sources.starship}/${themeName}.toml"

modules/home-manager/sway.nix

@@ -2,19 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.wayland.windowManager.sway.rose-pine;
   enable = cfg.enable && config.wayland.windowManager.sway.enable;
 
-  themeName =
+  theme = "${sources.sway}/themes/${lib.rp.getKebabTheme cfg.flavor}.theme";
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.wayland.windowManager.sway.rose-pine = lib.rp.mkRosePineOpt { name = "sway"; };
-  theme = "${sources.sway}/themes/${themeName}.theme";
-in {
-  options.wayland.windowManager.sway.rose-pine = lib.rp.mkRosePineOpt {name = "sway";};
 
   config = lib.mkIf enable {
     wayland.windowManager.sway.extraConfigEarly = ''

modules/home-manager/swaylock.nix

@@ -2,20 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.swaylock.rose-pine;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
-in {
   options.programs.swaylock.rose-pine = {
-    enable =
+    enable = lib.mkEnableOption "Rosé Pine theme" // {
-      lib.mkEnableOption "Rosé Pine theme"
-      // {
       /*
         global `rose-pine.enable` purposefully doesn't work here in
         configurations with a `home.stateVersion` that is >= 23.05

modules/home-manager/tmux.nix

@@ -3,13 +3,13 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.programs.tmux.rose-pine;
   enable = cfg.enable && config.programs.tmux.enable;
-in {
+in
-  options.programs.tmux.rose-pine =
+{
-    lib.rp.mkRosePineOpt {name = "tmux";}
+  options.programs.tmux.rose-pine = lib.rp.mkRosePineOpt { name = "tmux"; } // {
-    // {
     extraConfig = lib.mkOption {
       type = lib.types.lines;
       description = "Additional configuration for the rose-pine plugin.";

modules/home-manager/waybar.nix

@@ -2,21 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.waybar.rose-pine;
   enable = cfg.enable && config.programs.waybar.enable;
 
-  themeName =
+  styleFile = "${sources.waybar}/${lib.rp.getKebabTheme cfg.flavor}.css";
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.waybar.rose-pine = lib.rp.mkRosePineOpt { name = "waybar"; } // {
-  styleFile = "${sources.waybar}/${themeName}.css";
-in {
-  options.programs.waybar.rose-pine =
-    lib.rp.mkRosePineOpt {name = "waybar";}
-    // {
     mode = lib.mkOption {
       type = lib.types.enum [
         "prependImport"

modules/home-manager/zathura.nix

@@ -2,18 +2,17 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.zathura.rose-pine;
   enable = cfg.enable && config.programs.zathura.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
+in
-    then "rose-pine"
+{
-    else "rose-pine-${cfg.flavor}";
+  options.programs.zathura.rose-pine = lib.rp.mkRosePineOpt { name = "zathura"; };
-in {
-  options.programs.zathura.rose-pine = lib.rp.mkRosePineOpt {name = "zathura";};
 
   config.programs.zathura.extraConfig = lib.mkIf enable ''
     include ${sources.zathura + "/${themeName}"}

modules/home-manager/zellij.nix

@@ -2,19 +2,18 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.rose-pine) sources;
 
   cfg = config.programs.zellij.rose-pine;
   enable = cfg.enable && config.programs.zellij.enable;
 
-  themeName =
+  themeName = lib.rp.getKebabTheme cfg.flavor;
-    if (cfg.flavor == "main")
-    then "rose-pine"
-    else "rose-pine-${cfg.flavor}";
   theme = sources.zellij + "/dist/${themeName}.kdl";
-in {
+in
-  options.programs.zellij.rose-pine = lib.rp.mkRosePineOpt {name = "zellij";};
+{
+  options.programs.zellij.rose-pine = lib.rp.mkRosePineOpt { name = "zellij"; };
 
   config = lib.mkIf enable {
     xdg.configFile."zellij/themes/${themeName}.kdl".source = theme;