refactor variables & theme

hosts/laptop/configuration.nix

@@ -1,26 +1,19 @@
 { config, ... }: {
   imports = [
+    # Mostly system related configuration
     ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
-    ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
-
     ../../nixos/audio.nix
     ../../nixos/bluetooth.nix
     ../../nixos/fonts.nix
     ../../nixos/home-manager.nix
-    ../../nixos/network-manager.nix
     ../../nixos/nix.nix
     ../../nixos/systemd-boot.nix
-    ../../nixos/timezone.nix
     ../../nixos/tuigreet.nix
     ../../nixos/users.nix
     ../../nixos/utils.nix
-    ../../nixos/xdg-portal.nix
-    ../../nixos/docker.nix
-    ../../nixos/variables-config.nix
-
-    # Choose your theme here
-    # ../../themes/stylix/yoru.nix
+    # ../../nixos/docker.nix
 
+    # You should let those lines as is
     ./hardware-configuration.nix
     ./variables.nix
   ];

hosts/laptop/home.nix

@@ -1,13 +1,12 @@
 { pkgs, config, ... }: {
 
   imports = [
+    # Mostly user-specific configuration
     ./variables.nix
 
     # Programs
     ../../home/programs/kitty
     ../../home/programs/nvim
-    # ../../home/programs/nvf
-    # ../../home/programs/qutebrowser
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/git
@@ -17,7 +16,6 @@
     ../../home/programs/lazygit
     ../../home/programs/zen
     ../../home/programs/duckduckgo-colorscheme
-    ../../home/programs/superfile
     ../../home/programs/discord
 
     # Scripts
@@ -36,8 +34,6 @@
     ../../home/system/udiskie
     ../../home/system/clipman
 
-    # ../../themes/stylix/yoru.nix
-
     ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
@@ -62,17 +58,14 @@
       nodejs
       python3
       jq
-      figlet
       just
       pnpm
-      lazydocker
 
       # Utils
       zip
       unzip
       optipng
       pfetch
-      pandoc
       btop
       fastfetch
 

hosts/laptop/variables.nix

@@ -1,5 +1,8 @@
-{ config, ... }: {
-  imports = [ ../../nixos/variables-config.nix ../../themes/yoru.nix ];
+{ config, lib, ... }: {
+  imports = [
+    # Choose your theme here:
+    ../../themes/yoru.nix
+  ];
 
   config.var = {
     hostname = "nixy";
@@ -21,8 +24,13 @@
 
     autoUpgrade = false;
     autoGarbageCollector = true;
+  };
 
-    # Choose your theme variables here
-    # theme = import ../../themes/var/2025.nix;
+  # Let this here
+  options = {
+    var = lib.mkOption {
+      type = lib.types.attrs;
+      default = { };
+    };
   };
 }