properly import with correct optionals

modules/containers/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: lib.mkIf(config.withContainers) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withContainers {
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;

modules/default.nix

@@ -1,6 +1,5 @@
 { inputs, pkgs, lib, ... }: {
   imports = [
-    ./colors.nix
     ./containers
     ./games
     ./gnome

modules/games/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: lib.mkIf (config.withGames) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withGames {
   programs.steam.enable = true;
   programs.gamescope.enable = true;
   programs.gamemode.enable = true;

modules/gnome/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }: lib.mkIf (config.withGnome) {
+{ lib, config, ... }: lib.mkIf config.withGnome {
   services.xserver = {
     enable = true;
     desktopManager.gnome.enable = true;

modules/niri/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: lib.mkIf (config.withNiri) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withNiri {
   programs.niri.enable = true;
 
   home-manager.users.twoneis = {

modules/user/default.nix

@@ -1,9 +1,11 @@
-{ lib, config, ... }: lib.mkIf (config.user) {
+{ lib, config, ... }: {
   imports = [
     ./programs.nix
     ./themes.nix
   ];
 
+  config = lib.mkIf config.user{
+
     # Audio
     security.rtkit.enable = true;
 
@@ -28,4 +30,5 @@
     };
 
     services.blueman.enable = true;
+  };
 }

modules/user/firefox.nix

@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  home-manager.users.twnoneis = {
+{ lib, config, pkgs, ... }: lib.mkIf config.user {
+  home-manager.users.twoneis = {
     programs.firefox = {
       enable = true;
       profiles = {

modules/user/programs.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: {
   imports = [
     ./firefox.nix
   ];
 
+  config = lib.mkIf config.user {
     networking.firewall.allowedTCPPorts = [
       57621 # spotifyd
     ];
@@ -67,4 +68,5 @@
         settings = import ./alacritty.conf.nix;
       };
     };
+  };
 }

modules/utils/default.nix

@@ -17,7 +17,7 @@
 
     home.file = {
       ".gdbinit" = {
-        source = ./gdbinit;
+        source = ./gdbinit.conf;
       };
     };
 

modules/vm/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }: lib.mkIf (config.withVM) {
+{ lib, config, ... }: lib.mkIf config.withVM {
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
   users.users.twoneis.extraGroups = [ "libvirtd" ];

outputs.nix

@@ -12,6 +12,7 @@
         ./devices/ellaca
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];
@@ -30,6 +31,7 @@
         ./devices/pleniscenta
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];
@@ -47,6 +49,7 @@
         ./devices/inkvine
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];