Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions modules/login-server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Comment thread
24apricots marked this conversation as resolved.

ocf.cli.apps.enable = true;

ocf.nfs = {
Expand Down
2 changes: 2 additions & 0 deletions profiles/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@

documentation.dev.enable = true;

environment.shellAliases.quota = "quota -Qs";

environment.systemPackages = with pkgs; [
lf
dua
Expand Down
Loading