From ec3e0b5a2a5d0d57ca514df5dfd09aaf7a56e28a Mon Sep 17 00:00:00 2001 From: surtur Date: Thu, 3 Aug 2023 11:50:06 +0200 Subject: [PATCH] home-manager: bump stateVersion to 23.11 --- .zshenv | 3 +++ flake.lock | 42 +++++++++++++----------------------------- home-surtur.nix | 3 +-- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/.zshenv b/.zshenv index f8e9a67..42e1f33 100644 --- a/.zshenv +++ b/.zshenv @@ -12,6 +12,9 @@ export AndroidNdkPath=$ANDROID_NDK_PATH export CCACHE_NODISABLE="true" +# https://github.com/nix-community/home-manager/issues/4019 +export SKIP_SANITY_CHECKS=1 + # https://github.com/NixOS/nix/issues/2033 # https://discourse.nixos.org/t/where-is-nix-path-supposed-to-be-set/16434/8 export NIX_PATH=$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/vis/channels${NIX_PATH:+:$NIX_PATH} diff --git a/flake.lock b/flake.lock index a93ff19..2e36d2e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -20,15 +20,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1661573386, - "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=", + "lastModified": 1690982105, + "narHash": "sha256-32AzoLuwhtxBItcULRiCnxRfJcbVXbPZSH9TDVg21mU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b", + "rev": "b2ac1d2c32ac11b8d231d23622cdc4b2f28d07d2", "type": "github" }, "original": { @@ -44,11 +43,11 @@ ] }, "locked": { - "lastModified": 1662769985, - "narHash": "sha256-zGk10O4osXxf1n9RafSMpPBsEibAGzx4OL4MLmlodB4=", + "lastModified": 1669234151, + "narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=", "owner": "jordanisaacs", "repo": "homeage", - "rev": "dd98c460175a0781ad0b51f4392de97c5454a5c4", + "rev": "02bfe4ca06962d222e522fff0240c93946b20278", "type": "github" }, "original": { @@ -59,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1661541451, - "narHash": "sha256-LALyT63vpo1sftSmHAbbrj+emfCOo93Jv4xVOIcmnl0=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "38e16b192af13ff6cffc8a35a25f390f1e96b585", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -80,21 +79,6 @@ "homeage": "homeage", "nixpkgs": "nixpkgs" } - }, - "utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/home-surtur.nix b/home-surtur.nix index 2ade7ee..c06d7d5 100644 --- a/home-surtur.nix +++ b/home-surtur.nix @@ -10,7 +10,7 @@ in { home.username = "$USER"; home.sessionVariables.HOSTNAME = "${hostName}"; home.homeDirectory = "/home/$USER"; - home.stateVersion = "22.11"; + home.stateVersion = "23.11"; # build configuration and switch: # ➜ home-manager switch --no-out-link -b backup --flake~/utils/dotfiles#$HOST @@ -20,7 +20,6 @@ in { # hit the issue described here, waiting until resolved: # https://github.com/nix-community/home-manager/issues/2848 programs.home-manager.enable = true; - programs.home-manager.path = "$HOME/utils/dotfiles"; home.packages = with pkgs; [ direnv