merging with main

.github/workflows/main.yml

@@ -19,6 +19,7 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v18
         with:
+          install_url: https://releases.nixos.org/nix/nix-2.13.3/install
           extra_nix_config: |
             experimental-features = nix-command flakes
 

flake.lock

@@ -1,65 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1684588578,
-        "narHash": "sha256-0KgeM/MV/OHR4AdgAomMZXAhNxGztVAqSAwygUYtISU=",
-        "owner": "revol-xut",
-        "repo": "nixpkgs",
-        "rev": "64c9ea63174e215b8a36cf5c34bd087d65e0e4f7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "revol-xut",
-        "ref": "regex-opt",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1684025543,
-        "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "sops-nix": "sops-nix"
-      }
-    },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1684571352,
-        "narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -17,12 +17,12 @@
           system = "aarch64-linux";
           modules = [
             {
-              nixpkgs.overlays = [ fsr-infoscreen.overlay."aarch64-linux" ];
+              # nixpkgs.overlays = [ fsr-infoscreen.overlay."aarch64-linux" ];
               nixpkgs.config.allowBroken = true;
               sdImage.compressImage = false;
             }
             ./hosts/sanddorn/configuration.nix
-            ./modules/infoscreen.nix
+            # ./modules/infoscreen.nix
             ./modules/base.nix
             ./modules/desktop.nix
             ./modules/options.nix

hosts/quitte/configuration.nix

@@ -30,7 +30,7 @@
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.openssh.permitRootLogin = "yes";
+  services.openssh.settings.permitRootLogin = "yes";
 
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 443 80 ];

hosts/sanddorn/configuration.nix

@@ -11,7 +11,7 @@
     };
     kernelPackages = pkgs.linuxPackages_latest;
     # No ZFS on latest kernel:
-    tmpOnTmpfs = true;
+    tmp.useTmpfs = true;
   };
 
   nix = {

modules/ldap.nix

@@ -164,5 +164,4 @@ in
         });
       })
   ];
-
 }

modules/nextcloud.nix

@@ -30,7 +30,8 @@ in
 
     nextcloud = {
       enable = true;
-      package = pkgs.nextcloud25; # Use current latest nextcloud package
+      package = pkgs.nextcloud26; # Use current latest nextcloud package
+      enableBrokenCiphersForSSE = false; # disable the openssl warning
       hostName = "${domain}";
       https = true; # Use https for all urls
       phpExtraExtensions = all: [

modules/wiki.nix

@@ -27,6 +27,7 @@
         host = "localhost";
         port = 5432;
         passwordFile = config.sops.secrets."mediawiki/postgres".path;
+        createLocally = false;
       };
 
       #      virtualHost = {
@@ -36,14 +37,14 @@
       #        enableACME = true;
       #      };
 
-      virtualHost = {
+      httpd.virtualHost = {
-        hostName = "wiki.quitte.tassilo-tanneberger.de";
+        hostName = "wiki.${config.fsr.domain}";
         adminAddr = "root@ifsr.de";
         #forceSSL = true;
         #enableACME = true;
       };
 
-      virtualHost.listen = [
+      httpd.virtualHost.listen = [
         {
           ip = "127.0.0.1";
           port = 8080;