From bc76a7c4c3e1efb71443fc66fc79481958bf3515 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 29 Jul 2025 10:46:38 -0400 Subject: [PATCH] Fix nushell at least on macOS --- modules/home/all/{nushell.nix => nushell/default.nix} | 4 ++-- modules/home/all/nushell/env.nu | 3 ++- modules/home/all/terminal.nix | 6 ------ modules/home/darwin-only.nix | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) rename modules/home/all/{nushell.nix => nushell/default.nix} (63%) diff --git a/modules/home/all/nushell.nix b/modules/home/all/nushell/default.nix similarity index 63% rename from modules/home/all/nushell.nix rename to modules/home/all/nushell/default.nix index ac7f8c2..5066158 100644 --- a/modules/home/all/nushell.nix +++ b/modules/home/all/nushell/default.nix @@ -3,8 +3,8 @@ programs.nushell = { enable = true; - envFile.source = ./nushell/env.nu; - configFile.source = ./nushell/config.nu; + envFile.source = ./env.nu; + configFile.source = ./config.nu; inherit (config.home) shellAliases; # Our shell aliases are pretty simple }; } diff --git a/modules/home/all/nushell/env.nu b/modules/home/all/nushell/env.nu index dde5667..7503b6d 100644 --- a/modules/home/all/nushell/env.nu +++ b/modules/home/all/nushell/env.nu @@ -2,6 +2,7 @@ $env.PATH = ( $env.PATH | split row (char esep) | prepend $"/etc/profiles/per-user/($env.USER)/bin" + | prepend $"/Users/($env.USER)/.nix-profile/bin" | prepend '/run/current-system/sw/bin/' - | prepend '/Applications/Docker.app/Contents/Resources/bin/' + | prepend "/nix/var/nix/profiles/default/bin" ) diff --git a/modules/home/all/terminal.nix b/modules/home/all/terminal.nix index 2af0824..20d42cf 100644 --- a/modules/home/all/terminal.nix +++ b/modules/home/all/terminal.nix @@ -76,12 +76,6 @@ in enableZshIntegration = true; }; nix-index-database.comma.enable = true; - /* - lsd = { - enable = true; - enableAliases = true; - }; - */ bat.enable = true; autojump.enable = false; zoxide.enable = true; diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix index cfb1f20..9369337 100644 --- a/modules/home/darwin-only.nix +++ b/modules/home/darwin-only.nix @@ -2,7 +2,7 @@ { imports = [ ./all/zsh.nix - ./all/nushell.nix + ./all/nushell # ./all/emacs.nix ]; }