diff --git a/pkgsets/base.nix b/pkgsets/base.nix
index 62dbe07..d43d6af 100644
--- a/pkgsets/base.nix
+++ b/pkgsets/base.nix
@@ -3,15 +3,13 @@
 
 {
   config.machine.pkgsets.base.pkgs = with pkgs; [
-    alsaUtils
-    binutils-unwrapped
-    finger_bsd
+    bat
     ccze
-    cksfv
     cryptsetup
     dhcpcd
     dnsutils
-    gitFull git-lfs
+    finger_bsd
+    gitFull
     gnupg
     gptfdisk
     haskellPackages.nix-derivation
@@ -21,10 +19,8 @@
     indent
     iptables
     jp
-    lrzip
-    lsof
     lshw
-    macchanger
+    lsof
     mkpasswd
     netcat
     nix-diff
@@ -42,20 +38,15 @@
     oh-my-zsh
     openssl
     parted
-    p7zip
     pciutils
     psmisc
     rfkill
     ripgrep
     rsync
-    sl
     sysvtools
     telnet
     traceroute
     tree
-    unrar
-    unzipNLS
-    usbutils
     vim
     vulnix
     wget
diff --git a/pkgsets/extra.nix b/pkgsets/extra.nix
index 2ed2f8d..f67e826 100644
--- a/pkgsets/extra.nix
+++ b/pkgsets/extra.nix
@@ -2,8 +2,18 @@
 
 {
   config.machine.pkgsets.extra.pkgs = with pkgs; [
+    alsaUtils
+    binutils-unwrapped
+    git-lfs
     imagemagick
+    lrzip
+    macchanger
+    miniserve
+    p7zip
+    sl
     texlive.combined.scheme-full
     transmission
+    unrar
+    usbutils
   ];
 }