From a9bd04ae6ec14185dae6bcc8a7f21e8836e0c155 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sat, 27 Jan 2024 15:19:23 -0500 Subject: [PATCH] fix flakePath --- homeConfig/modules/bash/config/alias.nix | 4 +++- homeConfig/modules/bash/default.nix | 3 ++- user/default.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/homeConfig/modules/bash/config/alias.nix b/homeConfig/modules/bash/config/alias.nix index 2991411..c9cdaaa 100644 --- a/homeConfig/modules/bash/config/alias.nix +++ b/homeConfig/modules/bash/config/alias.nix @@ -1,5 +1,7 @@ +{ flakePath, ... }: + { - nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop"; + nixup = "sudo nixos-rebuild switch --flake ${flakePath}/.#desktop"; chat = "weechat"; open = "xdg-open"; } diff --git a/homeConfig/modules/bash/default.nix b/homeConfig/modules/bash/default.nix index 940d68b..404aff6 100644 --- a/homeConfig/modules/bash/default.nix +++ b/homeConfig/modules/bash/default.nix @@ -3,6 +3,7 @@ with lib; let cfg = config.modules.bash; + flakePath = builtins.toString config.user.defaultFlakePath; in { options.modules.bash = { enable = mkEnableOption "bash"; }; @@ -14,7 +15,7 @@ in initExtra = import ./config/prompt.nix; profileExtra = import ./config/bashprofile.nix; bashrcExtra = import ./config/bashrc.nix; - shellAliases = import ./config/alias.nix; + shellAliases = import ./config/alias.nix { inherit flakePath; }; }; programs = { diff --git a/user/default.nix b/user/default.nix index 7396466..f56a278 100644 --- a/user/default.nix +++ b/user/default.nix @@ -14,7 +14,7 @@ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI=" ]; - flakeDefaultPath = /etc/nixos; + defaultFlakePath = /etc/nixos; }; }; };