modules (comin): Extract module

Enable if on all servers.
britter · Jun 24, 2024 · ae1dea5 · ae1dea5
1 parent 8544803
commit ae1dea5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 40 deletions.
diff --git a/modules/nixos/comin/default.nix b/modules/nixos/comin/default.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  inputs,
+  ...
+}: let
+  cfg = config.my.modules.comin;
+in {
+  imports = [
+    inputs.comin.nixosModules.comin
+  ];
+
+  options.my.modules.comin = {
+    enable = lib.mkEnableOption "comin";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.comin = {
+      enable = true;
+      remotes = [
+        {
+          name = "origin";
+          url = "https://github.com/britter/nix-configuration.git";
+        }
+      ];
+    };
+  };
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
@@ -5,6 +5,7 @@ in {
     ../common
     ./1password
     ./adguard
+    ./comin
     ./disko
     ./fonts
     ./gaming
@@ -29,6 +30,7 @@ in {
       gaming.enable = cfg.role == "desktop" && (builtins.elem "private" cfg.profiles);
 
       # enabled only on servers
+      comin.enable = cfg.role == "server";
       ssh-access.enable = cfg.role == "server";
 
       # enabled on all machines by default

diff --git a/systems/aarch64-linux/raspberry-pi/configuration.nix b/systems/aarch64-linux/raspberry-pi/configuration.nix
@@ -3,7 +3,6 @@
     ../../../modules/nixos
     ./hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.raspberry-pi-4
-    inputs.comin.nixosModules.comin
   ];
 
   my = {
@@ -25,16 +24,6 @@
     generic-extlinux-compatible.enable = true;
   };
 
-  services.comin = {
-    enable = true;
-    remotes = [
-      {
-        name = "origin";
-        url = "https://github.com/britter/nix-configuration.git";
-      }
-    ];
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave

diff --git a/systems/x86_64-linux/cyberoffice/configuration.nix b/systems/x86_64-linux/cyberoffice/configuration.nix
@@ -7,7 +7,6 @@
   imports = [
     ../../../modules/nixos
     inputs.sops-nix.nixosModules.sops
-    inputs.comin.nixosModules.comin
   ];
 
   my = {
@@ -76,17 +75,6 @@
     extraAppsEnable = true;
   };
 
-  # TODO extract this into a server module
-  services.comin = {
-    enable = true;
-    remotes = [
-      {
-        name = "origin";
-        url = "https://github.com/britter/nix-configuration.git";
-      }
-    ];
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

diff --git a/systems/x86_64-linux/watchtower/configuration.nix b/systems/x86_64-linux/watchtower/configuration.nix
@@ -1,11 +1,6 @@
-{
-  config,
-  inputs,
-  ...
-}: {
+{config, ...}: {
   imports = [
     ../../../modules/nixos
-    inputs.comin.nixosModules.comin
   ];
 
   my = {
@@ -49,17 +44,6 @@
     };
   };
 
-  # TODO extract this into a server module
-  services.comin = {
-    enable = true;
-    remotes = [
-      {
-        name = "origin";
-        url = "https://github.com/britter/nix-configuration.git";
-      }
-    ];
-  };
-
   services.nginx = {
     enable = true;
     virtualHosts."grafana.ritter.family" = {