From f5ce456567adc9c5d68c52328aa4ad0a2b1feda5 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 20 Dec 2022 17:11:43 +0100 Subject: [PATCH] upgrade to 22.11. --- flake.lock | 148 ++++++++++++++------------ flake.nix | 4 +- nixos/system/desktop/home-manager.nix | 2 + 3 files changed, 86 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 3570aff..66d031c 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1668384235, - "narHash": "sha256-bt2drRd1v+efic9MLnO3KI2x96g+J4TxhKiQQKqvyik=", + "lastModified": 1669917327, + "narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=", "owner": "zhaofengli", "repo": "colmena", - "rev": "fff97f729086b4fc463e30d33d3350bcfa2838bb", + "rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1668736610, - "narHash": "sha256-qqQ/YspdN7c8o24CZQfvtuCC8I0AzCAwTpDRCdWdgJo=", + "lastModified": 1671154105, + "narHash": "sha256-OI6M2/Kcd1bJuodxV6rV5KtDJMUeewsqKy1B2PLNVys=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "6a37d61c1d8c8586b1140f53b83c164dd2fd7d2d", + "rev": "2150fd40b2110bbd11dcb62fa5f307ec345b0fb0", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1668718165, - "narHash": "sha256-GLWQRgl3dJiucomkb/XCFHk+cgP2WEkpLZhSWH4l6oc=", + "lastModified": 1671128331, + "narHash": "sha256-oa3HZNgyAWEx09eElSISpRCltgYqHshjphJ9eeTO6As=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "51c6e49b08c37ab762c1bdc8060e569197001dfe", + "rev": "c873175c2f8d96cd77c5b6552f411ddd0959e483", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1669120813, - "narHash": "sha256-00O/dvvcELCdpuFPde+bsJ9Bw974b/VunUArWlJ+lQA=", + "lastModified": 1671533088, + "narHash": "sha256-l4xY/ck8CyJUkx+od66OXoLB2iXzFqMmv6o4Cbj730E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a9c2a436757f09abc4c7bc0abc4d2529b312e42b", + "rev": "74a1e57fc7228d715c666172ffe11e38ab31e312", "type": "github" }, "original": { @@ -449,19 +449,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -492,11 +493,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669553481, - "narHash": "sha256-wdOiCpzYaFhUjkIo9mYcCvlO3kX0mknrqRp04788cHI=", + "lastModified": 1669559123, + "narHash": "sha256-Iek82mEI2kk2fTJbFHvPcMl0oOscBPhFjU9mMaCSWiw=", "owner": "mrVanDalo", "repo": "landingpage", - "rev": "81d1e854cc3c86890218d18f043dd1427fbcfa13", + "rev": "2b46eb76d16988eb92daa1afc8849bde1002dc4b", "type": "github" }, "original": { @@ -562,22 +563,6 @@ "type": "github" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1668908668, - "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-fmt": { "inputs": { "fenix": "fenix", @@ -600,13 +585,29 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1671459584, + "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "87b58217c9a05edcf7630b9be32570f889217aef", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1668994630, - "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", "type": "github" }, "original": { @@ -633,16 +634,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1668984258, - "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", + "lastModified": 1671313200, + "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -663,11 +664,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1668882784, - "narHash": "sha256-L1mHACWrG83j8U/jDtAdQHmVZu+JwVUxRPf5mhuzr2s=", + "lastModified": 1671417167, + "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1b4a562216eba8df3053bd869155dde4b5bca12", + "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", "type": "github" }, "original": { @@ -712,11 +713,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1668143941, - "narHash": "sha256-f7nwVd1usk2Zhn9szqdhtU7/czXRl9w2NTQtGpIlugc=", + "lastModified": 1670680538, + "narHash": "sha256-afmN2tOY6Par235bVsqhtFHOSVyw4NBgTxI5Eo6Yk5A=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "f83e45526b5ec4627d601673be3680e2dece1b33", + "rev": "42153ea2fec66f90c1623be25d6774d96ecf8062", "type": "github" }, "original": { @@ -832,11 +833,11 @@ "retiolum": { "flake": false, "locked": { - "lastModified": 1668975960, - "narHash": "sha256-n/2bR84E894ePoOFE5c/BB5iqYNV+GnuNlShqnKYRY8=", + "lastModified": 1671456454, + "narHash": "sha256-UzNs+lOqrAOzMf9EdcEZsuvjZnBKgPmmoyiwM81EaTQ=", "owner": "krebs", "repo": "retiolum", - "rev": "967aebeaa5a1574aa65ab661d203d1c3f3b05ca2", + "rev": "20ad3544d80690791bed8a639d08848924a7aaa9", "type": "github" }, "original": { @@ -848,11 +849,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1668674340, - "narHash": "sha256-JEXPS67bgKnnRdA37mC18PyGm4EWVQ/BrWeBZLVKPvU=", + "lastModified": 1670408834, + "narHash": "sha256-2LG8/AwMC+caNK9DKDyVGw+EPT2W6ys177xQj7mdKng=", "owner": "hakimel", "repo": "reveal.js", - "rev": "9f1f7789bfbf689d9c1615e523d5c6262771e90f", + "rev": "4fe3946cb43de57f79aaa7b646aee7e78f4bcc75", "type": "github" }, "original": { @@ -951,14 +952,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1668915833, - "narHash": "sha256-7VYPiDJZdGct8Nl3kKhg580XZfoRcViO+zUGPkfBsqM=", + "lastModified": 1671472949, + "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f72e050c3ef148b1131a0d2df55385c045e4166b", + "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342", "type": "github" }, "original": { @@ -969,16 +970,16 @@ }, "stable": { "locked": { - "lastModified": 1660496378, - "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=", + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -986,11 +987,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1663136308, - "narHash": "sha256-FI25RLoHqhcjA2qel75LVmQH4rTkKiAUR2w9QODT1XM=", + "lastModified": 1670681486, + "narHash": "sha256-Ss1FWOq51+0FQpQWXPiSWHmNYU6NurUvI2wAjOGV/kA=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "c3da5520b988720f7f6e9e5e11b60746598112e0", + "rev": "85db0117ead108213cc2a4210f72746d8ad8d20a", "type": "github" }, "original": { @@ -999,6 +1000,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3fbbf3a..7878094 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main"; flake = false; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; # colmena # ------- colmena = { @@ -29,7 +29,7 @@ #inputs.emacs-overlay.follows = "emacs-overlay"; }; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager-utils = { diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index 88404c0..f98f834 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -42,6 +42,8 @@ in home-manager.users.mainUser = { + home.stateVersion = "22.11"; + # nushell is the new shit yeah programs.nushell = { enable = lib.mkDefault true;