all repos — nixfiles @ 13735084caa94892bba79bdb440556bbebfb4d53

System and user configuration, managed by nix and home-manager

fish: fix nix evaluation error

Alan Pearce
commit

13735084caa94892bba79bdb440556bbebfb4d53

parent

bd3083be8b43cb2e2e10a7456551cfc5fb0fde11

2 files changed, 5 insertions(+), 4 deletions(-)

jump to
M user/settings/fish.nix → user/settings/fish.nix
@@ -1,4 +1,5 @@
 { pkgs
+, lib
 , ...
 }: {
   programs.fish = {

@@ -43,8 +44,8 @@ set -x KITTY_SHELL_INTEGRATION no-cursor
       end
     '';
     shellAliases = {
-      hist-freq-lines = "history | sort | uniq -c | sort -gr | head -n100 | less";
-      hist-freq-commands = "history | cut -d' ' -f 1 | sort | uniq -c | sort -gr | head -n100 | less";
+      hist-freq-lines = lib.mkForce "history | sort | uniq -c | sort -gr | head -n100 | less";
+      hist-freq-commands = lib.mkForce "history | cut -d' ' -f 1 | sort | uniq -c | sort -gr | head -n100 | less";
     };
     functions = {
       ds = "du -hd1 $argv[1] | sort -h";
M user/settings/shell.nix → user/settings/shell.nix
@@ -35,8 +35,8 @@ http = "xh";
       https = "xh --default-scheme https";
       xhs = "xh --default-scheme https";
 
-      hist-freq-lines = "fc -l -10000 | cut -d' ' -f4- | sort | uniq -c | sort -gr | head -n100 | less";
-      hist-freq-commands = "fc -l -10000 | cut -d' ' -f4 | sort | uniq -c | sort -gr | head -n100 | less";
+      hist-freq-lines = lib.mkDefault "fc -l -10000 | cut -d' ' -f4- | sort | uniq -c | sort -gr | head -n100 | less";
+      hist-freq-commands = lib.mkDefault "fc -l -10000 | cut -d' ' -f4 | sort | uniq -c | sort -gr | head -n100 | less";
       wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'";
 
       # Enable the following commands to support aliases.