More opt

modules/home/wayland/apps/kanshi/default.nix

@@ -1,4 +1,4 @@
-{ config, lib,... }: {
+{ config, lib, ... }: {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
     services.kanshi = {
@@ -91,5 +91,5 @@
         };
       };
     };
-};
+  };
 }

modules/nixos/gui/greet/default.nix

@@ -1,5 +1,4 @@
-{ lib, config, pkgs, ... }:
-{
+{ lib, config, pkgs, ... }: {
   config = lib.mkIf (config.syscfg.make.gui) {
 
     services.greetd = {

modules/nixos/system/hw/boot/default.nix

@@ -1,4 +1,7 @@
-{ ... }: {
+{ lib, config, ... }:
+let isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+in {
+  config = lib.mkIf (!isCI) {
     boot.loader = {
       systemd-boot = {
         enable = true;
@@ -9,4 +12,5 @@
         efiSysMountPoint = "/boot/efi";
       };
     };
+  };
 }

modules/nixos/system/hw/power/default.nix

@@ -1,7 +1,5 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.syscfg.make.power;
-in {
-  config = lib.mkIf cfg {
+{ lib, config, pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.make.power) {
     services.tlp = {
       enable = true;
       settings = {

modules/nixos/system/hw/virt/default.nix

@@ -1,11 +1,9 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.syscfg.make.virt;
-in {
-  config = lib.mkIf cfg {
+{ lib, config, pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.make.virt) {
 
-    environment.systemPackages = [ pkgs.qemu ];
+    #environment.systemPackages = [ pkgs.qemu ];
     virtualisation = {
-      libvirtd.enable = true;
+      #libvirtd.enable = true;
       # waydroid.enable = true;
       # lxd.enable = true;
       docker = {

modules/nixos/system/network/wifi/default.nix

@@ -1,9 +1,7 @@
-{ lib, config, ... }:
-let cfg = config.syscfg.net.wlp;
-in {
-  config = lib.mkIf cfg.enable {
+{ lib, config, ... }: {
+  config = lib.mkIf (config.syscfg.net.wlp.enable) {
     networking.supplicant = {
-      "${cfg.nif}" = {
+      "${config.syscfg.net.wlp.nif}" = {
         configFile.path = config.sops.secrets.wifi.path;
         extraConf = ''
           network={

modules/nixos/system/network/wireguard/default.nix

@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, lib, ... }: {
+  config = lib.mkIf (config.syscfg.net.wg.enable) {
     networking.wireguard = {
       enable = true;
       interfaces = {
@@ -17,4 +18,5 @@
         };
       };
     };
+  };
 }

modules/nixos/tools/debug/default.nix

@@ -1,6 +1,9 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, lib, ... }: {
+
+  config = lib.mkIf (config.syscfg.make.develop) {
     programs.adb.enable = true;
     programs.wireshark.enable = true;
 
     environment.systemPackages = with pkgs; [ wget dconf wireshark ];
+  };
 }

modules/shared/syscfg/default.nix

@@ -3,7 +3,7 @@ let
   userOpt = with lib; {
     username = mkOption { type = types.str; };
     wm = mkOption {
-      type = types.enum [ "Wayland" "X11" "-"];
+      type = types.enum [ "Wayland" "X11" "-" ];
       default = "-";
     };
     git = {