refactor config out of modules/options.nix

4 files changed, 27 insertions, 23 deletions

diff --git a/home/default.nix b/home/default.nix
index b580605..30e985c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -20,9 +20,20 @@ in {
     ./starship.nix
   ];
 
+  # use system packages in home manager
+  home-manager.useGlobalPkgs = true;
+
+  # install user packages to /etc/profiles and not home directory
+  home-manager.useUserPackages = true;
+
+  home-manager.users.root = {
+    home.stateVersion = config.stateVersion;
+  };
+
   home-manager.users.${config.user} = {
     home.username = config.user;
     home.homeDirectory = config.homePath;
+    home.stateVersion = config.stateVersion;
 
     news.display = "silent";
     fonts.fontconfig.enable = true;
diff --git a/modules/options.nix b/modules/options.nix
index bfc61e3..0c7b78f 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -387,23 +387,4 @@ in {
       default = [];
     };
   };
-
-  config = {
-    # allow flakes
-    nix.settings.experimental-features = ["nix-command" "flakes"];
-
-    # use system packages in home manager
-    home-manager.useGlobalPkgs = true;
-
-    # install user packages to /etc/profiles and not home directory
-    home-manager.useUserPackages = true;
-
-    # allow unfree packages
-    nixpkgs.config.allowUnfree = true;
-
-    # set state version
-    home-manager.users.${config.user}.home.stateVersion = config.stateVersion;
-    home-manager.users.root.home.stateVersion = config.stateVersion;
-    system.stateVersion = config.stateVersion;
-  };
 }
diff --git a/pkgs/unofficial-homestuck-collection/default.nix b/pkgs/unofficial-homestuck-collection/default.nix
index ec09b2b..0fdf05e 100644
--- a/pkgs/unofficial-homestuck-collection/default.nix
+++ b/pkgs/unofficial-homestuck-collection/default.nix
@@ -94,10 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags --no-sandbox \
       --set LD_LIBRARY_PATH "${
-        lib.makeLibraryPath [
-          libglvnd
-        ]
-      }" \
+      lib.makeLibraryPath [
+        libglvnd
+      ]
+    }" \
       --inherit-argv0
 
     runHook postInstall
diff --git a/system/default.nix b/system/default.nix
index f12cf70..2d043c7 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -14,6 +14,18 @@
     ./sshd.nix
   ];
 
+  # allow flakes
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # set state version
+  system.stateVersion = config.stateVersion;
+
+  # enable nixos-rebuild-ng
+  system.rebuild.enableNg = true;
+
   # hostname
   networking.hostName = config.hostName;