From ecf1b0692f2c72d829931f3795fab3149fe32c5f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 6 Mar 2024 18:06:25 -0600 Subject: [PATCH] refactor: Make a comin module --- hosts/framework/default.nix | 1 + hosts/home.nix | 17 ----------------- hosts/meshify/default.nix | 1 + hosts/nuc/default.nix | 1 + hosts/unas/default.nix | 1 + modules/services/comin.nix | 30 ++++++++++++++++++++++++++++++ 6 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 modules/services/comin.nix diff --git a/hosts/framework/default.nix b/hosts/framework/default.nix index 34873bbf..67a5b26b 100644 --- a/hosts/framework/default.nix +++ b/hosts/framework/default.nix @@ -84,6 +84,7 @@ }; services = { + comin.enable = true; docker.enable = true; ssh.enable = true; syncthing.enable = true; diff --git a/hosts/home.nix b/hosts/home.nix index 7946af79..5d02d1e2 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -33,21 +33,4 @@ with lib; { # So the bitwarden CLI knows where to find my server. modules.shell.bitwarden.config.server = "bitwarden.com"; - - imports = [inputs.comin.nixosModules.comin]; - - services.comin = { - enable = true; - remotes = [ - { - name = "local"; - url = "/home/emiller/.config/dotfiles/"; - } - - { - name = "origin"; - url = "https://github.com/edmundmiller/dotfiles"; - } - ]; - }; } diff --git a/hosts/meshify/default.nix b/hosts/meshify/default.nix index f2a85483..c09f56ed 100644 --- a/hosts/meshify/default.nix +++ b/hosts/meshify/default.nix @@ -77,6 +77,7 @@ }; services = { + comin.enable = true; docker.enable = true; keybase.enable = true; mpd.enable = true; diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix index c7c13b9a..a93b8385 100644 --- a/hosts/nuc/default.nix +++ b/hosts/nuc/default.nix @@ -27,6 +27,7 @@ }; services = { audiobookshelf.enable = true; + comin.enable = true; docker.enable = true; hass.enable = true; jellyfin.enable = true; diff --git a/hosts/unas/default.nix b/hosts/unas/default.nix index ef984cb0..8c8ac5b2 100644 --- a/hosts/unas/default.nix +++ b/hosts/unas/default.nix @@ -29,6 +29,7 @@ zsh.enable = true; }; services = { + comin.enable = true; docker.enable = true; ssh.enable = true; syncthing.enable = true; diff --git a/modules/services/comin.nix b/modules/services/comin.nix new file mode 100644 index 00000000..db60d6e6 --- /dev/null +++ b/modules/services/comin.nix @@ -0,0 +1,30 @@ +{ + config, + inputs, + lib, + ... +}: +with lib; +with lib.my; let + cfg = config.modules.services.comin; +in { + options.modules.services.comin = {enable = mkBoolOpt false;}; + + imports = [inputs.comin.nixosModules.comin]; + config = mkIf cfg.enable { + services.comin = { + enable = true; + remotes = [ + { + name = "local"; + url = "/home/emiller/.config/dotfiles/"; + } + + { + name = "origin"; + url = "https://github.com/edmundmiller/dotfiles"; + } + ]; + }; + }; +}