From f44fd0664aabdfad19068e96e25330f02b4c7a89 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Tue, 4 Feb 2025 10:08:57 +0100 Subject: [PATCH] Update to 24.11 Signed-off-by: Stefan Ellmauthaler --- flake.lock | 70 ++++++++++-------------------------- flake.nix | 7 ++-- machines/metis/default.nix | 1 + modules/graphical.nix | 2 -- modules/nix.nix | 2 +- modules/server/nextcloud.nix | 2 +- 6 files changed, 25 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 803f64b..d290270 100644 --- a/flake.lock +++ b/flake.lock @@ -194,16 +194,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -283,32 +283,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1738574474, + "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1738574474, + "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -382,20 +382,19 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05", - "utils": "utils" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1718084203, - "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -451,39 +450,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 72b11a6..6df47c1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; #nix = { @@ -19,7 +19,7 @@ nixos-hardware = {url = "github:NixOS/nixos-hardware/master";}; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -31,7 +31,7 @@ }; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -86,6 +86,7 @@ channelsConfig = { allowUnfreePredicate = pkg: builtins.elem (extended-lib.getName pkg) [ + "aspell-dict-en-science" "discord" "slack" "steam" diff --git a/machines/metis/default.nix b/machines/metis/default.nix index e6fe6e5..416f8ab 100644 --- a/machines/metis/default.nix +++ b/machines/metis/default.nix @@ -41,6 +41,7 @@ server = { enable = true; acme.staging = false; + wordpress.enable = false; }; # enable wireguard diff --git a/modules/graphical.nix b/modules/graphical.nix index 542618a..19dc7b7 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -83,8 +83,6 @@ with lib; { printing.enable = true; }; - sound.enable = true; - hardware = { #pulseaudio.enable = true; bluetooth.enable = true; diff --git a/modules/nix.nix b/modules/nix.nix index dd4ac64..fc6b16d 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -10,7 +10,7 @@ trusted-users = ["root"] ++ config.elss.users.admins; auto-optimise-store = true; }; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; generateRegistryFromInputs = true; generateNixPathFromInputs = true; linkInputs = true; diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 3d83ade..cdd2fe0 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -12,7 +12,7 @@ with lib; { elss.server.sql.enable = mkDefault true; services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; hostName = "cloudstore.ellmauthaler.net"; https = true; config = {