From 2b4b2a901f29e6662425fb3ad68088fe363f8ac2 Mon Sep 17 00:00:00 2001 From: pegasust Date: Mon, 2 Jan 2023 22:48:12 -0700 Subject: [PATCH] hm-switch should now updates neovim and some of its plugins --- flake.lock | 18 +++++++++--------- nix-conf/home-manager/flake.lock | 22 +++++++++++----------- scripts/hm-switch.sh | 3 +++ 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index ec98f01..2941a1f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672349765, - "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", + "lastModified": 1672688183, + "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", + "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", "type": "github" }, "original": { @@ -154,11 +154,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1672262501, - "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "lastModified": 1672525397, + "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1672367043, - "narHash": "sha256-4/40kfJysfDEfSpXJ3inuMetn40czz5Mh73SjxsKTX0=", + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e6b2214363f5e18576a3b2ca0e0483d8f42fe531", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 6465d36..06e96d9 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -69,11 +69,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672349765, - "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", + "lastModified": 1672688183, + "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", + "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-KP+2qdZlhmRkrafuuEofg7YnNdVmGV95ipvpuqmJneI=", - "path": "/nix/store/qcm4676fqkcdrizjkn4j0796ybddwlxm-source/out-of-tree/nixGL", + "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL", "type": "path" }, "original": { - "path": "/nix/store/qcm4676fqkcdrizjkn4j0796ybddwlxm-source/out-of-tree/nixGL", + "path": "/nix/store/zcawhhz89smqvmyqp985cmlsh6y81789-source/out-of-tree/nixGL", "type": "path" } }, @@ -131,11 +131,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1672262501, - "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "lastModified": 1672525397, + "narHash": "sha256-WASDnyxHKWVrEe0dIzkpH+jzKlCKAk0husv0f/9pyxg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "rev": "8ba56d7c0d7490680f2d51ba46a141eca7c46afa", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1672367043, - "narHash": "sha256-4/40kfJysfDEfSpXJ3inuMetn40czz5Mh73SjxsKTX0=", + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e6b2214363f5e18576a3b2ca0e0483d8f42fe531", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "type": "github" }, "original": { diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index 6ff6f5b..9477978 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -7,6 +7,9 @@ echo "SCRIPT_DIR: ${SCRIPT_DIR}" HOME_MANAGER_DIR="${SCRIPT_DIR}/../nix-conf/home-manager" +# Mason is bad: it puts binaries onto xdg.data +rm -rf ~/.local/share/nvim/mason + # test if we have home-manager, if not, attempt to use nix to put home-manager to # our environment if [ $(home-manager >/dev/null 2>&1) ]; then