diff --git a/home/user/packages.nix b/home/user/packages.nix
index 7c154c3..a3aef86 100644
--- a/home/user/packages.nix
+++ b/home/user/packages.nix
@@ -1,38 +1,67 @@
 { pkgs, pkgs-unstable, ... }:
 
 {
-  home.packages = with pkgs; [
-    jetbrains.rider
-    go
-    lua
-    nodePackages.pnpm
-    (python3.withPackages (python-pkgs: [
-      python-pkgs.pip
-      python-pkgs.requests
-    ]))
-    rustup
-    zig
-    obsidian
-    thunderbird
-    libreoffice-qt
-    hunspell
-    blueberry
-    telegram-desktop
-    steam
-    steam-run
-    yuzu-mainline
-    (lutris.override {
-      extraPkgs = pkgs: [
-        wineWowPackages.stable
-        winetricks
-      ];
-    })
-    viewnior
-    pkgs-unstable.hyprshot
-    catppuccin-cursors.macchiatoBlue
-    catppuccin-gtk
-    papirus-folders
-    git
-    curl
-  ];
+    home.packages = with pkgs; [
+        jetbrains.rider
+        android-studio
+        beekeeper-studio
+        brave
+        discord
+        spotify
+        go
+        lua
+        nodePackages.pnpm
+        (python3.withPackages (python-pkgs: [ python-pkgs.pip python-pkgs.requests ]))
+        rustup
+        zig
+        obsidian
+        thunderbird
+        libreoffice-qt
+        nerd-fonts.fira-code
+        hunspell
+        blueberry
+        steam
+        steam-run
+        yuzu-mainline
+        viewnior
+        pkgs-unstable.hyprshot
+        catppuccin-cursors.macchiatoBlue
+        catppuccin-gtk
+        papirus-folders
+        php84Packages.composer
+        php84Packages.xdebug
+        php84Extensions.sqlite3
+        php84Extensions.redis
+        php84Extensions.sodium
+        php84Extensions.pgsql
+        php84Extensions.iconv
+        php84Extensions.gd
+        php84Extensions.zip
+        php
+        antigravity
+        gimp
+        kdePackages.dolphin
+        enpass
+        enpass-cli
+        expressvpn
+        jellyfin-ffmpeg
+        inkscape
+        krita
+        libreoffice-fresh
+        nextcloud-client
+        nodejs_24
+        signal-desktop
+        sxiv
+        tenacity
+        unzip
+        zathura
+        ghostty
+        wally-cli
+        youtube-dl
+        kdePackages.wacomtablet
+        kdePackages.print-manager
+        mpv
+        vlc
+        telegram-desktop
+    ];
 }
diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix
index 6bcc6af..efa4e8e 100644
--- a/system/modules/hyprland.nix
+++ b/system/modules/hyprland.nix
@@ -1,22 +1,21 @@
 { config, pkgs, ... }:
 
 {
-  programs.hyprland = {
-    enable = true;
-  };
+    programs.hyprland = {
+        enable = true;
+    };
 
-  environment.systemPackages = with pkgs; [
-    hyprpaper
-    kitty
-    libnotify
-    mako
-    qt5.qtwayland
-    qt6.qtwayland
-    swayidle
-    swaylock-effects
-    wlogout
-    wl-clipboard
-    wofi
-    waybar
-  ];
+    environment.systemPackages = with pkgs; [
+        hyprpaper
+        libnotify
+        mako
+        qt5.qtwayland
+        qt6.qtwayland
+        swayidle
+        swaylock-effects
+        wlogout
+        wl-clipboard
+        wofi
+        waybar
+    ];
 }
diff --git a/system/modules/packages.nix b/system/modules/packages.nix
index c311e37..70f49b4 100644
--- a/system/modules/packages.nix
+++ b/system/modules/packages.nix
@@ -1,30 +1,45 @@
 { config, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
-    bat
-    btop
-    eza
-    fzf
-    git
-    gnumake
-    lm_sensors
-    libsForQt5.qt5.qtquickcontrols2
-    libsForQt5.qt5.qtgraphicaleffects
-    libsForQt5.qt5.qtsvg
-    neofetch
-    neovim
-    ripgrep
-    tldr
-    unzip
-    openssl
-    openssl.dev
-    pkg-config
-    wget
-    xfce.thunar
-    xdg-desktop-portal-gtk
-    xdg-desktop-portal-wlr
-    zip
-    zoxide
-  ];
+    environment.systemPackages = with pkgs; [
+        bat
+        highlight
+        btop
+        eza
+        fzf
+        git
+        gnumake
+        lm_sensors
+        libsForQt5.qt5.qtquickcontrols2
+        libsForQt5.qt5.qtgraphicaleffects
+        libsForQt5.qt5.qtsvg
+        go-task
+        neofetch
+        neovim
+        ripgrep
+        tldr
+        unzip
+        openssl
+        openssl.dev
+        pkg-config
+        wget
+        xfce.thunar
+        xdg-desktop-portal-gtk
+        xdg-desktop-portal-wlr
+        zip
+        zoxide
+        jq
+        lazygit
+        lazysql
+        less
+        mlocate
+        tree
+        tmux
+        tmuxinator
+        wget
+        zenity
+        yazi
+        rsync
+        p7zip
+    ];
 }