mincomk/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore env, add pnpm home for nush

Browse Source
This commit is contained in:
minco
2025-10-31 14:48:10 +09:00
parent c0a7615fc2
commit 2df69949cb
4 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/home/fish.nix
View File

@@ -1,9 +1,5 @@
{ pkgs, ... }: { pkgs, ... }: {
{ imports = [ ./fish/aliases.nix ./fish/config.nix ];
imports = [
./fish/aliases.nix
./fish/config.nix
];
home.file.".config/fish/completions/flux.fish".source = home.file.".config/fish/completions/flux.fish".source =
../../shell/completions/flux.fish; ../../shell/completions/flux.fish;
@@ -29,4 +25,5 @@
} }
]; ];
}; };
} }

8
modules/home/fish/config.nix
View File

@@ -1,7 +1 @@
{ pkgs, ... }: { config, ... }: { imports = [ ./env.nix ./functions.nix ]; }
{
imports = [
./env.nix
./functions.nix
];
}

16
modules/home/fish/env.nix
View File

@@ -1,15 +1,13 @@
{ pkgs, ... }: { { config, ... }: {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
PNPM_HOME = "$HOME/.local/share/pnpm"; PNPM_HOME = "${config.home.homeDirectory}/.local/share/pnpm";
KUBECONFIG = "$HOME/.kube/config"; KUBECONFIG = "${config.home.homeDirectory}/.kube/config";
OPENSSL_DIR = "${pkgs.openssl.dev}"; # OPENSSL_DIR = "${pkgs.openssl.dev}";
OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; #OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include"; # OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; # PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
NIX_DEV_SHELL_DEFAULT_SHELL = "(which nu)"; NIX_DEV_SHELL_DEFAULT_SHELL = "(which nu)";
}; };
home.sessionPath = [ "$HOME/.local/bin" "$PNPM_HOME" ];
} }

9
modules/home/nushell.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { { config, ... }: {
imports = [ ./fish/env.nix ]; imports = [ ./fish/env.nix ];
home.file.".config/nushell/nu".source = ../../shell/nu; home.file.".config/nushell/nu".source = ../../shell/nu;
@@ -6,8 +6,9 @@
nushell = { nushell = {
enable = true; enable = true;
shellAliases = { vi = "nvim"; }; shellAliases = { vi = "nvim"; };
# environmentVariables = let env = import ./fish/env.nix { inherit pkgs; }; environmentVariables =
# in env.home.sessionVariables; let env = import ./fish/env.nix { inherit config; };
in env.home.sessionVariables;
extraConfig = '' extraConfig = ''
source ~/.config/nushell/nu/config.nu source ~/.config/nushell/nu/config.nu
let carapace_completer = {|spans| let carapace_completer = {|spans|
@@ -31,7 +32,7 @@
} }
$env.PATH = ($env.PATH | $env.PATH = ($env.PATH |
split row (char esep) | split row (char esep) |
append /usr/bin/env append /usr/bin/env | append $"($env.HOME)/.local/share/pnpm"
) )
''; '';
}; };