diff --git a/home-manager/modules/nushell/config.nu b/home-manager/modules/nushell/config.nu index b918cce..9a6997c 100644 --- a/home-manager/modules/nushell/config.nu +++ b/home-manager/modules/nushell/config.nu @@ -91,7 +91,7 @@ let carapace_completer = {|spans| } # The default config record. This is where much of your global configuration is setup. -let-env config = { +$env.config = { ls: { use_ls_colors: true # use the LS_COLORS environment variable to colorize output clickable_links: true # enable or disable clickable links. Your terminal has to support links. diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix index 76de5ca..4150b9e 100644 --- a/home-manager/modules/nushell/default.nix +++ b/home-manager/modules/nushell/default.nix @@ -22,14 +22,14 @@ in envFile.source = ./env.nu; extraEnv = '' - let-env command_not_found_db = ${config.programs.command-not-found.dbPath} - let-env NIX_SYSTEM = "${pkgs.system}" + $env.command_not_found_db = ${config.programs.command-not-found.dbPath} + $env.NIX_SYSTEM = "${pkgs.system}" ''; extraConfig = '' alias vim = nvim alias tree = ${pkgs.exa}/bin/exa -Fb --git --tree --icons - let-env LS_COLORS = (${pkgs.vivid}/bin/vivid generate gruvbox-dark | str trim) + $env.LS_COLORS = (${pkgs.vivid}/bin/vivid generate gruvbox-dark | str trim) register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query register ${nushell_plugin_formats}/bin/nu_plugin_formats diff --git a/home-manager/modules/nushell/env.nu b/home-manager/modules/nushell/env.nu index 69228ef..5d35e94 100644 --- a/home-manager/modules/nushell/env.nu +++ b/home-manager/modules/nushell/env.nu @@ -2,16 +2,16 @@ # The prompt indicators are environmental variables that represent # the state of the prompt -let-env PROMPT_INDICATOR = {|| "> " } -let-env PROMPT_INDICATOR_VI_INSERT = {|| ": " } -let-env PROMPT_INDICATOR_VI_NORMAL = {|| "> " } -let-env PROMPT_MULTILINE_INDICATOR = {|| "::: " } +$env.PROMPT_INDICATOR = {|| "> " } +$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " } +$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " } +$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " } # Specifies how environment variables are: # - converted from a string to a value on Nushell startup (from_string) # - converted from a value back to a string when running external commands (to_string) # Note: The conversions happen *after* config.nu is loaded -let-env ENV_CONVERSIONS = { +$env.ENV_CONVERSIONS = { "PATH": { from_string: { |s| $s | split row (char esep) | path expand -n } to_string: { |v| $v | path expand -n | str join (char esep) } @@ -25,17 +25,17 @@ let-env ENV_CONVERSIONS = { # Directories to search for scripts when calling source or use # # By default, /scripts is added -let-env NU_LIB_DIRS = [ +$env.NU_LIB_DIRS = [ ($env.HOME | path join '.config' 'nushell' 'scripts') ] # Directories to search for plugin binaries when calling register # # By default, /plugins is added -let-env NU_PLUGIN_DIRS = [ +$env.NU_PLUGIN_DIRS = [ ($env.HOME | path join '.config' 'nushell' 'plugins') ] # To add entries to PATH (on Windows you might use Path), you can use the following pattern: -# let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path') +# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path') diff --git a/home-manager/modules/nushell/plugin-formats.nix b/home-manager/modules/nushell/plugin-formats.nix index d85edfe..ad5132b 100644 --- a/home-manager/modules/nushell/plugin-formats.nix +++ b/home-manager/modules/nushell/plugin-formats.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { src = nushell.src; - cargoHash = "sha256-DQt0AJ40ceRRPD74c5qTkkj7uBR0eJilvJrAocHF16k="; + cargoHash = "sha256-2fui2yF38dZjjG1aL36D7gAzLh0REiqZu0+4vjWLJUc="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];