From df417133992e4c2264790cf1de90f2c8a9bd46f3 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Mon, 18 Dec 2023 15:57:38 +0100
Subject: [PATCH] Update to 23.11

Update to 23.11, updating nextcloud to version 27
---
 flake.lock                   | 16 ++++++++--------
 flake.nix                    |  4 ++--
 modules/locale.nix           |  4 ++--
 modules/server/nextcloud.nix |  3 +--
 modules/server/sql.nix       |  2 +-
 users/ellmau/zsh.nix         |  8 ++++----
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 97b90e5..2a8fcff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -194,16 +194,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1702195668,
-        "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=",
+        "lastModified": 1702814678,
+        "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f",
+        "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -393,16 +393,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1702759837,
-        "narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=",
+        "lastModified": 1702780907,
+        "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2566f4f897ac6224e094b167d9488d03e157f28",
+        "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index d6e3a98..e8caf3a 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-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     #nix = {
@@ -14,7 +14,7 @@
     nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/modules/locale.nix b/modules/locale.nix
index 895bfaf..b85eba7 100644
--- a/modules/locale.nix
+++ b/modules/locale.nix
@@ -12,8 +12,8 @@ with lib; {
     i18n.defaultLocale = "en_GB.UTF-8";
 
     fonts = {
-      enableDefaultFonts = true;
-      fonts = with pkgs; [
+      enableDefaultPackages = true;
+      packages = with pkgs; [
         hasklig
         # corefonts # not free
         liberation_ttf
diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix
index 9d42ff7..c86779d 100644
--- a/modules/server/nextcloud.nix
+++ b/modules/server/nextcloud.nix
@@ -12,10 +12,9 @@ with lib; {
       elss.server.sql.enable = mkDefault true;
       services.nextcloud = {
         enable = true;
-        package = pkgs.nextcloud26;
+        package = pkgs.nextcloud27;
         hostName = "cloudstore.ellmauthaler.net";
         https = true;
-        enableBrokenCiphersForSSE = false;
         config = {
           dbtype = "pgsql";
           dbuser = "nextcloud";
diff --git a/modules/server/sql.nix b/modules/server/sql.nix
index 7b4de94..3d8cb43 100644
--- a/modules/server/sql.nix
+++ b/modules/server/sql.nix
@@ -16,7 +16,7 @@ with lib; {
         ensureUsers = [
           {
             name = "nextcloud";
-            ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
+            ensureDBOwnership = true;
           }
         ];
         authentication = ''
diff --git a/users/ellmau/zsh.nix b/users/ellmau/zsh.nix
index 40c59b1..ffcd8e9 100644
--- a/users/ellmau/zsh.nix
+++ b/users/ellmau/zsh.nix
@@ -19,9 +19,9 @@
       '';
       shellAliases = {
         cp = "cp -i";
-        ls = "exa --icons --git";
-        ll = "exa --long --icons --binary --group";
-        llg = "exa --long --icons --grid --binary --group";
+        ls = "eza --icons --git";
+        ll = "eza --long --icons --binary --group";
+        llg = "eza --long --icons --grid --binary --group";
         lal = "ll --all";
         lla = "ll --all";
         emacsc = "emacsclient -n";
@@ -51,7 +51,7 @@
       config = {theme = "ansi";};
     };
 
-    exa = {
+    eza = {
       enable = true;
       enableAliases = false;
     };