diff --git a/home-manager/git.nix b/home-manager/git.nix index a935816..42f4ec8 100644 --- a/home-manager/git.nix +++ b/home-manager/git.nix @@ -5,5 +5,8 @@ extraConfig.credential.helper = "store --file ~/.git-credentials"; userName = "${userSettings.gitUserName}"; userEmail = "${userSettings.gitUserEmail}"; + extraConfig = { + safe.directory = "/home/appdaemon/ad-nix"; + }; }; } \ No newline at end of file diff --git a/scripts/default.nix b/scripts/default.nix index fc45271..985c8ec 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,11 +1,16 @@ { pkgs, systemSettings, ... }: { environment.systemPackages = with pkgs; [ - (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch") - (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch") (pkgs.writeShellScriptBin "nfs" '' sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName} --impure '') + (pkgs.writeShellScriptBin "nfsu" '' + FLAKE=$(readlink -f /etc/nixos) + nix flake update --flake $FLAKE --impure + git -C /etc/nixos add $FLAKE > /dev/null 2>&1 + git -C /etc/nixos commit -m "Update flake.lock" > /dev/null 2>&1 + sudo nixos-rebuild switch --flake $FLAKE#${systemSettings.hostName} --impure + '') (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)") (pkgs.writeShellScriptBin "link-nix" "${builtins.readFile ./link-nix.sh}") (pkgs.writeShellScriptBin "sops-ad" "sops $(readlink -f /etc/nixos)/secrets/secrets.yaml")