From 4fee15ce51ee885b136b59ad334eab013111defd Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 8 Sep 2021 09:39:02 -0400 Subject: [PATCH] fix: missing values in profiles/core/nix --- profiles/core/nix.nix | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/profiles/core/nix.nix b/profiles/core/nix.nix index f6143a3..74aa048 100644 --- a/profiles/core/nix.nix +++ b/profiles/core/nix.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, pkgs, self, lib, ... }: { nix = { systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; @@ -26,24 +26,27 @@ environment = { systemPackages = with pkgs; [ nix-index nixfmt nixpkgs-fmt ]; - shellAliases = { - # nix - n = "nix"; - np = "n profile"; - ni = "np install"; - nr = "np remove"; - ns = "n search --no-update-lock-file"; - nf = "n flake"; - nepl = "n repl ''"; - srch = "ns nixos"; - orch = "ns override"; - nrb = ifSudo "sudo nixos-rebuild"; - mn = '' - manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix - ''; + shellAliases = + let ifSudo = lib.mkIf config.security.sudo.enable; + in + { + # nix + n = "nix"; + np = "n profile"; + ni = "np install"; + nr = "np remove"; + ns = "n search --no-update-lock-file"; + nf = "n flake"; + nepl = "n repl ''"; + srch = "ns nixos"; + orch = "ns override"; + nrb = ifSudo "sudo nixos-rebuild"; + mn = '' + manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix + ''; - # fix nixos-option - nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; - }; + # fix nixos-option + nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; + }; }; }