From 1a477e2137f04b6d6252b43aef9b8f51c7236571 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 27 Jul 2023 12:51:48 -0500 Subject: [PATCH] Fix syntax error in flake --- common/fish/config.fish | 19 +++++++++++++++++++ os/linux/nix/flake.nix | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/common/fish/config.fish b/common/fish/config.fish index b9f885d..f4c8387 100755 --- a/common/fish/config.fish +++ b/common/fish/config.fish @@ -23,6 +23,25 @@ if test -f $HOME/.nix-profile/etc/profile.d/nix.fish . $HOME/.nix-profile/etc/profile.d/nix.fish end +if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh + # for determinate systems install + set nix_profiles /nix/var/nix/profiles/default $HOME/.nix-profile + set --export --universal NIX_PROFILES "$nix_profiles" + + if set -q NIX_SSL_CERT_FILE + : + else if test -e /etc/ssl/certs/ca-certificates.crt + set --export --universal NIX_SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt + else + for p in (string split $NIX_PROFILES) + test -e $p/etc/ssl/certs/ca-bundle.crt && \ + set --export --universal NIX_SSL_CERT_FILE $p/etc/ssl/certs/ca-bundle.crt + end + end + + set --prepend --export --global fish_user_paths $HOME/.nix-profile/bin /nix/var/nix/profiles/default/bin +end + if has_command nnn source $DOTFILES_PATH/common/nnn/config.fish end diff --git a/os/linux/nix/flake.nix b/os/linux/nix/flake.nix index bf40bf2..fee7509 100644 --- a/os/linux/nix/flake.nix +++ b/os/linux/nix/flake.nix @@ -21,7 +21,7 @@ sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; - } + }; }; outputs = inputs: { @@ -31,7 +31,7 @@ modules = [ ./machines/beefcake.nix inputs.home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + inputs.sops-nix.nixosModules.sops { home-manager.useGlobalPkgs = true; }