diff --git a/modules/home/fish/env.nix b/modules/home/fish/env.nix index 756f138..4f25843 100644 --- a/modules/home/fish/env.nix +++ b/modules/home/fish/env.nix @@ -1,18 +1,15 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { home.sessionVariables = { EDITOR = "nvim"; PNPM_HOME = "$HOME/.local/share/pnpm"; - OPENSSL_DIR = "${pkgs.openssl.dev}"; KUBECONFIG = "$HOME/.kube/config"; + OPENSSL_DIR = "${pkgs.openssl.dev}"; OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include"; PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; - NIX_DEV_SHELL_DEFAULT_SHELL = "(which fish)"; + NIX_DEV_SHELL_DEFAULT_SHELL = "(which nu)"; }; - home.sessionPath = [ - "$HOME/.local/bin" - "$PNPM_HOME" - ]; -} \ No newline at end of file + home.sessionPath = [ "$HOME/.local/bin" "$PNPM_HOME" ]; +} + diff --git a/modules/home/nushell.nix b/modules/home/nushell.nix index 67c0879..687b110 100644 --- a/modules/home/nushell.nix +++ b/modules/home/nushell.nix @@ -1,9 +1,13 @@ -{ ... }: { +{ pkgs, ... }: { + imports = [ ./fish/env.nix ]; + home.file.".config/nushell/nu".source = ../../shell/nu; programs = { nushell = { enable = true; shellAliases = { vi = "nvim"; }; + # environmentVariables = let env = import ./fish/env.nix { inherit pkgs; }; + # in env.home.sessionVariables; extraConfig = '' source ~/.config/nushell/nu/config.nu let carapace_completer = {|spans|