Enable flakes in kexec image and comma integration

Makefile

@@ -41,7 +41,12 @@ iso:
 kexec-img:
 	nix build .#packages.x86_64-linux.kexec
 
-# Deploy a host by name (ex: 's0')
+# Deploy a host by name (ex: 's0') but don't activate
 .PHONY: deploy
 deploy:
-	deploy --remote-build --boot --debug-logs --skip-checks .#$(filter-out $@,$(MAKECMDGOALS))
+	deploy --remote-build --boot --debug-logs --skip-checks .#$(filter-out $@,$(MAKECMDGOALS))
+
+# Deploy a host by name (ex: 's0')
+.PHONY: deploy-activate
+deploy-activate:
+	deploy --remote-build --debug-logs --skip-checks .#$(filter-out $@,$(MAKECMDGOALS))

common/server/nextcloud.nix

@@ -110,10 +110,10 @@ in
           config.services.nextcloud.occ
         ];
         script = ''
-          nextcloud-occ -- config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
+          nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
-          nextcloud-occ -- config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
+          nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
-          nextcloud-occ -- config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
+          nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
-          nextcloud-occ -- richdocuments:setup
+          nextcloud-occ richdocuments:setup
         '';
         serviceConfig = {
           Type = "oneshot";
@@ -134,8 +134,8 @@ in
         config.services.nextcloud.occ
       ];
       script = ''
-        nextcloud-occ -- config:app:set whiteboard collabBackendUrl --value="https://${whiteboardHostname}"
+        nextcloud-occ config:app:set whiteboard collabBackendUrl --value="https://${whiteboardHostname}"
-        nextcloud-occ -- config:app:set whiteboard jwt_secret_key --value="$JWT_SECRET_KEY"
+        nextcloud-occ config:app:set whiteboard jwt_secret_key --value="$JWT_SECRET_KEY"
       '';
       serviceConfig = {
         Type = "oneshot";

common/shell.nix

@@ -6,14 +6,11 @@
 # - add some handy shell commands
 
 {
-  environment.systemPackages = with pkgs; [
-    comma
-  ];
-
   # nix-index
   programs.nix-index.enable = true;
   programs.nix-index.enableFishIntegration = true;
   programs.command-not-found.enable = false;
+  programs.nix-index-database.comma.enable = true;
 
   programs.fish = {
     enable = true;
@@ -35,21 +32,4 @@
 
     llsblk = "lsblk -o +uuid,fsType";
   };
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      # comma uses the "nix-index" package built into nixpkgs by default.
-      # That package doesn't use the prebuilt nix-index database so it needs to be changed.
-      comma = prev.comma.overrideAttrs (old: {
-        nativeBuildInputs = old.nativeBuildInputs ++ [
-          prev.makeWrapper
-        ];
-        postInstall = ''
-          wrapProgram $out/bin/comma \
-            --prefix PATH : ${lib.makeBinPath [ prev.fzy config.programs.nix-index.package ]}
-          ln -s $out/bin/comma $out/bin/,
-        '';
-      });
-    })
-  ];
 }

flake.nix

@@ -89,7 +89,7 @@
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
-            nix-index-database.nixosModules.nix-index
+            nix-index-database.nixosModules.default
             home-manager.nixosModules.home-manager
             self.nixosModules.kernel-modules
             ({ lib, ... }: {
@@ -145,11 +145,15 @@
           machineHosts;
 
       packages =
+        with inputs;
         let
-          mkEphemeral = system: format: inputs.nixos-generators.nixosGenerate {
+          mkEphemeral = system: format: nixos-generators.nixosGenerate {
             inherit system;
             inherit format;
-            modules = [ ./machines/ephemeral/minimal.nix ];
+            modules = [
+              ./machines/ephemeral/minimal.nix
+              nix-index-database.nixosModules.default
+            ];
           };
         in
         {

machines/ephemeral/minimal.nix

@@ -5,6 +5,8 @@
     (modulesPath + "/installer/cd-dvd/channel.nix")
     ../../common/machine-info
     ../../common/ssh.nix
+    ../../common/flakes.nix
+    ../../common/shell.nix
   ];
 
   boot.initrd.availableKernelModules = [
@@ -36,6 +38,7 @@
     git-lfs
     wget
     htop
+    btop
     dnsutils
     pciutils
     usbutils
@@ -54,5 +57,7 @@
     };
   };
 
+  nix.flakes.enable = true;
+
   users.users.root.openssh.authorizedKeys.keys = config.machines.ssh.userKeys;
 }