chore: Update

.sources/sources.json

@@ -20,9 +20,9 @@
         "repo": "bat"
       },
       "branch": "main",
-      "revision": "d3feec47b16a8e99eabb34cdfbaa115541d374fc",
+      "revision": "699f60fc8ec434574ca7451b444b880430319941",
-      "url": "https://github.com/catppuccin/bat/archive/d3feec47b16a8e99eabb34cdfbaa115541d374fc.tar.gz",
+      "url": "https://github.com/catppuccin/bat/archive/699f60fc8ec434574ca7451b444b880430319941.tar.gz",
-      "hash": "1g73x0p8pbzb8d1g1x1fwhwf05sj3nzhbhb65811752p5178fh5k"
+      "hash": "1lirgwgh2hnz6j60py19bbmhvgaqs7i6wf6702k6n83lgw4aixg9"
     },
     "btop": {
       "type": "Git",
@@ -56,9 +56,9 @@
         "repo": "dunst"
       },
       "branch": "main",
-      "revision": "f02cd2894411c9b4caa207cfd8ed6345f97c0455",
+      "revision": "5955cf0213d14a3494ec63580a81818b6f7caa66",
-      "url": "https://github.com/catppuccin/dunst/archive/f02cd2894411c9b4caa207cfd8ed6345f97c0455.tar.gz",
+      "url": "https://github.com/catppuccin/dunst/archive/5955cf0213d14a3494ec63580a81818b6f7caa66.tar.gz",
-      "hash": "07lf6yz3sd0vrs0ls5cm2w6j71kp7snyn5brjkdzz6vms6m4v9qi"
+      "hash": "1rpxrnhphcxm93s2wc7wbd9cxjmv79r2m6ip0a6rj7lh9v0ps6mc"
     },
     "fcitx5": {
       "type": "Git",
@@ -92,9 +92,9 @@
         "repo": "foot"
       },
       "branch": "main",
-      "revision": "a4504926bf7aa748479adf4103d721aec7b735c5",
+      "revision": "fd30db031194d5905b9f5ab832ed770931036944",
-      "url": "https://github.com/EuCaue/foot/archive/a4504926bf7aa748479adf4103d721aec7b735c5.tar.gz",
+      "url": "https://github.com/EuCaue/foot/archive/fd30db031194d5905b9f5ab832ed770931036944.tar.gz",
-      "hash": "1a4854csxs4x5hjmz2k5zr68qmxi117bgq90yd62kz6v4lbn8jqa"
+      "hash": "0kgnv6b4lb980mn3fjygkiqnzpj6kfgb4f85hiidpscgm8k4lqs0"
     },
     "grub": {
       "type": "Git",
@@ -104,9 +104,9 @@
         "repo": "grub"
       },
       "branch": "main",
-      "revision": "4a26bd253f4aecb6343e70a98da2e12043739f5a",
+      "revision": "436d8bedf613ec03955845c9f699cf36f3dd51f8",
-      "url": "https://github.com/rose-pine/grub/archive/4a26bd253f4aecb6343e70a98da2e12043739f5a.tar.gz",
+      "url": "https://github.com/rose-pine/grub/archive/436d8bedf613ec03955845c9f699cf36f3dd51f8.tar.gz",
-      "hash": "0virkip3zw6z8r05d7767iymyrs7nl7acznskfgivkqgzmzl1ql4"
+      "hash": "0sdnq4crrj3jrm19qifl0cfk93xrrf5hhfqm6zfsb4cm10jnay6w"
     },
     "helix": {
       "type": "Git",
@@ -116,9 +116,9 @@
         "repo": "helix"
       },
       "branch": "main",
-      "revision": "15e1ff4ff7c59bf8d75d648d652112acb1efc412",
+      "revision": "fc4eedacba6b83aa196052aa3570dd225cac84d2",
-      "url": "https://github.com/rose-pine/helix/archive/15e1ff4ff7c59bf8d75d648d652112acb1efc412.tar.gz",
+      "url": "https://github.com/rose-pine/helix/archive/fc4eedacba6b83aa196052aa3570dd225cac84d2.tar.gz",
-      "hash": "1gmvjks39spz1lmv1b1f1jgpfjhsg603gc2dxs5hzj93vmlbl7ph"
+      "hash": "11s5k5ky2g97x404wd3hgyxq541yvpkn63n6vjwrxmq0ywb0lz26"
     },
     "hyprland": {
       "type": "Git",
@@ -176,9 +176,9 @@
         "repo": "k9s-theme"
       },
       "branch": "main",
-      "revision": "4ed8c473f16642b894bb501f1cd979fb670cce2d",
+      "revision": "22cfbb26100d3b411f20fafe870e8b3486b9f006",
-      "url": "https://github.com/sasoria/k9s-theme/archive/4ed8c473f16642b894bb501f1cd979fb670cce2d.tar.gz",
+      "url": "https://github.com/sasoria/k9s-theme/archive/22cfbb26100d3b411f20fafe870e8b3486b9f006.tar.gz",
-      "hash": "17lrv30wiql6i0ll33wng9ziizlzg9kx0wa960i900crfcq94168"
+      "hash": "1cwihlwj8yg17r5ivga6q3h9y75ll4jrq41hhp4hmjiycfpxgmwz"
     },
     "kitty": {
       "type": "Git",
@@ -212,9 +212,9 @@
         "repo": "nvim"
       },
       "branch": "main",
-      "revision": "63685e1562ef53873c9764b483d7ac5c7a608922",
+      "revision": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429",
-      "url": "https://github.com/catppuccin/nvim/archive/63685e1562ef53873c9764b483d7ac5c7a608922.tar.gz",
+      "url": "https://github.com/catppuccin/nvim/archive/5b5e3aef9ad7af84f463d17b5479f06b87d5c429.tar.gz",
-      "hash": "1b283i43p1i49mql84s6njfnf4mdf9csknp9hdkjjagwfi509wgm"
+      "hash": "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2"
     },
     "palette": {
       "type": "Git",
@@ -260,9 +260,9 @@
         "repo": "rofi"
       },
       "branch": "main",
-      "revision": "414bb2538713a874dbb357f19212c96a011e1ac8",
+      "revision": "3dbfdeae8d80159b1e5cae98c6752cef84057d11",
-      "url": "https://github.com/rose-pine/rofi/archive/414bb2538713a874dbb357f19212c96a011e1ac8.tar.gz",
+      "url": "https://github.com/rose-pine/rofi/archive/3dbfdeae8d80159b1e5cae98c6752cef84057d11.tar.gz",
-      "hash": "19kif3nh0lr934blam971fm55pr1pdbn9b3lnrpc0yq2vpgf8x9y"
+      "hash": "07dll841qngw3ybv8mhc1bprnqs1pwws13lsvglqhwj9zx33qnjp"
     },
     "rose-pine-dunst": {
       "type": "Git",
@@ -272,15 +272,15 @@
         "repo": "rose-pine-dunst"
       },
       "branch": "main",
-      "revision": "496499eaed38a07ce4f79ec91baaf6e1e4c28bc5",
+      "revision": "449e806b7e9e266cf4bf722007ac01b60ffcec01",
-      "url": "https://github.com/d2718nis/rose-pine-dunst/archive/496499eaed38a07ce4f79ec91baaf6e1e4c28bc5.tar.gz",
+      "url": "https://github.com/d2718nis/rose-pine-dunst/archive/449e806b7e9e266cf4bf722007ac01b60ffcec01.tar.gz",
-      "hash": "0x7cqbcn7zygab9xbmbarz06wxkj3wxxffwmka33ljhm8gk3x0ay"
+      "hash": "0dqqicj6jx2df1znbvbp8hggbam509f5kglqgpysd186lbkk386w"
     },
     "rose-pine-palette": {
       "type": "Git",
       "repository": {
         "type": "Git",
-        "url": "https://git.punkfairie.net/punkfairie/rose-pine-palette.git"
+        "url": "https://codewith.babesonthe.net/punkfairie/rose-pine-palette.git"
       },
       "branch": "main",
       "revision": "7248b41a76dfc807694bc5bb4bec0edc16d23cd9",
@@ -319,9 +319,9 @@
         "repo": "starship"
       },
       "branch": "main",
-      "revision": "ed68857c08cf49dcbf2575c5d4f491155750d011",
+      "revision": "e0356ebb87cf340bfa20c47ff6988b8fe7d24118",
-      "url": "https://github.com/rose-pine/starship/archive/ed68857c08cf49dcbf2575c5d4f491155750d011.tar.gz",
+      "url": "https://github.com/rose-pine/starship/archive/e0356ebb87cf340bfa20c47ff6988b8fe7d24118.tar.gz",
-      "hash": "0ywwyy3j5n3qj39d855sj0iy4dm55j83cmpjgnx1hqx0vp5zynn8"
+      "hash": "064byajjax6355g7j21wkhjswmyycqy20k6zax0vnmhlm2rzq3jm"
     },
     "sway": {
       "type": "Git",
@@ -331,9 +331,9 @@
         "repo": "sway"
       },
       "branch": "main",
-      "revision": "5f9da99a43336583c7d5ebddf78d7b615911e5ea",
+      "revision": "c072ada05271eec960dc893affe9ac55af63a745",
-      "url": "https://github.com/catppuccin/sway/archive/5f9da99a43336583c7d5ebddf78d7b615911e5ea.tar.gz",
+      "url": "https://github.com/catppuccin/sway/archive/c072ada05271eec960dc893affe9ac55af63a745.tar.gz",
-      "hash": "0n3fpb9pkmis932jv5b1gz045xyhw9cqybild20hsv45lr3r5f1q"
+      "hash": "0jrrj68lw6r3dvnd054nmqa9zxrgl6r38i629dgq02i44rx6xrhz"
     },
     "swaync": {
       "type": "Git",
@@ -355,9 +355,9 @@
         "repo": "tm-theme"
       },
       "branch": "main",
-      "revision": "c4235f9a65fd180ac0f5e4396e3a86e21a0884ec",
+      "revision": "45061dc3fda6bd2126305df8fd6c81ef5a0f9c27",
-      "url": "https://github.com/rose-pine/tm-theme/archive/c4235f9a65fd180ac0f5e4396e3a86e21a0884ec.tar.gz",
+      "url": "https://github.com/rose-pine/tm-theme/archive/45061dc3fda6bd2126305df8fd6c81ef5a0f9c27.tar.gz",
-      "hash": "19k0r1mrhqhlf1xfzvd1q8ihpic86f84kbmgy0m314w3w9cbqf4f"
+      "hash": "1z7p7i41s5vaxrdghsmcf268151yym0y0l21h1fjb4sh4d917brp"
     },
     "waybar": {
       "type": "Git",
@@ -379,9 +379,9 @@
         "repo": "zathura"
       },
       "branch": "main",
-      "revision": "d72c431f8207a1f63c138d9bc64d689947c55e8e",
+      "revision": "cd9524f572c7856f24d49d484e624c7447d67632",
-      "url": "https://github.com/edunfelt/zathura/archive/d72c431f8207a1f63c138d9bc64d689947c55e8e.tar.gz",
+      "url": "https://github.com/edunfelt/zathura/archive/cd9524f572c7856f24d49d484e624c7447d67632.tar.gz",
-      "hash": "07b5pqdpd0qnhc223gmgw0nxy0wjbrkw6a36jdd03lyxvvhhx86r"
+      "hash": "0myzzldr3gvwyfh0h8fkn5xh811lfri97hlmq9fc1fa7mn5x68g0"
     },
     "zellij": {
       "type": "Git",
@@ -391,9 +391,9 @@
         "repo": "zellij"
       },
       "branch": "main",
-      "revision": "53835422f965e6c88b9ad59e11d343ca4552bf6d",
+      "revision": "b3b2fd31e86f735d552d401293216b4038dff062",
-      "url": "https://github.com/rose-pine/zellij/archive/53835422f965e6c88b9ad59e11d343ca4552bf6d.tar.gz",
+      "url": "https://github.com/rose-pine/zellij/archive/b3b2fd31e86f735d552d401293216b4038dff062.tar.gz",
-      "hash": "0cj31kv7y05cyyg7v0pc1dh5a2mp46sql2ngxk52cbks1garvnjl"
+      "hash": "00vbdpxccivbbb0vrpxnc80gn69xshpykn6yqzggi36bb81axdr5"
     }
   },
   "version": 3

dev/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736508663,
+        "lastModified": 1740845322,
-        "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
+        "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
+        "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
         "type": "github"
       },
       "original": {
@@ -27,27 +27,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
+        "lastModified": 1739757849,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736523798,
+        "lastModified": 1740695751,
-        "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
+        "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "130595eba61081acde9001f43de3248d8888ac4a",
+        "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
         "type": "github"
       },
       "original": {
@@ -59,16 +59,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1735563628,
+        "lastModified": 1740743217,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

dev/flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,121 +11,131 @@
     };
 
     home-manager-stable = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    nixpkgs-stable,
-      nixpkgs-stable,
+    home-manager,
-      home-manager,
+    home-manager-stable,
-      home-manager-stable,
+  }: let
-    }:
+    systems = [
-    let
+      "x86_64-linux"
-      systems = [
+      "aarch64-linux"
-        "x86_64-linux"
+      "x86_64-darwin"
-        "aarch64-linux"
+      "aarch64-darwin"
-        "x86_64-darwin"
+    ];
-        "aarch64-darwin"
-      ];
 
-      nixpkgsFor = nixpkgs.lib.genAttrs systems (system: {
+    nixpkgsFor = nixpkgs.lib.genAttrs systems (system: {
-        unstable = nixpkgs.legacyPackages.${system};
+      unstable = nixpkgs.legacyPackages.${system};
-        stable = nixpkgs-stable.legacyPackages.${system};
+      stable = nixpkgs-stable.legacyPackages.${system};
-      });
+    });
 
-      forAllSystems = nixpkgs.lib.genAttrs systems;
+    forAllSystems = nixpkgs.lib.genAttrs systems;
-    in
+  in {
-    {
+    apps = forAllSystems (
-      apps = forAllSystems (
+      system: let
-        system:
+        pkgs = nixpkgsFor.${system}.unstable;
-        let
+        inherit (pkgs) lib;
-          pkgs = nixpkgsFor.${system}.unstable;
+      in {
-          inherit (pkgs) lib;
+        serve = {
-        in
+          type = "app";
-        {
+          program = lib.getExe self.packages.${system}.site.serve;
-          serve = {
+        };
-            type = "app";
+      }
-            program = lib.getExe self.packages.${system}.site.serve;
+    );
-          };
-        }
-      );
 
-      checks = forAllSystems (
+    checks = forAllSystems (
-        system:
+      system:
         import ../tests rec {
           inherit home-manager home-manager-stable;
           inherit (nixpkgs) lib;
           nixpkgs = nixpkgsFor.${system}.unstable;
           nixpkgs-stable = nixpkgsFor.${system}.stable;
         }
-      );
+    );
 
-      formatter = forAllSystems (system: nixpkgsFor.${system}.unstable.nixfmt-rfc-style);
+    formatter = forAllSystems (system: nixpkgsFor.${system}.unstable.nixfmt-rfc-style);
 
-      packages = forAllSystems (
+    packages = forAllSystems (
-        system:
+      system: let
-        let
+        pkgs = nixpkgsFor.${system}.unstable;
-          pkgs = nixpkgsFor.${system}.unstable;
+        inherit (pkgs) lib;
-          inherit (pkgs) lib;
 
-          version = self.shortRev or self.dirtyShortRev or "unknown";
+        version = self.shortRev or self.dirtyShortRev or "unknown";
-          mkOptionDoc = pkgs.callPackage ../docs/options-doc.nix { };
+        mkOptionDoc = pkgs.callPackage ../docs/options-doc.nix {};
-          mkSite = pkgs.callPackage ../docs/mk-site.nix { };
+        mkSite = pkgs.callPackage ../docs/mk-site.nix {};
-          packages' = self.packages.${system};
+        packages' = self.packages.${system};
-        in
+      in {
-        {
+        nixos-doc = mkOptionDoc {
-          nixos-doc = mkOptionDoc {
+          inherit version;
-            inherit version;
+          moduleRoot = ../modules/nixos;
-            moduleRoot = ../modules/nixos;
+        };
+
+        home-manager-doc = mkOptionDoc {
+          inherit version;
+          moduleRoot = ../modules/home-manager;
+        };
+
+        site = mkSite rec {
+          pname = "catppuccin-nix-website";
+          inherit version;
+
+          src = lib.fileset.toSource {
+            root = ../.;
+            fileset = lib.fileset.unions [
+              ../CHANGELOG.md
+              ../docs/src
+              ../docs/book.toml
+              ../docs/theme
+            ];
           };
+          sourceRoot = "${src.name}/docs";
 
-          home-manager-doc = mkOptionDoc {
+          nixosDoc = packages'.nixos-doc;
-            inherit version;
+          homeManagerDoc = packages'.home-manager-doc;
-            moduleRoot = ../modules/home-manager;
+        };
-          };
 
-          site = mkSite rec {
+        add-source =
-            pname = "catppuccin-nix-website";
+          pkgs.runCommand "add-source"
-            inherit version;
+          {
+            nativeBuildInputs = [pkgs.patsh];
+            buildInputs = [pkgs.npins];
+            meta.mainProgram = "add-source";
+          }
+          ''
+            mkdir -p $out/bin
 
-            src = lib.fileset.toSource {
+            patsh \
-              root = ../.;
+              --store-dir ${builtins.storeDir} \
-              fileset = lib.fileset.unions [
+              ${./add-source.sh} $out/bin/add-source
-                ../CHANGELOG.md
-                ../docs/src
-                ../docs/book.toml
-                ../docs/theme
-              ];
-            };
-            sourceRoot = "${src.name}/docs";
 
-            nixosDoc = packages'.nixos-doc;
+            chmod 755 $out/bin/add-source
-            homeManagerDoc = packages'.home-manager-doc;
+          '';
-          };
 
-          add-source =
+        update-sources =
-            pkgs.runCommand "add-source"
+          pkgs.runCommand "update-sources"
-              {
+          {
-                nativeBuildInputs = [ pkgs.patsh ];
+            nativeBuildInputs = [pkgs.patsh];
-                buildInputs = [ pkgs.npins ];
+            buildInputs = [pkgs.npins];
-                meta.mainProgram = "add-source";
+            meta.mainProgram = "update-sources";
-              }
+          }
-              ''
+          ''
-                mkdir -p $out/bin
+            mkdir -p $out/bin
 
-                patsh \
+            patsh \
-                  --store-dir ${builtins.storeDir} \
+              --store-dir ${builtins.storeDir} \
-                  ${./add-source.sh} $out/bin/add-source
+              ${./update-sources.sh} $out/bin/update-sources
 
-                chmod 755 $out/bin/add-source
+            chmod 755 $out/bin/update-sources
-              '';
+          '';
 
-          default = packages'.site;
+        default = packages'.site;
-        }
+      }
-      );
+    );
-    };
+  };
 }

dev/update-sources.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+_usage="
+A wrapper script around \`npins\` for updating sources
+
+Usage: $(basename "$0")
+"
+
+npins update \
+  --directory ./.sources

modules/nixos/sddm-rose-pine-pkg.nix

@@ -6,11 +6,16 @@
 stdenvNoCC.mkDerivation {
   pname = "sddm-rose-pine-theme";
   version = "1.2";
-  dontBuild = true;
+  # dontBuild = true;
 
-  propagatedUserEnvPkgs = [
+  # propagatedUserEnvPkgs = [
-    libsForQt5.qt5.qtgraphicaleffects
+  #   libsForQt5.qt5.qtgraphicaleffects
-  ];
+  #   libsForQt5.qt5.qtquickcontrols2
+  #   libsForQt5.qt5.qtsvg
+  # ];
+
+  dontWrapQtApps = true;
+  buildInputs = [libsForQt5.qt5.qtgraphicaleffects];
 
   src = sources.sddm-rose-pine;
 

modules/nixos/sddm.nix

@@ -3,21 +3,22 @@
   config,
   pkgs,
   ...
-}:
+}: let
-let
   inherit (config.rose-pine) sources;
 
   cfg = config.services.displayManager.sddm.rose-pine;
   enable = cfg.enable && config.services.displayManager.sddm.enable;
-in
+in {
-{
+  options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt {name = "sddm";};
-  options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt { name = "sddm"; };
 
   config = lib.mkIf enable {
     services.displayManager.sddm.theme = "rose-pine";
 
     environment.systemPackages = [
-      (pkgs.callPackage ./sddm-rose-pine-pkg.nix { inherit sources; })
+      pkgs.libsForQt5.qt5.qtgraphicaleffects
+      pkgs.libsForQt5.qt5.qtquickcontrols2
+      pkgs.libsForQt5.qt5.qtsvg
+      (pkgs.callPackage ./sddm-rose-pine-pkg.nix {inherit sources;})
     ];
   };
 }