remove OPENSSL_PATH

This commit is contained in:
2025-10-31 12:42:26 +09:00
parent c2db9db949
commit c0a7615fc2
2 changed files with 11 additions and 10 deletions

View File

@@ -1,18 +1,15 @@
{ pkgs, ... }: { pkgs, ... }: {
{
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
PNPM_HOME = "$HOME/.local/share/pnpm"; PNPM_HOME = "$HOME/.local/share/pnpm";
OPENSSL_DIR = "${pkgs.openssl.dev}";
KUBECONFIG = "$HOME/.kube/config"; KUBECONFIG = "$HOME/.kube/config";
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 fish)"; NIX_DEV_SHELL_DEFAULT_SHELL = "(which nu)";
}; };
home.sessionPath = [ home.sessionPath = [ "$HOME/.local/bin" "$PNPM_HOME" ];
"$HOME/.local/bin" }
"$PNPM_HOME"
];
}

View File

@@ -1,9 +1,13 @@
{ ... }: { { pkgs, ... }: {
imports = [ ./fish/env.nix ];
home.file.".config/nushell/nu".source = ../../shell/nu; home.file.".config/nushell/nu".source = ../../shell/nu;
programs = { programs = {
nushell = { nushell = {
enable = true; enable = true;
shellAliases = { vi = "nvim"; }; shellAliases = { vi = "nvim"; };
# environmentVariables = let env = import ./fish/env.nix { inherit pkgs; };
# 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|