From 13735084caa94892bba79bdb440556bbebfb4d53 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 25 Aug 2023 05:55:57 +0200 Subject: fish: fix nix evaluation error --- user/settings/fish.nix | 5 +++-- user/settings/shell.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'user/settings') diff --git a/user/settings/fish.nix b/user/settings/fish.nix index 4bee970f..be68432e 100644 --- a/user/settings/fish.nix +++ b/user/settings/fish.nix @@ -1,4 +1,5 @@ { pkgs +, lib , ... }: { programs.fish = { @@ -43,8 +44,8 @@ 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"; diff --git a/user/settings/shell.nix b/user/settings/shell.nix index cc827427..33332294 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -35,8 +35,8 @@ in 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. -- cgit 1.4.1