From eb37b1ffea3682638af99e06903ae305964dda2f Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 23 Feb 2023 14:09:14 +0100 Subject: [PATCH] Add strategic no-links --- home-manager/roles/mode-switching.nix | 4 ++-- home-manager/roles/zsh/zshrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/roles/mode-switching.nix b/home-manager/roles/mode-switching.nix index 6e0edebc..d926f0ba 100644 --- a/home-manager/roles/mode-switching.nix +++ b/home-manager/roles/mode-switching.nix @@ -18,7 +18,7 @@ in { echo "Running update-modes …" ${updateModes}/bin/update-modes echo "Updating system …" - ${pkgs.nix-output-monitor}/bin/nom build --builders @$(builders-configurator) $(readlink -f /etc/nixos)#nixosConfigurations.$(hostname).config.system.build.toplevel --allow-import-from-derivation + ${pkgs.nix-output-monitor}/bin/nom build --builders @$(builders-configurator) $(readlink -f /etc/nixos)#nixosConfigurations.$(hostname).config.system.build.toplevel --allow-import-from-derivation --no-link /run/wrappers/bin/sudo -A /run/current-system/sw/bin/nixos-rebuild switch echo "Maintenance finished." ''; @@ -43,7 +43,7 @@ in { main = do say "Building ~/.modes for ${hostName}" builders <- builders_configurator |> captureTrim - nom ["build", "--builders", [i|@#{builders}|], "/home/maralorn/git/config#homeModes.${hostName}", "-o", "${modeDir}", "--allow-import-from-derivation"] + nom ["build", "--builders", [i|@#{builders}|], "/home/maralorn/git/config#homeModes.${hostName}", "-o", "${modeDir}"] activate_mode ''; quickUpdateMode = diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc index ea09226d..0d18384d 100644 --- a/home-manager/roles/zsh/zshrc +++ b/home-manager/roles/zsh/zshrc @@ -35,7 +35,7 @@ autoload -U colors && colors # Enable colors in prompt alias nom-build-remote='nom build --builders @$(builders-configurator --force)' alias nix-build-remote='nix build --builders @$(builders-configurator --force)' -alias update-system='nom build --builders @$(builders-configurator)'" $(readlink -f /etc/nixos)#nixosConfigurations.$(hostname).config.system.build.toplevel && sudo -A nixos-rebuild switch" +alias update-system='nom build --builders @$(builders-configurator)'" $(readlink -f /etc/nixos)#nixosConfigurations.$(hostname).config.system.build.toplevel --no-link && sudo -A nixos-rebuild switch" alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @$(builders-configurator --force)"' alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @$(builders-configurator --force)"' alias accounting='f() { if [[ "$1" == "" ]]; then year="buchhaltung" else year="$1" fi; hledger -f ~/git/buchhaltung/$year.journal ui -- --watch --theme=terminal -X€ -t -E}; f'