From 60557b9ca800995c287e812b8556aa39668d8a9b Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 16 Jun 2023 19:56:23 -0400 Subject: [PATCH] force with lease --- flake.nix | 3 +-- quick-switch.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ba81b2c..e5fcf12 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,9 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { nixpkgs, home-manager, ... }@attrs: { + outputs = inputs@{ nixpkgs, home-manager, ... }: { nixosConfigurations.nixos76 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; modules = [ ./configuration.nix home-manager.nixosModules.home-manager diff --git a/quick-switch.sh b/quick-switch.sh index 5448b07..22f54e1 100755 --- a/quick-switch.sh +++ b/quick-switch.sh @@ -2,8 +2,8 @@ if [ -z "$(git status --porcelain)" ] then - git push - sudo nixos-rebuild switch --flake "git+https://git.atauno.com/atau/nixos-config.git" + git push --force-with-lease + sudo nixos-rebuild switch --flake "git+https://git.atauno.com/atau/nixos-config.git#nixos76" else echo "Git working directory is unclean, please commit changes" exit 1