From aa249c7d8b594243f6e3937d984070b0e384181c Mon Sep 17 00:00:00 2001
From: jaysa <gh@jaysa.net>
Date: Thu, 21 May 2026 16:08:56 -0700
Subject: [PATCH 1/2] fix quota command

---
 flake.nix                | 9 +++++++++
 modules/login-server.nix | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/flake.nix b/flake.nix
index 91ab16bc..94e92315 100644
--- a/flake.nix
+++ b/flake.nix
@@ -348,6 +348,15 @@
         ocf-niks3-push = final.callPackage ./pkgs/ocf-niks3-push {
           niks3 = niks3.packages.${final.stdenv.hostPlatform.system}.default;
         };
+
+        # nixpkgs quota is built without RPC support, it can't query
+        # NFS quotas from the filehost via rquotad.
+        # This wasn't necessary for old puppet hosts because debian packages quota with rpc enabled.
+        quota = prev.quota.overrideAttrs (old: {
+          buildInputs = (old.buildInputs or [ ]) ++ [ final.libtirpc ];
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final.rpcsvc-proto ];
+          configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-rpc" ];
+        });
       };
 
       agenix-rekey = agenix-rekey.configure {
diff --git a/modules/login-server.nix b/modules/login-server.nix
index 2344612d..15314ecd 100644
--- a/modules/login-server.nix
+++ b/modules/login-server.nix
@@ -25,6 +25,10 @@ in
         python3Packages.cached-property
       ];
 
+      # -s to display output in human friendly units by default
+      # old puppet hosts had -Q as well, but can be removed? maybe?
+      environment.shellAliases.quota = "quota -Qs";
+
       ocf.cli.apps.enable = true;
 
       ocf.nfs = {

From ff947a229b271dbf61abf92eeb4cb24d357d0e59 Mon Sep 17 00:00:00 2001
From: jaysa68 <jaysagarcia@berkeley.edu>
Date: Sat, 30 May 2026 01:03:31 -0700
Subject: [PATCH 2/2] add quota alias to desktops as well

---
 profiles/desktop.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/profiles/desktop.nix b/profiles/desktop.nix
index b3cb9017..98f9e726 100644
--- a/profiles/desktop.nix
+++ b/profiles/desktop.nix
@@ -52,6 +52,8 @@
 
   documentation.dev.enable = true;
 
+  environment.shellAliases.quota = "quota -Qs";
+
   environment.systemPackages = with pkgs; [
     lf
     dua