fix ls on macos and other nav, passwdless lf

This commit is contained in:
2026-08-31 19:01:49 -05:00
parent 11ab7440fa
commit 7dde6470a4
3 changed files with 82 additions and 62 deletions
+4
View File
@@ -125,6 +125,10 @@
command = "/run/current-system/sw/bin/rsync";
options = ["NOPASSWD"];
}
{
command = "/etc/profiles/per-user/blake/bin/lf";
options = ["NOPASSWD"];
}
];
}
];
+1 -1
View File
@@ -23,9 +23,9 @@ set ignorecase true
# shortcuts
map gb cd /holocron
map gz cd %{{ [ -d /holocron ] && printf /holocron || printf /media/holocron }}
map gn cd ~/.nix
map gc cd ~/.config
map gv cd /var/lib
# navigation
map [ half-up
+22 -6
View File
@@ -7,6 +7,7 @@
program = "zsh";
cfg = config.dots.${program};
home_dir = config.home.homeDirectory;
isDarwin = pkgs.stdenv.isDarwin;
#sec = sops.secrets;
in {
options.dots.${program} = {
@@ -23,7 +24,6 @@ in {
programs.${program} = {
enable = true;
dotDir = "${config.xdg.configHome}/zsh";
#dotDir = ".config/zsh";
autocd = true;
enableCompletion = true;
@@ -41,18 +41,20 @@ in {
path = "$XDG_STATE_HOME/zsh/history";
};
shellAliases = {
shellAliases =
{
# --- zsh ---
src = "source ${home_dir}/.config/zsh/.zshrc";
# --- config editing ---
cfl = "nvim /home/blake/.nix/users/blake/dots/core/lf/lfrc";
cfz = "nvim /home/blake/.nix/users/blake/dots/core/zsh/default.nix";
cfv = "sudo lf /var/lib";
# --- navigation ---
ls = "ls --color=auto --group-directories-first";
ll = "ls -lh --color=auto --group-directories-first";
la = "ls -Alh --color=auto --group-directories-first";
# ls = "ls --color=auto --group-directories-first";
# ll = "ls -lh --color=auto --group-directories-first";
# la = "ls -Alh --color=auto --group-directories-first";
".." = "cd ..";
"..." = "cd ../..";
fs = "du -h | sort -h";
@@ -111,7 +113,21 @@ in {
peace = "systemctl poweroff";
love = "systemctl reboot";
lock = "loginctl lock-session";
};
}
# use GNU core utils ls on macos
// (
if isDarwin
then {
ls = "gls --color=auto --group-directories-first";
ll = "gls -lh --color=auto --group-directories-first";
la = "gls -Alh --color=auto --group-directories-first";
}
else {
ls = "gls --color=auto --group-directories-first";
ll = "gls -lh --color=auto --group-directories-first";
la = "gls -Alh --color=auto --group-directories-first";
}
);
initContent = ''