fix concat

flake.nix

@@ -156,21 +156,12 @@
         hostname = "slab";
         stateVersion = "23.11";
       };
-      nullbox = lib.nixosSystem rec {
+
+      nullbox = mkSystem {
         system = "x86_64-linux";
-        modules = [
+        hostname = "nullbox";
-          ./hosts/nullbox/configuration.nix
-          ./system/remote.nix
-          ./system/plasma.nix
-          ./system/fragments/hardware/nvidia-modeset.nix
-          ./system/gaming.nix
-          (homeManagerInit {
-            module = import ./hosts/nullbox/home.nix;
-            inherit system;
         stateVersion = "23.11";
-          })
-        ];
       };
-    };
+    }; # end nixosConfigurations
-  };
+  }; # end outputs
-}
+} # end flake

hosts/nullbox/configuration.nix

@@ -7,15 +7,25 @@
 
 {
 
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  config = {
+
     fileSystems."/ntfs" = {
       fsType = "ntfs-3g";
       device = "/dev/disk/by-uuid/6AC23F0FC23EDF4F";
     };
 
-  imports =
+    # nixfiles
-    [ # Include the results of the hardware scan.
+    nixfiles = {
-      ./hardware-configuration.nix
+      common.remoteAccess.enable = true;
-    ];
+      sessions.plasma.enable = true;
+      hardware.nvidia.modesetting.enable = true;
+      packageSets.gaming.enable = true;
+    };
 
     # cryptsetup
     boot.initrd.luks.devices = {
@@ -78,6 +88,7 @@
     # Before changing this value read the documentation for this option
     # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
     system.stateVersion = "23.11"; # Did you read the comment?
+  };
 
 }
 

hosts/nullbox/home.nix

@@ -1,8 +1,11 @@
 { lib, pkgs, osConfig, ... }:
 {
   imports = [
-    ../../home/common.nix
   ];
 
+  config = {
+    nixfiles.profile.base.enable = true;
+    
     home.stateVersion = "23.11";
+  };
 }

hosts/slab/configuration.nix

@@ -24,7 +24,10 @@
   nixfiles = {
     common.remoteAccess.enable = true;
     hardware.opengl.enable = true;
-    packageSets.gaming.enable = true;
+    packageSets = {
+      gaming.enable = true;
+      fun.enable = true;
+    };
     sessions.hyprland.enable = true;
     sessions.plasma.enable = lib.mkDefault false;
   };

system/common/me.nix

@@ -10,7 +10,7 @@ in
   config = lib.mkIf cfg.enable {
     users.users.nullbite = {
       isNormalUser = true;
-      extraGroups = [ "wheel" ];
+      extraGroups = [ "wheel" ] ++ lib.optional config.nixfiles.packageSets.fun.enable "input";
       packages = with pkgs; [
         keychain
       ];

system/default.nix

@@ -10,6 +10,7 @@ in
     ./profile
     ./programs
     ./sessions
+    ./testing
   ];
   config = {};
   options.nixfiles = {

system/package-sets/default.nix

@@ -3,5 +3,6 @@
   imports = [
     ./gaming.nix
     ./multimedia.nix
+    ./fun.nix
   ];
 }

system/package-sets/fun.nix

@@ -0,0 +1,28 @@
+{ pkgs, config, lib, ...}:
+let
+  cfg = config.nixfiles.packageSets.fun;
+in
+{
+  
+  options.nixfiles.packageSets.fun = {
+    enable = lib.mkEnableOption "fun package set";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      cowsay
+      uwufetch
+      fortune
+      pipes
+      hollywood
+      sl
+      figlet
+      aalib
+      asciiquarium
+    ] ++ lib.optionals config.services.xserver.enable [
+      oneko
+    ] ++ lib.optionals config.sound.enable [
+      bucklespring-libinput
+      espeak
+    ];
+  };
+}

system/testing/default.nix

@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./mutability.nix
+  ];
+}

system/testing/mutability.nix

@@ -0,0 +1,22 @@
+{ lib, pkgs, config, ... }:
+let
+  cfg = config.nixfiles.testing.mutability;
+  file = pkgs.writeTextFile {
+    name = "test";
+    text = ''
+      meow!
+    '';
+  };
+in
+{
+  options.nixfiles.testing.mutability = {
+    enable = lib.mkEnableOption "mutability test";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.etc.mutability-test = {
+      mode = "0644";
+      source = file;
+    };
+  };
+}