diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ecc0915b..9039b4bc 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -108,6 +108,7 @@ in
     # Desktop
     # haskellPackages.status-notifier-item
     autorandr
+    betterlockscreen
     blueman
     clipit
     compton
@@ -187,6 +188,7 @@ in
     glxinfo
     gnumake
     gnupg
+    gparted
     htop
     inotify-tools
     ispell
@@ -196,11 +198,13 @@ in
     ncdu
     neofetch
     openvpn
+    parallel
     pass
     patchelf
     pciutils
     plasma-workspace
     powertop
+    prometheus_2
     pscircle
     python-with-my-packages
     qt5.qttools
@@ -242,7 +246,8 @@ in
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   programs.adb.enable = true;
 
-  services.acpid.enable = true;
+  services.tlp.enable = true;
+  services.acpid.enable = false;
 
   services.openssh.enable = true;
 
diff --git a/nixos/extra.nix b/nixos/extra.nix
index 9ff007a7..d155ad17 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -4,6 +4,6 @@
     gimp
     android-studio
     texlive.combined.scheme-full
+    tor
   ];
-  boot.extraModulePackages = with pkgs; [ xboxdrv ];
 }