diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 374f4b7..46af4bd 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -6,7 +6,9 @@
   home.packages = with pkgs; [
     hyprshot
     hyprpicker
-    # hyprcursor
+    swappy
+    imv
+    wf-recorder
     xdg-desktop-portal-hyprland
     wlr-randr
     wl-clipboard
@@ -15,7 +17,6 @@
     wlsunset
     xwayland
     xdg-desktop-portal-gtk
-    wlroots
     qt5ct
     libva
     dconf
@@ -102,11 +103,13 @@
       ];
 
       env = [
-        "LIBVA_DRIVER_NAME,nvidia"
         "XDG_SESSION_TYPE,wayland"
         "XDG_CURRENT_DESKTOP,Hyprland"
+        "MOZ_ENABLE_WAYLAND,1"
+        "ANKI_WAYLAND,1"
+        "DISABLE_QT5_COMPAT,0"
+        "NIXOS_OZONE_WL,1"
         "XDG_SESSION_TYPE,wayland"
-        "GBM_BACKEND,nvidia-drm"
         "XDG_SESSION_DESKTOP,Hyprland"
         "QT_AUTO_SCREEN_SCALE_FACTOR,1"
         "QT_QPA_PLATFORM=wayland,xcb"
@@ -115,10 +118,6 @@
         "GTK_THEME,FlatColor:dark"
         "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
         "NVD_BACKEND,direct"
-        #"WLR_DRM_DEVICES,$HOME/.config/hypr/card"
-        # "HYPRCURSOR_THEME,macOS"
-        # "HYPRCURSOR_SIZE,16"
-        # "XCURSOR_SIZE,16"
       ];
 
       cursor = { no_hardware_cursors = true; };
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index 9ee6129..ed8f9ac 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -6,7 +6,6 @@
 
   programs.waybar = {
     enable = true;
-    # package = inputs.waybar.packages."${pkgs.system}".waybar;
     settings = {
       mainBar = {
         layer = config.var.theme.waybar.position;
diff --git a/home/programs/zathura/default.nix b/home/system/zathura/default.nix
similarity index 100%
rename from home/programs/zathura/default.nix
rename to home/system/zathura/default.nix
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 27cbcc6..6d05f27 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -14,7 +14,6 @@
     ./variables.nix
   ];
 
-  # Networking
   networking.networkmanager.enable = true;
   networking.hostName = config.var.hostname;
   systemd.services.NetworkManager-wait-online.enable = false;
@@ -31,7 +30,6 @@
   };
   console.keyMap = config.var.keyboardLayout;
 
-  # Shell
   programs.zsh = {
     enable = true;
     loginShellInit = ''
@@ -40,15 +38,10 @@
   };
   users.defaultUserShell = pkgs.zsh;
 
-  # Set environment variables
   environment.variables = {
     XDG_DATA_HOME = "$HOME/.local/share";
     PASSWORD_STORE_DIR = "$HOME/.local/share/password-store";
-    MOZ_ENABLE_WAYLAND = "1";
     EDITOR = "nvim";
-    ANKI_WAYLAND = "1";
-    DISABLE_QT5_COMPAT = "0";
-    NIXOS_OZONE_WL = "1";
   };
 
   nix = {
@@ -72,9 +65,20 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-  environment.systemPackages = with pkgs; [ networkmanagerapplet ];
-  nixpkgs.config.permittedInsecurePackages =
-    [ "electron-25.9.0" ]; # TODO: test to remove
+
+  environment.systemPackages = with pkgs; [
+    networkmanagerapplet
+    fd
+    bc
+    gcc
+    git-ignore
+    xdg-utils
+    wget
+    curl
+  ];
+
+  # nixpkgs.config.permittedInsecurePackages =
+  #   [ "electron-25.9.0" ]; # TODO: test to remove
 
   system.autoUpgrade = {
     enable = config.var.autoUpgrade;
@@ -84,10 +88,10 @@
     allowReboot = false;
   };
 
-  xdg.portal = { # TODO: test to remove
-    enable = true;
-    configPackages = with pkgs; [ xdg-desktop-portal-gtk ];
-  };
+  # xdg.portal = { # TODO: test to remove
+  #   enable = true;
+  #   configPackages = with pkgs; [ xdg-desktop-portal-gtk ];
+  # };
 
   services.libinput.enable = true;
   programs.dconf.enable = true;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index f1312e3..8c7f19f 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -11,7 +11,6 @@
     ../../home/programs/nvim
     ../../home/programs/qutebrowser
     ../../home/programs/spicetify
-    ../../home/programs/zathura
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/lf
@@ -24,6 +23,7 @@
     # System (Desktop environment like stuff)
     ../../home/system/dunst
     ../../home/system/gtk
+    ../../home/system/zathura
     ../../home/system/hyprland
     ../../home/system/waybar
     ../../home/system/wlogout
@@ -39,10 +39,7 @@
     inherit (config.var) homeDirectory;
 
     packages = with pkgs; [
-      swappy
-      imv
       discord
-      obsidian
       xfce.thunar
       bitwarden
       vlc
@@ -55,32 +52,16 @@
       nodejs
       python3
       jq
-      git-ignore
       nurl
       prefetch-npm-deps
       figlet
 
-      # Infosec
-      exegol
-
       # Utils
-      fd
-      bc
-      gcc
-      blueman
       zip
       unzip
-      xdg_utils
-      wget
-      curl
-      wf-recorder
       glow
-      nwg-displays
-      wireguard-tools
-      bitwarden-cli
       optipng
       pfetch
-      usbutils
       pandoc
 
       # Just cool
@@ -91,7 +72,6 @@
 
       # Backup
       vscode
-      tor-browser
       firefox
       neovide
     ];
@@ -102,6 +82,7 @@
       source = ../../home/wallpapers;
     };
 
+    # Don't touch this
     stateVersion = "24.05";
   };
 
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index 5b8dc88..4bd781a 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -18,16 +18,23 @@
       email = "112569860+anotherhadi@users.noreply.github.com";
     };
 
-    stateVersion = "24.05";
-
     autoUpgrade = false;
     autoGarbageCollector = false;
+
+    # SOPS
+    # Sops is a tool to store secrets in git repositories encrypted with GPG.
     # change the sops configuration if you want to enable that:
     sops = true;
-    # change the nvim's obsidian configuration if you want to enable that:
-    obsidian = true;
+
+    # Enable tailscale
     tailscale = true;
-    usbguard = false; # TODO: Add the allow list variable
+
+    # USBGuard
+    # If usbguard enabled: set yours pref USB devices (change {id} to your trusted USB device), use `lsusb` command (from usbutils package) to get list 
+    # of all connected USB devices including integrated devices like camera, bluetooth, wifi, etc. with their IDs or just disable `usbguard`
+    # allow id {id} # device 1...
+    usbguard = false;
+    usbguardRules = "";
 
     theme = import ../themes/nixy.nix; # select your theme here
   };
diff --git a/hosts/modules/bluetooth.nix b/hosts/modules/bluetooth.nix
index 1b6e38b..5f1866f 100644
--- a/hosts/modules/bluetooth.nix
+++ b/hosts/modules/bluetooth.nix
@@ -1,4 +1,5 @@
-{
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [ blueman ];
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;
diff --git a/hosts/modules/usb.nix b/hosts/modules/usb.nix
index 0cfa49d..2d58b09 100644
--- a/hosts/modules/usb.nix
+++ b/hosts/modules/usb.nix
@@ -11,9 +11,7 @@
     enable = config.var.usbguard;
     dbus.enable = true;
     implicitPolicyTarget = "block";
-    # FIXME: set yours pref USB devices (change {id} to your trusted USB device), use `lsusb` command (from usbutils package) to get list of all connected USB devices including integrated devices like camera, bluetooth, wifi, etc. with their IDs or just disable `usbguard`
-    # allow id {id} # device 1...
-    rules = "";
+    rules = config.var.usbguardRules;
   };
 
   # Enable USB-specific packages