More opt

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,12 +1,16 @@
-{ ... }: {
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 8;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
+{ lib, config, ... }:
+let isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+in {
+  config = lib.mkIf (!isCI) {
+    boot.loader = {
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 8;
+      };
+      efi = {
+        canTouchEfiVariables = true;
+        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,19 +1,21 @@
-{ config, ... }: {
-  networking.wireguard = {
-    enable = true;
-    interfaces = {
-      wg0 = {
-        ips = [ config.syscfg.net.wg.ip4 config.syscfg.net.wg.ip6 ];
-        privateKeyFile =
-          config.sops.secrets."${config.syscfg.hostname}_wg_priv".path;
-        listenPort = 1515;
-        mtu = 1340;
-        peers = [{
-          allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
-          endpoint = "vpn.helcel.net:1515";
-          publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
-          persistentKeepalive = 30;
-        }];
+{ config, lib, ... }: {
+  config = lib.mkIf (config.syscfg.net.wg.enable) {
+    networking.wireguard = {
+      enable = true;
+      interfaces = {
+        wg0 = {
+          ips = [ config.syscfg.net.wg.ip4 config.syscfg.net.wg.ip6 ];
+          privateKeyFile =
+            config.sops.secrets."${config.syscfg.hostname}_wg_priv".path;
+          listenPort = 1515;
+          mtu = 1340;
+          peers = [{
+            allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
+            endpoint = "vpn.helcel.net:1515";
+            publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
+            persistentKeepalive = 30;
+          }];
+        };
       };
     };
   };

modules/nixos/system/xdg/default.nix

@@ -1,14 +1,14 @@
 { config, lib, pkgs, ... }: {
 
-    xdg.portal = {
-      enable = true;
-      # wlr.enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-hyprland
-        xdg-desktop-portal-gtk
-      ];
-      config.common.default = [ "hyprland" "gtk" ];
-    };
+  xdg.portal = {
+    enable = true;
+    # wlr.enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-hyprland
+      xdg-desktop-portal-gtk
+    ];
+    config.common.default = [ "hyprland" "gtk" ];
+  };
 
   environment.sessionVariables = rec {
     GBM_BACKEND = "amd-drm";

modules/nixos/tools/debug/default.nix

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