From 7050d5c2a8d20cdae002b81af578dc8b15f079fd Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Thu, 29 May 2025 22:27:09 -0700 Subject: [PATCH] minor spacing changes --- provision/modules/base/physical.nix | 1 + provision/modules/desktop/default.nix | 1 + provision/modules/desktop/gnome.nix | 2 +- provision/modules/devel/engineering.nix | 1 + provision/modules/devel/notes.nix | 1 + provision/modules/devel/programming.nix | 1 + provision/modules/gaming/emulation.nix | 1 + provision/modules/gaming/minecraft.nix | 1 + provision/modules/gaming/pc.nix | 1 + provision/modules/services/samba-client.nix | 2 +- provision/modules/services/ssh.nix | 1 + 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/provision/modules/base/physical.nix b/provision/modules/base/physical.nix index fbad4166..2352d638 100644 --- a/provision/modules/base/physical.nix +++ b/provision/modules/base/physical.nix @@ -3,6 +3,7 @@ let cfg = config.modules.physical; in { options.modules.physical.enable = lib.mkEnableOption "physical"; + config = lib.mkIf cfg.enable { # use the systemd-boot EFI boot loader boot.loader.systemd-boot.enable = true; diff --git a/provision/modules/desktop/default.nix b/provision/modules/desktop/default.nix index 3d07d563..5eee054e 100644 --- a/provision/modules/desktop/default.nix +++ b/provision/modules/desktop/default.nix @@ -10,6 +10,7 @@ in { ]; options.modules.desktop.enable = lib.mkEnableOption "desktop"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ bc # Arbitrary-precision arithmetic language diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index c6686b49..9d038bd8 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -16,8 +16,8 @@ let "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/${name}") binds; in { - options.modules.desktop.gnome.enable = lib.mkEnableOption "gnome"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ dconf-editor # Graphical tool for editing settings stored in the dconf database of GNOME diff --git a/provision/modules/devel/engineering.nix b/provision/modules/devel/engineering.nix index dc3e0390..7fe36a01 100644 --- a/provision/modules/devel/engineering.nix +++ b/provision/modules/devel/engineering.nix @@ -3,6 +3,7 @@ let cfg = config.modules.devel.engineering; in { options.modules.devel.engineering.enable = lib.mkEnableOption "engineering"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ blender # Open-source 3D creation suite for modeling, animation, rendering, and more diff --git a/provision/modules/devel/notes.nix b/provision/modules/devel/notes.nix index 38d7b94e..f0791a43 100644 --- a/provision/modules/devel/notes.nix +++ b/provision/modules/devel/notes.nix @@ -3,6 +3,7 @@ let cfg = config.modules.devel.notes; in { options.modules.devel.notes.enable = lib.mkEnableOption "notes"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ obsidian # Note-taking and knowledge management application diff --git a/provision/modules/devel/programming.nix b/provision/modules/devel/programming.nix index 3ca48281..cc702807 100644 --- a/provision/modules/devel/programming.nix +++ b/provision/modules/devel/programming.nix @@ -3,6 +3,7 @@ let cfg = config.modules.devel.programming; in { options.modules.devel.programming.enable = lib.mkEnableOption "programming"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ nodejs # JavaScript runtime built on Chrome's V8 JavaScript engine diff --git a/provision/modules/gaming/emulation.nix b/provision/modules/gaming/emulation.nix index e6b2c5fa..964628ae 100644 --- a/provision/modules/gaming/emulation.nix +++ b/provision/modules/gaming/emulation.nix @@ -10,6 +10,7 @@ let cfg = config.modules.gaming.emulation; ])); in { options.modules.gaming.emulation.enable = lib.mkEnableOption "emulation"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ ryubing diff --git a/provision/modules/gaming/minecraft.nix b/provision/modules/gaming/minecraft.nix index 43c3d8b6..646db01e 100644 --- a/provision/modules/gaming/minecraft.nix +++ b/provision/modules/gaming/minecraft.nix @@ -3,6 +3,7 @@ let cfg = config.modules.gaming.minecraft; in { options.modules.gaming.minecraft.enable = lib.mkEnableOption "minecraft"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ jdk17 # Java Development Kit (JDK) version 17 diff --git a/provision/modules/gaming/pc.nix b/provision/modules/gaming/pc.nix index a390e8be..7a68bcc2 100644 --- a/provision/modules/gaming/pc.nix +++ b/provision/modules/gaming/pc.nix @@ -3,6 +3,7 @@ let cfg = config.modules.gaming.pc; in { options.modules.gaming.pc.enable = lib.mkEnableOption "pc"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ gamescope # Utility for running games using Valve's Steam Play compatibility layer with improved performance and compatibility diff --git a/provision/modules/services/samba-client.nix b/provision/modules/services/samba-client.nix index c621b10f..aa8b8031 100644 --- a/provision/modules/services/samba-client.nix +++ b/provision/modules/services/samba-client.nix @@ -3,11 +3,11 @@ let cfg = config.modules.services.samba-client; in { options.modules.services.samba-client.enable = lib.mkEnableOption "samba-client"; + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ cifs-utils # Utilities for mounting and managing CIFS (Common Internet File System) shares ]; - networking.firewall.allowedTCPPorts = [ 445 139 ]; networking.firewall.allowedUDPPorts = [ 137 138 ]; }; diff --git a/provision/modules/services/ssh.nix b/provision/modules/services/ssh.nix index 79dd1a69..abdf6f0e 100644 --- a/provision/modules/services/ssh.nix +++ b/provision/modules/services/ssh.nix @@ -3,6 +3,7 @@ let cfg = config.modules.services.ssh; in { options.modules.services.ssh.enable = lib.mkEnableOption "ssh"; + config = lib.mkIf cfg.enable { services.openssh.enable = true; services.pcscd.enable = true;