Refactor custom options

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/jupiter/default.nix

@@ -3,14 +3,14 @@
   imports = [
     inputs.disko.nixosModules.disko
     ./format.nix
-
     ./hardware
 
+    ../common/configs/system
+
     ../common/configs/system/boot
     ../common/configs/system/brightnessctl
     ../common/configs/system/btrbk
     ../common/configs/system/btrfs
-    ../common/configs/system/cpu
     ../common/configs/system/documentation
     ../common/configs/system/git
     ../common/configs/system/impermanence

hosts/jupiter/users/nick/default.nix

@@ -7,7 +7,7 @@ let
 in
 {
   imports = [
-    ../../../common/configs/user/options.nix
+    (import ../../../common/configs/user { inherit user home; })
 
     (import ../../../common/configs/user/console/btop { inherit user home; })
     (import ../../../common/configs/user/console/dive { inherit user home; })

hosts/jupiter/users/storm/default.nix

@@ -7,7 +7,7 @@ let
 in
 {
   imports = [
-    ../../../common/configs/user/options.nix
+    (import ../../../common/configs/user { inherit user home; })
 
     (import ../../../common/configs/user/console/home-manager { inherit user home; })
     (import ../../../common/configs/user/console/neovim { inherit user home; })