feat: add 'taskopen' to 'taskwarrior' module

home/hosts/andromache/default.nix

@@ -11,11 +11,11 @@ let
 in
 {
   imports = [
+    ../../modules/cloud
+    ../../modules/comms
     ../../modules/desktop/niri
-
     ../../modules/3d
-    ../../modules/git.nix
-    # ../../modules/hetzner.nix
+    ../../modules/git
     ../../modules/k9s.nix
     ../../modules/kitty.nix
     ../../modules/ssh.nix
@@ -37,6 +37,9 @@ in
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
   browser.primary = "librewolf";
+  cloud.hetzner.enable = true;
+  comms.signal.enable = true;
+  github.enable = true;
 
   shell.bash = {
     enable = true;

home/hosts/astyanax/default.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   pkgs,
   ...
@@ -12,9 +11,10 @@ in
   imports = [
     ../../modules/ai-tools.nix
     ../../modules/anki.nix
+    ../../modules/cloud
+    ../../modules/comms
     ../../modules/desktop/niri
-    ../../modules/git.nix
-    # ../../modules/hetzner.nix
+    ../../modules/git
     ../../modules/k9s.nix
     ../../modules/kitty.nix
     ../../modules/ssh.nix
@@ -34,6 +34,9 @@ in
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
   browser.primary = "librewolf";
+  cloud.hetzner.enable = true;
+  comms.signal.enable = true;
+  github.enable = true;
 
   shell.bash = {
     enable = true;

home/hosts/packages.nix

@@ -22,7 +22,6 @@ with pkgs;
   pnpm
   python3
   ripgrep
-  signal-desktop
   silver-searcher
   sops
   sshfs

home/hosts/work/default.nix

@@ -12,8 +12,10 @@ in
   imports = [
     inputs.sops-nix.homeManagerModules.sops
     ../../modules/ai-tools.nix
+    ../../modules/cloud
+    ../../modules/comms
     ../../modules/dconf.nix
-    ../../modules/git.nix
+    ../../modules/git
     ../../modules/k9s.nix
     ../../modules/keepassxc.nix
     ../../modules/kitty.nix
@@ -59,6 +61,11 @@ in
 
   browser.primary = "firefox";
   browser.secondary = "chromium";
+  cloud.azure.enable = true;
+  comms.signal.enable = true;
+  comms.teams.enable = true;
+  github.enable = true;
+  gitlab.enable = true;
 
   shell.bash.enable = true;
   starship.enable = true;

home/modules/cloud/azure.nix

@@ -0,0 +1,12 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkIf config.cloud.azure.enable {
+    home.packages = with pkgs; [ azure-cli ];
+  };
+}

home/modules/cloud/default.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+{
+  options.cloud = {
+    azure = {
+      enable = lib.mkEnableOption "azure CLI";
+    };
+    hetzner = {
+      enable = lib.mkEnableOption "hetzner CLI";
+    };
+  };
+
+  imports = [
+    ./azure.nix
+    ./hetzner.nix
+  ];
+}

home/modules/cloud/hetzner.nix

@@ -1,5 +1,7 @@
 {
+  config,
   lib,
+  pkgs,
   osConfig ? null,
   ...
 }:
@@ -8,9 +10,12 @@ let
   isNixOS = osConfig != null;
 in
 {
-  config = {
+  config = lib.mkIf config.cloud.hetzner.enable {
     warnings =
       lib.optional (!isNixOS)
         "hcloud module requires NixOS host configuration. This module will not work with standalone home-manager.";
+    home = {
+      packages = with pkgs; [ hcloud ];
+    };
   };
 }

home/modules/comms/default.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+{
+  options.comms = {
+    signal = {
+      enable = lib.mkEnableOption "signal";
+    };
+    teams = {
+      enable = lib.mkEnableOption "teams";
+    };
+  };
+
+  imports = [
+    ./signal.nix
+    ./teams.nix
+  ];
+}

home/modules/comms/signal.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config = lib.mkIf config.comms.signal.enable {
+    home.packages = with pkgs; [
+      (if config.lib ? nixGL then config.lib.nixGL.wrap signal-desktop else signal-desktop)
+    ];
+  };
+}

home/modules/comms/teams.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkIf config.comms.teams.enable {
+    home.packages = with pkgs; [
+      (if config.lib ? nixGL then config.lib.nixGL.wrap teams-for-linux else teams-for-linux)
+    ];
+  };
+}

home/modules/git.nix

@@ -1,10 +0,0 @@
-{ dotsPath, ... }:
-
-{
-  programs.git.enable = true;
-  home.file = {
-    ".gitconfig".source = dotsPath + "/.gitconfig";
-    ".gitconfig.work".source = dotsPath + "/.gitconfig.work";
-    ".gitignore".source = dotsPath + "/.gitignore";
-  };
-}

home/modules/git/default.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  dotsPath,
+  ...
+}:
+
+{
+  options = {
+    github.enable = lib.mkEnableOption "Github CLI";
+    gitlab.enable = lib.mkEnableOption "Gitlab CLI";
+  };
+
+  config = {
+    programs.git.enable = true;
+    home.file = {
+      ".gitconfig".source = dotsPath + "/.gitconfig";
+      ".gitconfig.work".source = dotsPath + "/.gitconfig.work";
+      ".gitignore".source = dotsPath + "/.gitignore";
+    };
+
+    programs.gh.enable = config.github.enable;
+    home.packages = with pkgs; lib.optionals (config.gitlab.enable) [ glab ];
+  };
+}

home/modules/hetzner/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home = {
-    packages = with pkgs; [ hcloud ];
-  };
-}

home/modules/taskwarrior.nix

@@ -21,6 +21,7 @@ in
 
   home.packages = with pkgs; [
     libnotify
+    taskopen
   ];
 
   home.file = {

hosts/astyanax/default.nix

@@ -33,7 +33,7 @@ in
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    ../../modules/vpn/wireguard.nix
+    # ../../modules/vpn/wireguard.nix
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker
   ];