feat: Update base module name to rose-pine

flake.nix

@@ -1,8 +1,8 @@
 {
-  description = "Soothing pastel theme for Nix";
+  description = "Soho vibes for Nix";
 
   outputs = _: {
-    homeManagerModules.catppuccin = import ./modules/home-manager;
+    homeManagerModules.rose-pine = import ./modules/home-manager;
-    nixosModules.catppuccin = import ./modules/nixos;
+    nixosModules.rose-pine = import ./modules/nixos;
   };
 }

modules/lib/default.nix

@@ -3,54 +3,42 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-let
   # this is a recursive attribute with all the functions below
-  inherit (lib) ctp;
+  inherit (lib) rp;
-in
+in {
-{
   # string -> type -> string -> a
   # this is an internal function and shouldn't be
   # used unless you know what you're doing. it takes
   # a string (the name of the property, i.e., flavor
   # or accent), the type of the property, the name of
   # the module, followed by local config attrset
-  mkBasicOpt =
+  mkBasicOpt = attr: type: name:
-    attr: type: name:
     lib.mkOption {
       inherit type;
-      default = config.catppuccin.${attr};
+      default = config.rose-pine.${attr};
-      description = "Catppuccin ${attr} for ${name}";
+      description = "Rose Pine ${attr} for ${name}";
     };
 
   # string -> a
   # this creates a flavor option for modules
   # the first string should be the name of the module,
   # followed by the local config attrset
-  mkFlavorOpt = ctp.mkBasicOpt "flavor" ctp.types.flavorOption;
+  mkFlavorOpt = rp.mkBasicOpt "flavor" rp.types.flavorOption;
 
   types = {
     flavorOption = lib.types.enum [
-      "latte"
+      "dawn"
-      "frappe"
+      "moon"
-      "macchiato"
+      "main"
-      "mocha"
     ];
     accentOption = lib.types.enum [
-      "blue"
+      "love"
-      "flamingo"
+      "gold"
-      "green"
+      "rose"
-      "lavender"
+      "pine"
-      "maroon"
+      "foam"
-      "mauve"
+      "iris"
-      "peach"
-      "pink"
-      "red"
-      "rosewater"
-      "sapphire"
-      "sky"
-      "teal"
-      "yellow"
     ];
   };
 
@@ -58,51 +46,43 @@ in
   # this capitalizes the first letter in a string,
   # which is sometimes needed in order to format
   # the names of themes correctly
-  mkUpper =
+  mkUpper = str:
-    str:
     (lib.toUpper (builtins.substring 0 1 str)) + (builtins.substring 1 (builtins.stringLength str) str);
 
   # a -> path -> a
   # fromJSON but for yaml (and without readFile)
   # a should be the local pkgs attrset
-  fromYaml =
+  fromYaml = file: let
-    file:
+    # convert to json
-    let
+    json = pkgs.runCommand "converted.json" {} ''
-      # convert to json
+      ${lib.getExe pkgs.yj} < ${file} > $out
-      json = pkgs.runCommand "converted.json" { } ''
+    '';
-        ${lib.getExe pkgs.yj} < ${file} > $out
+  in
-      '';
-    in
     builtins.fromJSON (builtins.readFile json);
 
   # a -> path -> a
   # fromJSON but for ini (and without readFile)
   # a should be the local pkgs attrset
-  fromINI =
+  fromINI = file: let
-    file:
+    # convert to json
-    let
+    json = pkgs.runCommand "converted.json" {} ''
-      # convert to json
+      ${lib.getExe pkgs.jc} --ini < ${file} > $out
-      json = pkgs.runCommand "converted.json" { } ''
+    '';
-        ${lib.getExe pkgs.jc} --ini < ${file} > $out
+  in
-      '';
-    in
     builtins.fromJSON (builtins.readFile json);
 
   # a -> path -> a
   # fromJSON but for raw ini (and without readFile)
   # a should be the local pkgs attrset
-  fromINIRaw =
+  fromINIRaw = file: let
-    file:
+    inherit (builtins) fromJSON readFile;
-    let
-      inherit (builtins) fromJSON readFile;
 
-      # convert to json
+    # convert to json
-      json =
+    json = with pkgs;
-        with pkgs;
+      runCommand "converted.json" {} ''
-        runCommand "converted.json" { } ''
+        ${jc}/bin/jc --ini -r < ${file} > $out
-          ${jc}/bin/jc --ini -r < ${file} > $out
+      '';
-        '';
+  in
-    in
     fromJSON (readFile json);
 
   # string -> a
@@ -111,24 +91,24 @@ in
   # of the module, while `enableDefault` is a boolean
   # representing the default of the created `enable`
   # option
-  mkCatppuccinOpt =
+  mkRosePineOpt = {
-    {
+    name,
-      name,
+    enableDefault ? config.rose-pine.enable,
-      enableDefault ? config.catppuccin.enable,
+  }: {
-    }:
+    enable =
-    {
+      lib.mkEnableOption "Rose Pine theme for ${name}"
-      enable = lib.mkEnableOption "Catppuccin theme for ${name}" // {
+      // {
         default = enableDefault;
       };
 
-      flavor = ctp.mkFlavorOpt name;
+    flavor = rp.mkFlavorOpt name;
-    };
+  };
 
   # string -> a
   # this creates an accent option for modules
   # the first string should be the name of the module,
   # followed by the local config attrset
-  mkAccentOpt = ctp.mkBasicOpt "accent" ctp.types.accentOption;
+  mkAccentOpt = rp.mkBasicOpt "accent" rp.types.accentOption;
 
   # a -> a -> a
   # see https://nlewo.github.io/nixos-manual-sphinx/development/option-types.xml.html
@@ -140,23 +120,22 @@ in
   # returns the current release version of nixos or home-manager. throws an evaluation error if neither are
   # found
   getModuleRelease =
-    config.home.version.release or config.system.nixos.release
+    config.home.version.release
-      or (throw "Couldn't determine release version!");
+    or config.system.nixos.release
+    or (throw "Couldn't determine release version!");
 
   # string -> a -> a
   # if the current module release is less than `minVersion`, all options are made no-ops with
   # `lib.mkSinkUndeclaredOptions`
-  mkVersionedOpts =
+  mkVersionedOpts = minVersion: option:
-    minVersion: option:
+    if lib.versionAtLeast rp.getModuleRelease minVersion
-    if lib.versionAtLeast ctp.getModuleRelease minVersion then
+    then option
-      option
+    else lib.mkSinkUndeclaredOptions {};
-    else
-      lib.mkSinkUndeclaredOptions { };
 
   # string -> a
   # this is to ensure users are running a supported version of nixos/home-manager
   assertMinimumVersion = version: {
-    assertion = lib.versionAtLeast ctp.getModuleRelease version;
+    assertion = lib.versionAtLeast rp.getModuleRelease version;
-    message = "`catppuccin/nix` requires at least version ${version} of NixOS/home-manager";
+    message = "`rose-pine/nix` requires at least version ${version} of NixOS/home-manager";
   };
 }

modules/lib/mk-ext-lib.nix

@@ -6,7 +6,7 @@
 }:
 lib.extend (
   final: _: {
-    ctp = import ./. {
+    rp = import ./. {
       inherit config pkgs;
       lib = final;
     };