feat: Move kmscon config to options

components/desktop-environment.nix

@@ -68,7 +68,6 @@ in {
     xsession.numlock.enable = true;
   };
   imports = [
-    ./programs/wireshark.nix
     ../lwad
   ];
   lwad = {

components/programs/kmscon.nix

@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.kmscon = {
-    enable = true;
-    extraConfig = ''
-      xkb-layout=gb
-      xkb-options=caps:escape
-    '';
-    fonts = [{
-      name = "FiraCode Nerd Font";
-      package = (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; });
-    }];
-    hwRender = true;
-  };
-  programs.tmux.extraConfig = ''
-    bind -n m-k run-shell -b "light -A 1"
-    bind -n m-j run-shell -b "light -U 1"
-  '';
-}

lwad/applications/default.nix

@@ -6,6 +6,7 @@
     ./git.nix
     ./i3
     ./imunes.nix
+    ./kmscon.nix
     ./librewolf.nix
     ./neovim
     ./task.nix

lwad/applications/kmscon.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib; {
+  options.lwad.applications.kmscon.enable = mkEnableOption "kmscon";
+  config = mkIf config.lwad.applications.kmscon.enable {
+    services.kmscon = {
+      enable = true;
+      extraConfig = ''
+        xkb-layout=gb
+        xkb-options=caps:escape
+      '';
+      fonts = [{
+        name = "FiraCode Nerd Font";
+        package = (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; });
+      }];
+      hwRender = true;
+    };
+    programs.tmux.extraConfig = mkIf config.lwad.utilities.terminal.enable ''
+      bind -n m-k run-shell -b "light -A 1"
+      bind -n m-j run-shell -b "light -U 1"
+    '';
+  };
+}

ryuko/default.nix

@@ -31,7 +31,6 @@
   };
   imports = [
     ../components/desktop-environment.nix
-    ../components/programs/kmscon.nix
     ../lwad
     ./hardware-configuration.nix
   ];

shinobu/default.nix

@@ -6,8 +6,7 @@
     home.stateVersion = "22.11";
     services.cbatticon.enable = true;
   };
-  imports =
-    [ ./hardware-configuration.nix ../components/programs/kmscon.nix ../lwad ];
+  imports = [ ./hardware-configuration.nix ../lwad ];
   lwad = {
     applications.i3 = {
       audioControls = {