refactor(collabora-office): switch to NixOS module

Switch from OCI container to NixOS module.

flake.nix

@@ -57,7 +57,6 @@ rec {
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
     };
 
     matrix-appservices = {
@@ -82,7 +81,7 @@ rec {
 
     csharp-language-server = {
       url = "github:SofusA/csharp-language-server";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
   };
@@ -103,6 +102,7 @@ rec {
         ./pkgs/flake-module.nix
         ./lib/flake-module.nix
         ./hosts/flake-module.nix
+        ./home/flake-module.nix
         ./overlays.nix
       ];
       flake = {
@@ -113,13 +113,6 @@ rec {
           systemdNotify = import ./modules/systemdNotify.nix;
           inadyn = import ./modules/inadyn.nix;
         };
-
-        homeManagerModules = {
-          git = import ./home/modules/git.nix;
-          firefox = import ./home/modules/firefox/firefox.nix;
-          tor-browser = import ./home/modules/firefox/tor-browser.nix;
-          mullvad-browser = import ./home/modules/firefox/mullvad-browser.nix;
-        };
       };
       perSystem =
         {

home/flake-module.nix

@@ -0,0 +1,55 @@
+{
+  self,
+  inputs,
+  pkgs,
+  ...
+}:
+
+let
+  createHomeConfig =
+    name: args:
+    inputs.home-manager.lib.homeManagerConfiguration (
+      {
+        inherit pkgs;
+        extraSpecialArgs = { inherit inputs; };
+      }
+      // args
+    );
+in
+{
+  flake = {
+    homeModules = {
+      git = import ./modules/git.nix;
+      firefox = import ./modules/firefox/firefox.nix;
+      tor-browser = import ./modules/firefox/tor-browser.nix;
+      mullvad-browser = import ./modules/firefox/mullvad-browser.nix;
+
+      # users
+      felschr = import ./felschr.nix;
+      felschr-server = import ./felschr-server.nix;
+      felschr-work = import ./felschr-work.nix;
+    };
+    homeConfigurations = {
+      felschr = createHomeConfig {
+        modules = [
+          self.homeModules.git
+          self.homeModules.felschr
+        ];
+      };
+      felschr-server = createHomeConfig {
+        modules = [
+          self.homeModules.git
+          self.homeModules.felschr-server
+        ];
+      };
+      felschr-work = createHomeConfig {
+        modules = [
+          self.homeModules.git
+          self.homeModules.felschr-work
+        ];
+      };
+    };
+    # HINT alias for deprecated output
+    homeManagerModules = self.homeModules;
+  };
+}

hosts/flake-module.nix

@@ -10,12 +10,13 @@
           inputs.nixos-hardware.nixosModules.common-pc-ssd
           inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           inputs.nixos-hardware.nixosModules.common-gpu-amd
-          (self.lib.createSystem "home-pc" {
+          (self.lib.createSystemModule "home-pc" {
             hardwareConfig = ../hardware/home-pc.nix;
             config = ../hosts/home-pc.nix;
           })
           self.lib.createMediaGroup
-          (self.lib.createUser "felschr" {
+          (self.lib.createUserModule "felschr" {
+            homeModule = self.homeModules.felschr;
             user.extraGroups = [
               "wheel"
               "networkmanager"
@@ -26,8 +27,6 @@
               "gamemode"
               "media"
             ];
-            modules = [ self.homeManagerModules.git ];
-            config = ../home/felschr.nix;
             usesContainers = true;
           })
           (
@@ -48,18 +47,17 @@
           inputs.nixos-hardware.nixosModules.common-pc
           inputs.nixos-hardware.nixosModules.common-pc-ssd
           inputs.nixos-hardware.nixosModules.common-cpu-intel
-          (self.lib.createSystem "pilot1" {
+          (self.lib.createSystemModule "pilot1" {
             hardwareConfig = ../hardware/pilot1.nix;
             config = ../hosts/work-pc.nix;
           })
-          (self.lib.createUser "felschr" {
+          (self.lib.createUserModule "felschr" {
+            homeModule = self.homeModules.felschr-work;
             user.extraGroups = [
               "wheel"
               "audio"
               "disk"
             ];
-            modules = [ self.homeManagerModules.git ];
-            config = ../home/felschr-work.nix;
             usesContainers = true;
           })
         ];
@@ -76,12 +74,13 @@
           inputs.nixos-hardware.nixosModules.common-cpu-intel
           inputs.nixos-hardware.nixosModules.common-gpu-intel-kaby-lake
           inputs.matrix-appservices.nixosModule
-          (self.lib.createSystem "home-server" {
+          (self.lib.createSystemModule "home-server" {
             hardwareConfig = ../hardware/lattepanda.nix;
             config = ../hosts/home-server.nix;
           })
           self.lib.createMediaGroup
-          (self.lib.createUser "felschr" {
+          (self.lib.createUserModule "felschr" {
+            homeModule = self.homeModules.felschr-server;
             user = {
               extraGroups = [
                 "wheel"
@@ -93,8 +92,6 @@
                 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP751vlJUnB7Pfe1KNr6weWkx/rkP4J3lTYpAekHdOgV"
               ];
             };
-            modules = [ self.homeManagerModules.git ];
-            config = ../home/felschr-server.nix;
           })
         ];
         specialArgs = {

lib/createUser.nix

@@ -1,22 +1,22 @@
+{ self, ... }:
+
+{
+  flake.lib.createUserModule =
     name:
     {
+      homeModule,
       user ? { },
-  hm ? { },
-  modules ? [ ],
-  config,
       usesContainers ? false,
       ...
     }:
-
     {
       inputs,
       pkgs,
       lib,
-  home-manager,
       ...
     }:
     {
-  imports = [ home-manager.nixosModules.home-manager ];
+      imports = [ inputs.home-manager.nixosModules.home-manager ];
 
       users.users."${name}" = {
         isNormalUser = true;
@@ -38,15 +38,16 @@ name:
       } // user;
 
       home-manager = {
-    useUserPackages = true;
         useGlobalPkgs = true;
+        useUserPackages = true;
         backupFileExtension = "backup";
-    users."${name}" = lib.mkMerge [
+        users."${name}" = {
-      { imports = modules; }
+          imports = [
-      (import config)
+            self.homeModules.git
+            homeModule
           ];
-    extraSpecialArgs = {
-      inherit inputs;
         };
-  } // hm;
+        extraSpecialArgs = { inherit inputs; };
+      };
+    };
 }

lib/flake-module.nix

@@ -1,13 +1,13 @@
-{ inputs, lib, ... }:
+{ lib, ... }:
 
-let
-  createUser' = import ./createUser.nix;
-in
 {
-  imports = [ ./openwrt.nix ];
+  imports = [
+    ./createUser.nix
+    ./openwrt.nix
+  ];
   options.flake.lib = lib.mkOption { type = with lib.types; lazyAttrsOf raw; };
   config.flake.lib = {
-    createSystem =
+    createSystemModule =
       hostName:
       { hardwareConfig, config }:
       (
@@ -22,9 +22,6 @@ in
           ];
         }
       );
-    createUser =
-      name: args:
-      ({ pkgs, ... }@args2: (createUser' name args) ({ inherit (inputs) home-manager; } // args2));
     createMediaGroup = _: { users.groups.media.gid = 600; };
   };
 }

services/collabora-office.nix

@@ -1,57 +1,34 @@
 { config, ... }:
 
 let
-  inherit (config.users.users.collabora-office) uid;
+  cfg = config.services.collabora-office;
-  inherit (config.users.groups.collabora-office) gid;
 in
 {
-  virtualisation.oci-containers.containers.collabora-office = {
+  services.collabora-online = {
-    image = "docker.io/collabora/code";
+    enable = true;
-    ports = [ "9980:9980" ];
+    aliasGroups = [
-    environment =
-      let
-        mkAlias = domain: "https://" + (builtins.replaceStrings [ "." ] [ "\\." ] domain) + ":443";
-      in
       {
-        server_name = "office.felschr.com";
+        host = "https://office.felschr.com";
-        aliasgroup1 = mkAlias "office.felschr.com";
+        aliases = [ "https://cloud.felschr.com" ];
-        aliasgroup2 = mkAlias "cloud.felschr.com";
+      }
-        extra_params = "--o:ssl.enable=false --o:ssl.termination=true";
-      };
-    extraOptions = [
-      "--runtime=crun"
-      "--uidmap=0:65534:1"
-      "--gidmap=0:65534:1"
-      "--uidmap=100:${toString uid}:1"
-      "--gidmap=101:${toString gid}:1"
-      "--network=host"
-      "--cap-add=MKNOD"
-      "--cap-add=CHOWN"
-      "--cap-add=FOWNER"
-      "--cap-add=SYS_CHROOT"
-      "--label=io.containers.autoupdate=registry"
     ];
+    settings = {
+      ssl = {
+        enable = false;
+        termination = true;
+      };
+    };
   };
 
   services.nginx.virtualHosts."office.felschr.com" = {
     forceSSL = true;
     enableACME = true;
     locations."/" = {
-      proxyPass = "http://127.0.0.1:9980";
+      proxyPass = "http://127.0.0.1:${toString cfg.port}";
       proxyWebsockets = true;
       extraConfig = ''
         proxy_read_timeout 36000s;
       '';
     };
   };
-
-  users.users.collabora-office = {
-    isSystemUser = true;
-    group = "collabora-office";
-    uid = 982;
-  };
-
-  users.groups.collabora-office = {
-    gid = 982;
-  };
 }