flake.nix

@@ -156,12 +156,21 @@
         hostname = "slab";
         stateVersion = "23.11";
       };
-
+      nullbox = lib.nixosSystem rec {
-      nullbox = mkSystem {
         system = "x86_64-linux";
-        hostname = "nullbox";
+        modules = [
-        stateVersion = "23.11";
+          ./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,88 +7,77 @@
 
 {
 
+  fileSystems."/ntfs" = {
+    fsType = "ntfs-3g";
+    device = "/dev/disk/by-uuid/6AC23F0FC23EDF4F";
+  };
+
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
-  config = {
+  # cryptsetup
-
+  boot.initrd.luks.devices = {
-    fileSystems."/ntfs" = {
+    lvmroot = {
-      fsType = "ntfs-3g";
+      device="/dev/disk/by-uuid/85b5f22e-0fa5-4f0d-8fba-f800a0b41671";
-      device = "/dev/disk/by-uuid/6AC23F0FC23EDF4F";
+      allowDiscards = true;
+      fallbackToPassword = true;
+      preLVM = true;
     };
-
-    # nixfiles
-    nixfiles = {
-      common.remoteAccess.enable = true;
-      sessions.plasma.enable = true;
-      hardware.nvidia.modesetting.enable = true;
-      packageSets.gaming.enable = true;
-    };
-
-    # cryptsetup
-    boot.initrd.luks.devices = {
-      lvmroot = {
-        device="/dev/disk/by-uuid/85b5f22e-0fa5-4f0d-8fba-f800a0b41671";
-        allowDiscards = true;
-        fallbackToPassword = true;
-        preLVM = true;
-      };
-    };
-
-    # bootloader setup
-    boot.loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      # grub = {
-      #   enable = true;
-      #   efiSupport = true;
-      #   device = "nodev";
-      # };
-      systemd-boot = {
-        enable = true;
-        netbootxyz.enable = true;
-        memtest86.enable = true;
-      };
-    };
-
-    networking.wg-quick.interfaces.wg0 = {
-      configFile = "/etc/wireguard/wg0.conf";
-      autostart = true;
-    };
-
-    # Use the systemd-boot EFI boot loader.
-    # boot.loader.systemd-boot.enable = true;
-    # boot.loader.efi.canTouchEfiVariables = true;
-    # see custom-hardware-configuration.nix
-
-
-    # networking.hostName = "nixos"; # Define your hostname.
-    networking.hostName = "nullbox";
-    # Pick only one of the below networking options.
-    # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-    # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-    # Set your time zone.
-     time.timeZone = "America/New_York";
-
-
-    # Copy the NixOS configuration file and link it from the resulting system
-    # (/run/current-system/configuration.nix). This is useful in case you
-    # accidentally delete configuration.nix.
-    # system.copySystemConfiguration = true;
-
-    # This value determines the NixOS release from which the default
-    # settings for stateful data, like file locations and database versions
-    # on your system were taken. It's perfectly fine and recommended to leave
-    # this value at the release version of the first install of this system.
-    # 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?
   };
 
+  # bootloader setup
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
+    };
+    # grub = {
+    #   enable = true;
+    #   efiSupport = true;
+    #   device = "nodev";
+    # };
+    systemd-boot = {
+      enable = true;
+      netbootxyz.enable = true;
+      memtest86.enable = true;
+    };
+  };
+
+  networking.wg-quick.interfaces.wg0 = {
+    configFile = "/etc/wireguard/wg0.conf";
+    autostart = true;
+  };
+
+  # Use the systemd-boot EFI boot loader.
+  # boot.loader.systemd-boot.enable = true;
+  # boot.loader.efi.canTouchEfiVariables = true;
+  # see custom-hardware-configuration.nix
+
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "nullbox";
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  # Set your time zone.
+   time.timeZone = "America/New_York";
+
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It's perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # 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,11 +1,8 @@
 { lib, pkgs, osConfig, ... }:
 {
   imports = [
+    ../../home/common.nix
   ];
   
-  config = {
+  home.stateVersion = "23.11";
-    nixfiles.profile.base.enable = true;
-    
-    home.stateVersion = "23.11";
-  };
 }

hosts/slab/configuration.nix

@@ -24,10 +24,7 @@
   nixfiles = {
     common.remoteAccess.enable = true;
     hardware.opengl.enable = true;
-    packageSets = {
+    packageSets.gaming.enable = true;
-      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" ] ++ lib.optional config.nixfiles.packageSets.fun.enable "input";
+      extraGroups = [ "wheel" ];
       packages = with pkgs; [
         keychain
       ];

system/default.nix

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

system/package-sets/default.nix

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

system/package-sets/fun.nix

@@ -1,28 +0,0 @@
-{ 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

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

system/testing/mutability.nix

@@ -1,22 +0,0 @@
-{ 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;
-    };
-  };
-}