diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 1244f16..1ae187f 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -38,63 +38,58 @@ in {
       MANPAGER = "less";
     };
 
-    systemPackages = with pkgs;
-      [
-        # age
-        # bat
-        # bc
-        # bind
-        # bottom
-        # btrfs-progs
-        # cue
-        curl
-        # dogdns
-        dua
-        eza
-        fd
-        file
-        fzf
-        gnumake
-        # gron
-        # hexyl
-        iputils
-        # jq
-        killall
-        less
-        mosh
-        # nmap
-        nettools
-        nodePackages.bash-language-server
-        openssl
-        # pciutils
-        # pv
-        # rclone
-        # restic
-        ripgrep
-        rsync
-        # rtx
-        sd
-        shellcheck
-        shfmt
-        # sops
-        smartmontools
-        # sqlite
-        # skim
-        # sysstat
-        unzip
-        # usbutils
-        # watchexec
-        wget
-        # xh
-        zellij
-        # zstd
-      ]
-      ++ (with inputs.home-manager.packages.${system}; [
-        home-manager
-      ])
-      ++ (with inputs.helix.packages.${system}; [
-        helix
-      ]);
+    systemPackages = with pkgs; [
+      # age
+      # bat
+      # bc
+      # bind
+      # bottom
+      # btrfs-progs
+      # cue
+      curl
+      # dogdns
+      dua
+      eza
+      fd
+      file
+      fzf
+      gnumake
+      # gron
+      # hexyl
+      iputils
+      # jq
+      killall
+      less
+      mosh
+      # nmap
+      nettools
+      nodePackages.bash-language-server
+      openssl
+      # pciutils
+      # pv
+      # rclone
+      # restic
+      ripgrep
+      rsync
+      # rtx
+      sd
+      shellcheck
+      shfmt
+      # sops
+      smartmontools
+      # sqlite
+      # skim
+      # sysstat
+      unzip
+      # usbutils
+      # watchexec
+      wget
+      # xh
+      zellij
+      # zstd
+      inputs.home-manager.packages.${system}.home-manager
+      inputs.helix.packages.${system}.helix
+    ];
   };
 
   users.groups.daniel = {};
diff --git a/modules/nixos/development-tools.nix b/modules/nixos/development-tools.nix
index 0b34a21..4100c47 100644
--- a/modules/nixos/development-tools.nix
+++ b/modules/nixos/development-tools.nix
@@ -1,7 +1,15 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     watchexec
+    android-tools
+    libresprite
+    audacity
+    wol
+    shellcheck
+    shfmt
+    bash-language-server
     xh
+    jq
     curl
   ];
 }
diff --git a/modules/nixos/troubleshooting-tools.nix b/modules/nixos/troubleshooting-tools.nix
index 1d6e9bc..2a1e20e 100644
--- a/modules/nixos/troubleshooting-tools.nix
+++ b/modules/nixos/troubleshooting-tools.nix
@@ -2,6 +2,8 @@
   environment.systemPackages = with pkgs; [
     pciutils
     usbutils
+    htop
+    bottom
     nmap
     dogdns
     dnsutils
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index c329e44..962b45c 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -40,6 +40,9 @@ in {
       godot_4
       fractal
       prismlauncher
+      upower
+      acpi
+      prismlauncher
       radeontop
       sops
       obs-studio