feat(modules)!: bump minimum supported release to 24.05 (#203)

* chore(modules)!: bump minimum supported release to 24.05

* feat(modules): assert minimum supported version

dev/flake.lock

@@ -27,48 +27,50 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
+        "lastModified": 1716736833,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715787315,
+        "lastModified": 1716948383,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1716239187,
+        "lastModified": 1717144377,
-        "narHash": "sha256-5oyOV5ZlqXYQ8RB6lvVrKxVBeBPE/ZsLY+qQKqSJLZM=",
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f88df4bf25b729d78712c441fb0910f7085e9395",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "nixos-24.05",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {

dev/flake.nix

@@ -2,8 +2,8 @@
   description = "Soothing pastel theme for Nix";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "nixpkgs/release-23.11";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,7 +11,7 @@
     };
 
     home-manager-stable = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
   };

modules/home-manager/globals.nix

@@ -1,5 +1,9 @@
 { lib, ... }:
 {
+  config = {
+    assertions = [ (lib.ctp.assertMinimumVersion "24.05") ];
+  };
+
   options.catppuccin = {
     enable = lib.mkEnableOption "Catppuccin globally";
 

modules/home-manager/tofi.nix

@@ -3,15 +3,9 @@ let
   inherit (config.catppuccin) sources;
   cfg = config.programs.tofi.catppuccin;
   enable = cfg.enable && config.programs.tofi.enable;
-
-  # `programs.tofi` was added in 24.05 and not backported
-  # TODO: remove when 24.05 is stable
-  minVersion = "24.05";
 in
 {
-  options.programs.tofi = lib.ctp.mkVersionedOpts minVersion {
+  options.programs.tofi.catppuccin = lib.ctp.mkCatppuccinOpt "tofi";
-    catppuccin = lib.ctp.mkCatppuccinOpt "tofi";
-  };
 
   config.programs.tofi = lib.mkIf enable {
     settings = lib.ctp.fromINI (sources.tofi + "/catppuccin-${cfg.flavor}");

modules/lib/default.nix

@@ -145,4 +145,11 @@ in
       option
     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;
+    message = "`catppuccin/nix` requires at least version ${version} of NixOS/home-manager";
+  };
 }

modules/nixos/globals.nix

@@ -1,5 +1,9 @@
 { lib, ... }:
 {
+  config = {
+    assertions = [ (lib.ctp.assertMinimumVersion "24.05") ];
+  };
+
   options.catppuccin = {
     enable = lib.mkEnableOption "Catppuccin globally";
 

modules/nixos/sddm.nix

@@ -10,22 +10,13 @@ let
     ctp
     types
     mkOption
-    versionAtLeast
     ;
   cfg = config.services.displayManager.sddm.catppuccin;
-  enable =
+  enable = cfg.enable && config.services.displayManager.sddm.enable;
-    versionAtLeast ctp.getModuleRelease minVersion
-    && cfg.enable
-    && config.services.displayManager.sddm.enable;
-
-  # versions >= 24.05 renamed `services.xserver.displayManager` to `services.displayManager`
-  # TODO: remove when 24.05 is stable
-  minVersion = "24.05";
 in
 
 {
-  options.services.displayManager = ctp.mkVersionedOpts minVersion {
+  options.services.displayManager.sddm.catppuccin = ctp.mkCatppuccinOpt "sddm" // {
-    sddm.catppuccin = ctp.mkCatppuccinOpt "sddm" // {
     font = mkOption {
       type = types.str;
       default = "Noto Sans";
@@ -50,7 +41,6 @@ in
       description = "Add an additional background layer to the login panel";
     };
   };
-  };
 
   config = mkIf enable {
     services.displayManager.sddm.theme = "catppuccin-${cfg.flavor}";