diff --git a/flake.lock b/flake.lock index ab66fa6..acd0244 100644 --- a/flake.lock +++ b/flake.lock @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1687747614, - "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=", + "lastModified": 1687968164, + "narHash": "sha256-L9jr2zCB6NIaBE3towusjGBigsnE2pMID8wBGkYbTS4=", "owner": "nix-community", "repo": "disko", - "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95", + "rev": "8002e7cb899bc2a02a2ebfb7f999fcd7c18b92a1", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1687856573, - "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=", + "lastModified": 1687969886, + "narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13", + "rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1687850074, - "narHash": "sha256-Yl7eiGKPDUXzy2woWGwT2ZkdnXQwNl/WydAgSnV/wag=", + "lastModified": 1687911194, + "narHash": "sha256-lMY74cgPn3+TlM3sy2H6JUHUElkMGmnaJxbOfTLOyI4=", "owner": "neovim", "repo": "neovim", - "rev": "8ea9a70d05d6a7f9bab410101a87e6b184f14634", + "rev": "42f9573e5da64d6eb8e0dd9ccfefadb68773202c", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1687854182, - "narHash": "sha256-MiBwsNyXmIxG5jae5v8hqc0KtBpC3bqJlywFjF8MH/Y=", + "lastModified": 1687940604, + "narHash": "sha256-/ANZql21QQuCKBVLBW1FrZYQGkuluxj9Yh7G9SqcH/4=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "4262cbdf2fb06db6bc378bae6c9bac528383e8d8", + "rev": "c28ac0419ad6db399f38c2b6f1a0bb747d966cd3", "type": "github" }, "original": { @@ -355,11 +355,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687793116, - "narHash": "sha256-6xRgZ2E9r/BNam87vMkHJ/0EPTTKzeNwhw3abKilEE4=", + "lastModified": 1687886075, + "narHash": "sha256-PeayJDDDy+uw1Ats4moZnRdL1OFuZm1Tj+KiHlD67+o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4e0807d2142d17f463b26a8b796b3fe20a3011", + "rev": "a565059a348422af5af9026b5174dc5c0dcefdae", "type": "github" }, "original": { diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index cd23fa4..d8121f4 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -85,12 +85,12 @@ in }; leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "c390eab0950ea01a0d118c2c3c29db7781430b33"; - sha256 = "1pminnalq75r4cw0j8f4mh0qhvzakzgmr106p9c3qhj54km22jsp"; + rev = "f41de5c1cfeb146e4b8c5ed20e5b32230457ff25"; + sha256 = "0wga34195dg19x4y01mhs2pipxlkmhdlzjhp6qybwd860d696hhi"; fetchSubmodules = false; }; }; @@ -107,12 +107,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-27"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "bad9f5bf5b4af5d97a9cffdc957f1b23dc91d851"; - sha256 = "0zks9s9mvaz3q3mdjhh6f9h5php95qwmw18zsfyhzgfvyd20ykjg"; + rev = "e7f2b1276b7aa68099acc8169ce51f7e389b1772"; + sha256 = "0q8wgw46pxdgs41agf9ldwyzn3gjznrq66kxza74s6mn20blmpwc"; fetchSubmodules = false; }; }; diff --git a/home/programs/scripts/nixpkgs-switch b/home/programs/scripts/nixpkgs-switch index 856a0c6..2d5e4ac 100755 --- a/home/programs/scripts/nixpkgs-switch +++ b/home/programs/scripts/nixpkgs-switch @@ -22,7 +22,9 @@ if test "$other_hostname" = "" case Darwin git pull nom build ".#darwinConfigurations.$nix_hostname.config.system.build.toplevel" - env TERM=xterm-256color darwin-rebuild switch --flake ".#$nix_hostname" + if test $status -eq 0 + env TERM=xterm-256color darwin-rebuild switch --flake ".#$nix_hostname" + end case Linux sudo git pull sudo nixos-rebuild switch --flake . @@ -30,7 +32,9 @@ if test "$other_hostname" = "" else git pull nom build --eval-store auto --store "ssh-ng://builder-$other_hostname" ".#nixosConfigurations.$other_hostname.config.system.build.toplevel" - deploy --skip-checks ".#$other_hostname" + if test $status -eq 0 + deploy --skip-checks ".#$other_hostname" + end end if test $status -eq 0