From 0b5e03471fb6d8d3526fc3b032b7471f939daa85 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 5 Dec 2023 00:35:15 +0100 Subject: [PATCH 1/4] upgrade to nixpkgs 23.11 --- flake.lock | 33 ++++++++++++++++----------------- flake.nix | 7 ++----- hosts/bicep/configuration.nix | 3 ++- users/adriangl.nix | 2 +- users/oysteikt.nix | 2 +- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 713ba75..bf95e7a 100644 --- a/flake.lock +++ b/flake.lock @@ -65,32 +65,31 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1697936579, - "narHash": "sha256-nMyepKnwoHMzu2OpXvG2ZhU081TV9ENmWCo0vWxs6AI=", + "lastModified": 1701507532, + "narHash": "sha256-Zzv8OFB7iilzDGe6z2t/j8qRtR23TN3N8LssGsvRWEA=", "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "e09814657187c8ed1a5fe1646df6d8da1eb2dee9", + "rev": "046194cdadc50d81255a9c57789381ed1153e2b1", "type": "github" }, "original": { "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "e09814657187c8ed1a5fe1646df6d8da1eb2dee9", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1701592216, + "narHash": "sha256-OVEAu1YBi3i8eB2f5uxR0Yws/uXgj2yHj/I963e6jxU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "f8a9aa9ca646691f9e192a62624b1548367b5dd9", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05-small", + "ref": "nixos-23.11-small", "type": "indirect" } }, @@ -111,11 +110,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700905716, - "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", + "lastModified": 1701568804, + "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb95385d21475da10b63da74ae96d89ab352431", + "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", "type": "github" }, "original": { @@ -127,11 +126,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701368325, - "narHash": "sha256-3OqZyi2EdopJxpxwrySPyCTuCvfBY4oXTLVgQ4B6qDg=", + "lastModified": 1701609850, + "narHash": "sha256-6oxM84kaQT0H/+aurIcj2ON+asWYQ96zlMUIsfhKpFE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3", + "rev": "0b62f5adfd6635f8013d800ceb0cf39411a8216f", "type": "github" }, "original": { @@ -180,11 +179,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701127353, - "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", + "lastModified": 1701572436, + "narHash": "sha256-0anfOQqDend6kSuF8CmOSAZsiAS1nwOsin5VQukh6Q4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", + "rev": "8bca48cb9a12bbd8766f359ad00336924e91b7f7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 51f5fd7..658aa30 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "PVV System flake"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.05-small"; + nixpkgs.url = "nixpkgs/nixos-23.11-small"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small"; sops-nix.url = "github:Mic92/sops-nix"; @@ -15,7 +15,7 @@ pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; # Last release compatible with 23.05 - matrix-next.url = "github:dali99/nixos-matrix-modules/e09814657187c8ed1a5fe1646df6d8da1eb2dee9"; + matrix-next.url = "github:dali99/nixos-matrix-modules"; grzegorz.url = "github:Programvareverkstedet/grzegorz"; grzegorz.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -58,9 +58,6 @@ pkgs = import nixpkgs { inherit system; overlays = [ - (final: prev: { - mx-puppet-discord = prev.mx-puppet-discord.override { nodejs_14 = final.nodejs_18; }; - }) inputs.pvv-calendar-bot.overlays.${system}.default ]; }; diff --git a/hosts/bicep/configuration.nix b/hosts/bicep/configuration.nix index 2350492..ea18ce3 100644 --- a/hosts/bicep/configuration.nix +++ b/hosts/bicep/configuration.nix @@ -12,7 +12,8 @@ ./services/mysql.nix ./services/postgres.nix ./services/mysql.nix - ./services/calendar-bot.nix + # TODO: fix the calendar bot + # ./services/calendar-bot.nix ./services/matrix ]; diff --git a/users/adriangl.nix b/users/adriangl.nix index 0b0d24b..5887778 100644 --- a/users/adriangl.nix +++ b/users/adriangl.nix @@ -9,7 +9,7 @@ ]; packages = with pkgs; [ - exa + eza neovim ]; diff --git a/users/oysteikt.nix b/users/oysteikt.nix index d4a02b4..55bafe1 100644 --- a/users/oysteikt.nix +++ b/users/oysteikt.nix @@ -11,7 +11,7 @@ packages = with pkgs; [ bottom - exa + eza neovim diskonaut ripgrep From eabd8df3d8f55ae13110b276952b1c3bf603c914 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 10 Dec 2023 04:32:26 +0100 Subject: [PATCH 2/4] bicep/matrix: use package with fixed pythonEnv --- flake.nix | 3 ++- hosts/bicep/services/matrix/synapse.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 658aa30..f96957b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,9 @@ pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; - # Last release compatible with 23.05 matrix-next.url = "github:dali99/nixos-matrix-modules"; + # https://github.com/NixOS/nixpkgs/pull/273262 + nixpkgs-matrix-buildenv.url = "github:dali99/nixpkgs/synapse-buildenv"; grzegorz.url = "github:Programvareverkstedet/grzegorz"; grzegorz.inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/hosts/bicep/services/matrix/synapse.nix b/hosts/bicep/services/matrix/synapse.nix index 2b0d160..27e7ad5 100644 --- a/hosts/bicep/services/matrix/synapse.nix +++ b/hosts/bicep/services/matrix/synapse.nix @@ -29,6 +29,7 @@ in { services.matrix-synapse-next = { enable = true; + package = inputs.nixpkgs-matrix-buildenv.legacyPackages.x86_64-linux.matrix-synapse; plugins = [ (pkgs.python3Packages.callPackage ./smtp-authenticator { }) From dd8b677a793e8b35e2b27ac2803881d8ff69260b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 10 Dec 2023 05:27:58 +0100 Subject: [PATCH 3/4] =?UTF-8?q?buskerud:=20bootloader=20-=203.3TB,=20OS=20?= =?UTF-8?q?-=20256GB=20=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/buskerud/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/buskerud/configuration.nix b/hosts/buskerud/configuration.nix index 0c0ffb0..19ee29a 100644 --- a/hosts/buskerud/configuration.nix +++ b/hosts/buskerud/configuration.nix @@ -13,7 +13,7 @@ # boot.loader.systemd-boot.enable = true; # boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.device = "/dev/sdb"; networking.hostName = "buskerud"; networking.search = [ "pvv.ntnu.no" "pvv.org" ]; From 2b305678df8cb905e1aa181a8126e887467e2fae Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 10 Dec 2023 05:41:45 +0100 Subject: [PATCH 4/4] update flake.lock --- flake.lock | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index bf95e7a..61c37f3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700927249, - "narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", + "lastModified": 1701905325, + "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=", "owner": "nix-community", "repo": "disko", - "rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", + "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701592216, - "narHash": "sha256-OVEAu1YBi3i8eB2f5uxR0Yws/uXgj2yHj/I963e6jxU=", + "lastModified": 1702161203, + "narHash": "sha256-nq40oP9Pk/bC9/3ShxUah2FWsyHcObtS2NU5rV8shXY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8a9aa9ca646691f9e192a62624b1548367b5dd9", + "rev": "901fc6ea49ca9e9bbf636c48e2611588802e7b16", "type": "github" }, "original": { @@ -108,13 +108,29 @@ "type": "github" } }, + "nixpkgs-matrix-buildenv": { + "locked": { + "lastModified": 1702174959, + "narHash": "sha256-ZqDy8PYEdrgrF/aLNR1WihQjxmRYBV1C99bvJSQlpIg=", + "owner": "dali99", + "repo": "nixpkgs", + "rev": "94fbef01bd5df231a26f3bb25233ad4e1459c7cf", + "type": "github" + }, + "original": { + "owner": "dali99", + "ref": "synapse-buildenv", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1701568804, - "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", + "lastModified": 1702148972, + "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", + "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227", "type": "github" }, "original": { @@ -126,11 +142,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701609850, - "narHash": "sha256-6oxM84kaQT0H/+aurIcj2ON+asWYQ96zlMUIsfhKpFE=", + "lastModified": 1702115821, + "narHash": "sha256-NGPHs+I24iAnF2DhpnFH5XB2kJszW9dt6T/g7tH4CZA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b62f5adfd6635f8013d800ceb0cf39411a8216f", + "rev": "5eb361eeb014f6b0dc2a4cbca34b5317560e3a0d", "type": "github" }, "original": { @@ -166,6 +182,7 @@ "grzegorz-clients": "grzegorz-clients", "matrix-next": "matrix-next", "nixpkgs": "nixpkgs", + "nixpkgs-matrix-buildenv": "nixpkgs-matrix-buildenv", "nixpkgs-unstable": "nixpkgs-unstable", "pvv-calendar-bot": "pvv-calendar-bot", "sops-nix": "sops-nix" @@ -179,11 +196,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701572436, - "narHash": "sha256-0anfOQqDend6kSuF8CmOSAZsiAS1nwOsin5VQukh6Q4=", + "lastModified": 1702177193, + "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8bca48cb9a12bbd8766f359ad00336924e91b7f7", + "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9", "type": "github" }, "original": {