Make other desktop Home Manager modules togglable

nix/home/opdavies/default.nix

@@ -30,15 +30,6 @@ let
 
   inherit (pkgs) lib;
 
-  desktop-config = import ./desktop.nix {
-    inherit
-      config
-      inputs
-      pkgs
-      username
-      ;
-  };
-
   shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
     inherit
       config
@@ -61,14 +52,7 @@ let
   };
 in
 {
-  imports =
+  imports = [ shared-config ];
-    if desktop then
-      [
-        desktop-config
-        shared-config
-      ]
-    else
-      [ shared-config ];
 
   home.packages =
     shared-packages

nix/home/opdavies/desktop.nix

@@ -1,12 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ../../modules/home-manager/copyq.nix
-    ../../modules/home-manager/bluetuith.nix
-    ../../modules/home-manager/espanso.nix
-    ../../modules/home-manager/gtk.nix
-    ../../modules/home-manager/flameshot.nix
-    ../../modules/home-manager/gtk.nix
-  ];
-}

nix/home/opdavies/hosts/PW05CH3L.nix

@@ -1,5 +1,9 @@
 {
   features = {
+    cli = {
+      direnv.enable = true;
+    };
+
     desktop = {
       alacritty.enable = false;
     };

nix/home/opdavies/hosts/lemp11.nix

@@ -2,7 +2,16 @@
 
 {
   features = {
+    cli = {
+      bluetuith.enable = true;
+      direnv.enable = true;
+    };
+
     desktop = {
+      copyq.enable = true;
+      espanso.enable = true;
+      flameshot.enable = true;
+      gtk.enable = true;
       mpv.enable = true;
     };
   };

nix/hosts/lemp11/configuration.nix

@@ -185,7 +185,6 @@
     ++ pkgs.lib.optionals desktop [
       acpi
       arandr
-      bluetuith
       brightnessctl
       cpufrequtils
       libnotify

nix/modules/home-manager/bluetuith.nix

@@ -1,19 +1,34 @@
 {
-  xdg.configFile."bluetuith/bluetuith.conf" = {
+  config,
-    text = ''
+  lib,
-      {
+  pkgs,
-        adapter: ""
+  ...
-        adapter-states: ""
+}:
-        connect-bdaddr: ""
+
-        gsm-apn: ""
+{
-        gsm-number: ""
+  options.features.cli.bluetuith.enable = lib.mkEnableOption "Enable bluetuith";
-        keybindings: {
+
-          NavigateDown: j
+  config = lib.mkIf config.features.cli.bluetuith.enable {
-          NavigateUp: k
+    home.packages = with pkgs; [
+      bluetuith
+    ];
+
+    xdg.configFile."bluetuith/bluetuith.conf" = {
+      text = ''
+        {
+          adapter: ""
+          adapter-states: ""
+          connect-bdaddr: ""
+          gsm-apn: ""
+          gsm-number: ""
+          keybindings: {
+            NavigateDown: j
+            NavigateUp: k
+          }
+          receive-dir: ""
+          theme: {}
         }
-        receive-dir: ""
+      '';
-        theme: {}
+    };
-      }
-    '';
   };
 }

nix/modules/home-manager/copyq.nix

@@ -1 +1,9 @@
-{ services.copyq.enable = true; }
+{ config, lib, ... }:
+
+{
+  options.features.desktop.copyq.enable = lib.mkEnableOption "Enable copyq";
+
+  config = lib.mkIf config.features.desktop.copyq.enable {
+    services.copyq.enable = true;
+  };
+}

nix/modules/home-manager/default.nix

@@ -20,9 +20,14 @@
     ./alacritty.nix
     ./bat.nix
     ./bin.nix
+    ./bluetuith.nix
+    ./copyq.nix
     ./direnv.nix
+    ./espanso.nix
+    ./flameshot.nix
     ./fzf.nix
     ./git.nix
+    ./gtk.nix
     ./htop.nix
     ./lsd.nix
     ./mpv.nix

nix/modules/home-manager/direnv.nix

@@ -1,7 +1,13 @@
+{ config, lib, ... }:
+
 {
-  programs.direnv = {
+  options.features.cli.direnv.enable = lib.mkEnableOption "Enable direnv";
-    enable = true;
+
-    enableZshIntegration = true;
+  config = lib.mkIf config.features.cli.direnv.enable {
-    nix-direnv.enable = true;
+    programs.direnv = {
+      enable = true;
+      enableZshIntegration = true;
+      nix-direnv.enable = true;
+    };
   };
 }

nix/modules/home-manager/espanso.nix

@@ -1,18 +1,22 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
 {
-  services.espanso = {
+  options.features.desktop.espanso.enable = lib.mkEnableOption "Enable espanso";
-    enable = true;
 
-    configs = {
+  config = lib.mkIf config.features.desktop.espanso.enable {
-      default = {
+    services.espanso = {
-        show_notifications = false;
+      enable = true;
-        toggle_key = "LEFT_ALT";
+
+      configs = {
+        default = {
+          show_notifications = false;
+          toggle_key = "LEFT_ALT";
+        };
       };
-    };
 
-    matches = {
+      matches = {
-      base = import ./espanso/matches/base.nix { inherit lib; };
+        base = import ./espanso/matches/base.nix { inherit lib; };
+      };
     };
   };
 }

nix/modules/home-manager/flameshot.nix

@@ -1,15 +1,25 @@
-{ username, ... }:
 {
-  services.flameshot = {
+  config,
-    enable = true;
+  lib,
+  username,
+  ...
+}:
 
-    settings = {
+{
-      General = {
+  options.features.desktop.flameshot.enable = lib.mkEnableOption "Enable flameshot";
-        disabledTrayIcon = false;
+
-        saveAfterCopy = true;
+  config = lib.mkIf config.features.desktop.flameshot.enable {
-        savePath = "/home/${username}/Pictures/Screenshots";
+    services.flameshot = {
-        showHelp = false;
+      enable = true;
-        uiColor = "#60a5fa";
+
+      settings = {
+        General = {
+          disabledTrayIcon = false;
+          saveAfterCopy = true;
+          savePath = "/home/${username}/Pictures/Screenshots";
+          showHelp = false;
+          uiColor = "#60a5fa";
+        };
       };
     };
   };

nix/modules/home-manager/gtk.nix

@@ -1,11 +1,26 @@
-{ pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  gtk = {
+  options.features.desktop.gtk.enable = lib.mkEnableOption "Enable gtk";
-    enable = true;
+
-    theme.package = pkgs.arc-theme;
+  config = lib.mkIf config.features.desktop.gtk.enable {
-    theme.name = "Arc-Dark";
+    gtk = {
-    iconTheme.package = pkgs.arc-icon-theme;
+      enable = true;
-    iconTheme.name = "Arc";
+
+      theme = {
+        name = "Arc-Dark";
+        package = pkgs.arc-theme;
+      };
+
+      iconTheme = {
+        name = "Arc";
+        package = pkgs.arc-icon-theme;
+      };
+    };
   };
 }