Extract Docker and screenkey modules

nix/hosts/lemp11/default.nix

@@ -1,5 +1,9 @@
 {
   features = {
+    cli = {
+      docker.enable = true;
+    };
+
     desktop = {
       gaming.enable = true;
 

nix/modules/nixos/default.nix

@@ -1,7 +1,8 @@
 {
   imports = [
     ./autorandr.nix
-    ./docker.nix
+    ./features/cli
+    ./features/desktop
     ./features/gaming.nix
     ./features/homelab
     ./fonts.nix
@@ -9,7 +10,6 @@
     ./kanata.nix
     ./rofi.nix
     ./rsnapshot.nix
-    ./screenkey.nix
     ./xbanish.nix
   ];
 }

nix/modules/nixos/docker.nix

@@ -1,10 +0,0 @@
-{
-  virtualisation.docker = {
-    enable = true;
-
-    autoPrune = {
-      enable = true;
-      dates = "weekly";
-    };
-  };
-}

nix/modules/nixos/features/cli/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./docker.nix
+  ];
+}

nix/modules/nixos/features/cli/docker.nix

@@ -0,0 +1,16 @@
+{ lib, config, ... }:
+
+{
+  options.features.cli.docker.enable = lib.mkEnableOption "Enable Docker";
+
+  config = lib.mkIf config.features.cli.docker.enable {
+    virtualisation.docker = {
+      enable = true;
+
+      autoPrune = {
+        enable = true;
+        dates = "weekly";
+      };
+    };
+  };
+}

nix/modules/nixos/features/desktop/default.nix

@@ -0,0 +1,3 @@
+{
+  imports = [ ./screenkey.nix ];
+}

nix/modules/nixos/features/desktop/screenkey.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+
+{
+  options.features.desktop.screenkey.enable = lib.mkEnableOption "Enable screenkey";
+
+  config = lib.mkIf config.features.desktop.screenkey.enable {
+    environment.systemPackages = with pkgs; [ screenkey ];
+
+    home-manager.users.${username}.xdg.configFile."screenkey.json".text = builtins.toJSON {
+      key_mode = "composed";
+      mods_mode = "emacs";
+      persist = true;
+      size = "small";
+      timeout = 0.25;
+    };
+  };
+}

nix/modules/nixos/screenkey.nix

@@ -1,13 +0,0 @@
-{ pkgs, username, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ screenkey ];
-
-  home-manager.users.${username}.xdg.configFile."screenkey.json".text = builtins.toJSON {
-    key_mode = "composed";
-    mods_mode = "emacs";
-    persist = true;
-    size = "small";
-    timeout = 0.25;
-  };
-}