From 5b3e94fb48198b3b71ef6d7766cc25a342ba7cc4 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Wed, 7 Dec 2022 12:20:33 +0100 Subject: [PATCH] Update to nixOS 22.11 --- flake.lock | 96 +++++++++++++++++++++--------------- flake.nix | 4 +- modules/nix.nix | 9 ++-- modules/server/gitea.nix | 4 +- modules/server/nextcloud.nix | 3 +- modules/sway.nix | 2 +- 6 files changed, 69 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index af7906a..fc670f5 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1669801362, - "narHash": "sha256-kwrejUngReIv3M926D/SRQkJVCiaBuBcj7t3RmIXc4U=", + "lastModified": 1670409362, + "narHash": "sha256-kwiitU3k4FhWoosBmzgD7TyF9MVLtyGH+a3BVIxSL1w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a686fa48a89b0cba053143ba155506c93718037f", + "rev": "467fee473347adb1f4527a3375e996f879bf817a", "type": "github" }, "original": { @@ -152,19 +152,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" } @@ -228,11 +229,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669650994, - "narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -273,22 +274,6 @@ "type": "indirect" } }, - "nixpkgs-22_05_2": { - "locked": { - "lastModified": 1669513802, - "narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6649e08812f579581bfb4cada3ba01e30485c891", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -305,13 +290,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable": { "locked": { - "lastModified": 1669542132, - "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a115bb9bd56831941be3776c8a94005867f316a7", + "rev": "86370507cb20c905800527539fc049a2bf09c667", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1670242877, + "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198", "type": "github" }, "original": { @@ -323,16 +324,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669546925, - "narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=", + "lastModified": 1670276674, + "narHash": "sha256-FqZ7b2RpoHQ/jlG6JPcCNmG/DoUPCIvyaropUDFhF3Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fecf05d4861f3985e8dee73f08bc82668ef75125", + "rev": "52e3e80afff4b16ccb7c52e9f0f5220552f03d04", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -358,7 +359,7 @@ "nixpkgs" ], "nixpkgs-22_05": "nixpkgs-22_05", - "utils": "utils" + "utils": "utils_2" }, "locked": { "lastModified": 1655930346, @@ -380,14 +381,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669714206, - "narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { @@ -398,6 +399,21 @@ } }, "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" + } + }, + "utils_2": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", diff --git a/flake.nix b/flake.nix index fe5e83f..96d27ea 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-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; #nix = { @@ -17,7 +17,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/nix.nix b/modules/nix.nix index 2c0a434..dd4ac64 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -5,15 +5,16 @@ }: { config = { nix = { - useSandbox = true; + settings = { + sandbox = true; + trusted-users = ["root"] ++ config.elss.users.admins; + auto-optimise-store = true; + }; package = pkgs.nixFlakes; generateRegistryFromInputs = true; generateNixPathFromInputs = true; linkInputs = true; - autoOptimiseStore = true; - trustedUsers = ["root"] ++ config.elss.users.admins; - # Enable flakes # Free up to 50 GiB whenever there is less than 10 GiB left. extraOptions = '' diff --git a/modules/server/gitea.nix b/modules/server/gitea.nix index 7b59faa..76af8ec 100644 --- a/modules/server/gitea.nix +++ b/modules/server/gitea.nix @@ -19,7 +19,9 @@ with lib; { services.gitea = { enable = true; - disableRegistration = true; + settings.service = { + DISABLE_REGISTRATION = true; + }; appName = "gitea: ellmauthaler.net gitea service"; database = { type = "postgres"; diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 108fbdd..3584abf 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -12,9 +12,10 @@ with lib; { elss.server.sql.enable = mkDefault true; services.nextcloud = { enable = true; - package = pkgs.nextcloud24; + package = pkgs.nextcloud25; hostName = "cloudstore.ellmauthaler.net"; https = true; + enableBrokenCiphersForSSE = false; config = { dbtype = "pgsql"; dbuser = "nextcloud"; diff --git a/modules/sway.nix b/modules/sway.nix index 3a44b34..8902e0c 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -31,7 +31,7 @@ with lib; { pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ]; - gtkUsePortal = true; + # gtkUsePortal = true; depricated }; # enable sway window manager