From 07ca34cc29abca3a6da9b2084455dce46fc70ce8 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 27 May 2024 19:10:54 +0200
Subject: [PATCH] nix flake check

---
 flake.nix                                    | 9 ++++++---
 nixos/machines/chungus/service-paperless.nix | 3 +--
 nixos/machines/orbi/media-nextcloud.nix      | 2 +-
 nixos/machines/robi/nextcloud.nix            | 2 +-
 nixos/system/all/defaults.nix                | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index bf6a7a0..629deba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -232,7 +232,10 @@
           })
         ({ pkgs, ... }: {
           boot.tmp.useTmpfs = lib.mkDefault true;
-          environment.systemPackages = [ nixpkgs-fmt.defaultPackage.${pkgs.system} ];
+          environment.systemPackages = [
+            nixpkgs-fmt.defaultPackage.${pkgs.system}
+            clan-core.packages.${pkgs.system}.clan-cli
+          ];
           imports = [
             permown.nixosModules.permown
             #disko.nixosModules.disko
@@ -389,7 +392,7 @@
               srvos.nixosModules.hardware-hetzner-online-intel
               srvos.nixosModules.server
               srvos.nixosModules.mixins-terminfo
-              { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
+              #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
               {
                 home-manager.users.mainUser = import ./nixos/homes/palo;
                 home-manager.users.root = import ./nixos/homes/root;
@@ -402,7 +405,7 @@
             host = "robi.private";
             modules = [
               homeManagerModules
-              { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
+              #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
               {
                 home-manager.users.mainUser = import ./nixos/homes/palo;
                 home-manager.users.root = import ./nixos/homes/root;
diff --git a/nixos/machines/chungus/service-paperless.nix b/nixos/machines/chungus/service-paperless.nix
index 6f60562..1624448 100644
--- a/nixos/machines/chungus/service-paperless.nix
+++ b/nixos/machines/chungus/service-paperless.nix
@@ -3,8 +3,7 @@
   services.paperless = {
     enable = true;
     address = "0.0.0.0";
-    package = pkgs.unstable.paperless;
-    extraConfig = {
+    settings = {
       PAPERLESS_OCR_LANGUAGE = "deu+eng";
       PAPERLESS_APP_TITLE = "paperless.chungus.private";
       PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ];
diff --git a/nixos/machines/orbi/media-nextcloud.nix b/nixos/machines/orbi/media-nextcloud.nix
index 82eaf4b..1370a5c 100644
--- a/nixos/machines/orbi/media-nextcloud.nix
+++ b/nixos/machines/orbi/media-nextcloud.nix
@@ -182,7 +182,7 @@ in
           overwriteProtocol = "https";
           dbtype = "mysql";
           dbpassFile = "/run/secrets/nextcloud_database_password";
-          dbport = 3306;
+          dbhost = "localhost:3306";
           defaultPhoneRegion = "DE";
         };
       };
diff --git a/nixos/machines/robi/nextcloud.nix b/nixos/machines/robi/nextcloud.nix
index b1ffd12..fbb5c2a 100644
--- a/nixos/machines/robi/nextcloud.nix
+++ b/nixos/machines/robi/nextcloud.nix
@@ -253,7 +253,7 @@ in
           trustedProxies = [ "144.76.13.147" hostAddress ];
           dbtype = "mysql";
           dbpassFile = "/run/secrets/nextcloud_database_password";
-          dbport = 3306;
+          dbhost = "localhost:3306";
           defaultPhoneRegion = "DE";
         };
       };
diff --git a/nixos/system/all/defaults.nix b/nixos/system/all/defaults.nix
index 6fcac20..41d37fd 100644
--- a/nixos/system/all/defaults.nix
+++ b/nixos/system/all/defaults.nix
@@ -21,7 +21,7 @@
   i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
   console.font = "Lat2-Terminus16";
   console.keyMap = lib.mkDefault "us";
-  services.xserver.layout = lib.mkDefault "us";
+  services.xserver.xkb.layout = lib.mkDefault "us";
 
   # swappiness
   # ----------