before npins

home/modules/dev.nix

@@ -1,13 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, rice, ... }:
+let
+  get = builtins.attrValues;
+in
 {
   imports = [
     ../programs/vscode.nix
   ];
 
-  home.packages = with pkgs; [
-    git-credential-keepassxc
-    direnv
-  ];
+  home.packages = get {
+    inherit (pkgs)
+      git-credential-keepassxc
+      direnv
+      ;
+  };
 
   programs.zed-editor = {
     enable = false;
@@ -21,8 +26,8 @@
       features = {
         copilot = false;
       };
-      buffer_font_family = pkgs.rice.fonts.monospace.name;
-      buffer_font_size = pkgs.rice.fonts.monospace.size;
+      buffer_font_family = rice.fonts.monospace.name;
+      buffer_font_size = rice.fonts.monospace.size;
       theme = {
         mode = "dark";
         dark = "Kanagawa Dragon";

home/modules/niri.nix

@@ -2,6 +2,8 @@
   pkgs,
   lib,
   config,
+  nix-rice,
+  rice,
   ...
 }:
 let
@@ -170,7 +172,7 @@ in
         hide-after-inactive-ms = 5000;
         hide-when-typing = true;
         size = 16;
-        theme = pkgs.rice.cursor.name;
+        theme = rice.cursor.name;
       };
       layout = {
         always-center-single-column = true;
@@ -183,7 +185,7 @@ in
         ];
         focus-ring =
           let
-            pal = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.palette;
+            pal = nix-rice.palette.toRgbHex rice.palette;
           in
           {
             active = {
@@ -254,13 +256,13 @@ in
 
     "sirula/style.css".text =
       let
-        pal = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.palette;
+        pal = nix-rice.palette.toRgbHex rice.palette;
       in
       ''
         #root-box {
           background-color: ${pal.normal.black};
           color: ${pal.normal.yellow};
-          font-family: '${pkgs.rice.fonts.sans.name}';
+          font-family: '${rice.fonts.sans.name}';
         }
         /* what's the name of the highlighted search text?
            color: ${pal.normal.white};

home/modules/theming.nix

@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, rice, ... }:
 {
-  home.packages = with pkgs; [
-    gtk-engine-murrine
+  home.packages = [
+    pkgs.gtk-engine-murrine
   ];
   fonts.fontconfig.enable = true;
 
@@ -11,19 +11,16 @@
     platformTheme.name = "adwaita";
   };
 
-  gtk =
-    with pkgs;
-    with rice;
-    {
-      enable = true;
-      theme = with gtk-theme; {
-        inherit package name;
-      };
-      iconTheme = with icons; {
-        inherit package name;
-      };
-      font = with fonts.sans; {
-        inherit name size package;
-      };
+  gtk = {
+    enable = true;
+    theme = {
+      inherit (rice.gtk-theme) package name;
     };
+    iconTheme = {
+      inherit (rice.icons) package name;
+    };
+    font = {
+      inherit (rice.fonts.sans) size package name;
+    };
+  };
 }