diff --git a/flake.lock b/flake.lock
index 178e4dd..f4375e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -196,22 +196,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -254,7 +238,9 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts",
         "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nur": "nur",
         "systems": "systems",
         "tinted-foot": "tinted-foot",
diff --git a/flake.nix b/flake.nix
index c71dda2..590ca10 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     # nixvim.inputs.nixpkgs.follows = "nixpkgs";
     # nixvim.url = "github:nix-community/nixvim";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
     stylix.url = "github:danth/stylix";
   };
 
diff --git a/hosts/dos/env.nix b/hosts/dos/env.nix
index 81473be..dd30f0e 100644
--- a/hosts/dos/env.nix
+++ b/hosts/dos/env.nix
@@ -1,57 +1,65 @@
 {
-  # Specific Use Cases
-  ## Hardware related
+  # -------------------- Hardware --------------------
+  # See: https://github.com/blueman-project/blueman
   Bluetooth = true;
-  ### See https://github.com/blueman-project/blueman
 
+  # See: https://nixos.wiki/wiki/AMD_GPU
   GPU-AMD = true;
-  ### See https://nixos.wiki/wiki/AMD_GPU
- 
-  SingBox = true;
 
-  Power-control = "TLP";
-  ### Possible options: PPD ; TLP
+  # See: https://nixos.wiki/wiki/Nvidia
+  GPU-Nvidia = false;
 
-  ## Software related
-  QEMU-VM-Use-Case = true;
-  ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager
+  # See: https://nixos.wiki/wiki/Intel_Graphics
+  GPU-Intel = false;
 
-  Database-Use-Case = true;
+  # See: https://github.com/linrunner/TLP
+  Power-control = "TLP"; ## Possible options: PPD ; TLP
 
-  # Options
-  ## System related
-  BootLoader = "systemd-boot";
-  ### Possible options: grub ; grub-mirror ; systemd-boot # See https://nixos.wiki/wiki/Bootloader https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=mirroredBoots
+  # -------------------- System --------------------
+  # See https://nixos.wiki/wiki/Bootloader
+  # See: https://search.nixos.org/options?show=boot.loader.grub.mirroredBoots
+  BootLoader = "systemd-boot"; ## Possible options: grub ; grub-mirror ; systemd-boot
 
+  # See: https://search.nixos.org/options?show=boot.kernelPackages
+  # See: https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
   KernelPackages = "linuxPackages_zen";
-  ### See https://search.nixos.org/options?show=boot.kernelPackages https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
-
-  KeyboardLayout = "us";
-  ### See https://en.wikipedia.org/wiki/Keyboard_layout
-
-  Locale = "en_US.UTF-8";
-  ### See https://docs.moodle.org/405/en/Table_of_locales
 
+  # See: https://mynixos.com/nixpkgs/option/system.stateVersion
   StateVersion = "26.05";
-  ### See https://mynixos.com/nixpkgs/option/system.stateVersion
 
+  # See: https://docs.moodle.org/405/en/Table_of_locales
+  Locale = "en_US.UTF-8";
+
+  # See: https://en.wikipedia.org/wiki/Keyboard_layout
+  KeyboardLayout = "us";
+
+  # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   TimeZone = "Asia/Singapore";
-  ### See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
-  ## Wayland related
+  # -------------------- Display --------------------
+  WM = "niri"; ## Options: "Hyprland" | "niri" | "sway"
+
+  # See: https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
+  # See: https://github.com/swaywm/sway/wiki#hidpi
+  ScaleLevel = "1";
+
+  # See: https://github.com/swaywm/sway/wiki#display-configuration
+  OutputSettings = "output * scale 1";
+
+  # See: https://wiki.hyprland.org/Configuring/Monitors
   MonitorSettings = "
   monitor=eDP-1, 2560x1600@165, 0x0, 1.25
   monitor=DP-1, 2560x1440@144, 2560x0, 1.25
   ";
-  ### MonitorSettings For Hyprland See https://wiki.hyprland.org/Configuring/Monitors/
 
-  OutputSettings = "output * scale 1";
-  ### OutputSettings For sway See https://github.com/swaywm/sway/wiki#display-configuration
+  # -------------------- Software --------------------
+  # See: https://sing-box.sagernet.org
+  SingBox = true;
 
-  ScaleLevel = "1";
-  ### For Hyprland see https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
-  ### For sway see https://github.com/swaywm/sway/wiki#hidpi
+  # See: https://github.com/qemu/qemu
+  # See: https://github.com/virt-manager/virt-manager
+  QEMU-VM-Use-Case = true;
 
-  WM = "niri";
-  ### Possible options: Hyprland ; niri ; sway
+  # See: https://github.com/dbeaver/dbeaver
+  Database-Use-Case = true;
 }
diff --git a/hosts/example/env.nix b/hosts/example/env.nix
index bb25eac..bc845dd 100644
--- a/hosts/example/env.nix
+++ b/hosts/example/env.nix
@@ -1,63 +1,62 @@
 {
-  # Specific Use Cases
-  ## Hardware related
+  # -------------------- Hardware --------------------
+  # See: https://github.com/blueman-project/blueman
   Bluetooth = false;
-  ### See https://github.com/blueman-project/blueman
 
+  # See: https://nixos.wiki/wiki/AMD_GPU
   GPU-AMD = false;
-  ### See https://nixos.wiki/wiki/AMD_GPU
 
+  # See: https://nixos.wiki/wiki/Nvidia
   GPU-Nvidia = false;
-  ### See https://nixos.wiki/wiki/Nvidia
 
+  # See: https://nixos.wiki/wiki/Intel_Graphics
   GPU-Intel = false;
-  ### See https://nixos.wiki/wiki/Intel_Graphics
 
-  HotSpot-Use-Case = false;
-  ### See https://nixos.wiki/wiki/Internet_Connection_Sharing
+  # See: https://github.com/linrunner/TLP
+  Power-control = "PPD"; ## Possible options: PPD ; TLP
 
+  # -------------------- System --------------------
+  # See https://nixos.wiki/wiki/Bootloader
+  # See: https://search.nixos.org/options?show=boot.loader.grub.mirroredBoots
+  BootLoader = "systemd-boot"; ## Possible options: grub ; grub-mirror ; systemd-boot
+
+  # See: https://search.nixos.org/options?show=boot.kernelPackages
+  # See: https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
+  KernelPackages = "linuxPackages_zen";
+
+  # See: https://mynixos.com/nixpkgs/option/system.stateVersion
+  StateVersion = "26.05";
+
+  # See: https://docs.moodle.org/405/en/Table_of_locales
+  Locale = "en_US.UTF-8";
+
+  # See: https://en.wikipedia.org/wiki/Keyboard_layout
+  KeyboardLayout = "us";
+
+  # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  TimeZone = "Asia/Singapore";
+
+  # -------------------- Display --------------------
+  WM = "Hyprland"; ## Options: "Hyprland" | "niri" | "sway"
+
+  # See: https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
+  # See: https://github.com/swaywm/sway/wiki#hidpi
+  ScaleLevel = "1";
+
+  # See: https://github.com/swaywm/sway/wiki#display-configuration
+  OutputSettings = "output * scale 1";
+
+  # See: https://wiki.hyprland.org/Configuring/Monitors
+  MonitorSettings = "monitor = , preferred, auto, auto";
+
+  # -------------------- Software --------------------
+  # See: https://sing-box.sagernet.org
   SingBox = true;
 
-  Power control = "PPD";
-  ### Possible options: PPD ; TLP
-
-  ## Software related
+  # See: https://github.com/qemu/qemu
+  # See: https://github.com/virt-manager/virt-manager
   QEMU-VM-Use-Case = false;
-  ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager
 
+  # See: https://github.com/dbeaver/dbeaver
   Database-Use-Case = true;
-
-  # Options
-  ## System related
-  BootLoader = "systemd-boot";
-  ### Possible options: grub ; grub-mirror ; systemd-boot # See https://nixos.wiki/wiki/Bootloader https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=mirroredBoots
-
-  KernelPackages = "linuxPackages_zen";
-  ### See https://search.nixos.org/options?show=boot.kernelPackages https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
-
-  KeyboardLayout = "us";
-  ### See https://en.wikipedia.org/wiki/Keyboard_layout
-
-  Locale = "en_US.UTF-8";
-  ### See https://docs.moodle.org/405/en/Table_of_locales
-
-  StateVersion = "25.11";
-  ### See https://mynixos.com/nixpkgs/option/system.stateVersion
-
-  TimeZone = "Asia/Singapore";
-  ### See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-
-  ## Wayland related
-  MonitorSettings = "monitor = , preferred, auto, auto";
-  ### MonitorSettings For Hyprland See https://wiki.hyprland.org/Configuring/Monitors/
-
-  OutputSettings = "output * scale 1";
-  ### OutputSettings For sway See https://github.com/swaywm/sway/wiki#display-configuration
-
-  ScaleLevel = "1";
-  ### For Hyprland see https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
-  ### For sway see https://github.com/swaywm/sway/wiki#hidpi
-
-  WM = "Hyprland";
-  ### Possible options: Hyprland ; niri ; sway
 }