diff --git a/hardware/x360-raven.nix b/hardware/x360-raven.nix
index f13994a..d621f08 100644
--- a/hardware/x360-raven.nix
+++ b/hardware/x360-raven.nix
@@ -12,7 +12,6 @@
   ];
 
   services.tlp.enable = true;
-  powerManagement.powertop.enable = true;
   systemd.tmpfiles.rules = [
     "w /sys/class/drm/card0/device/power_dpm_force_performance_level - - - - low"
   ];
diff --git a/roles/base.nix b/roles/base.nix
index 6499705..a847708 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -16,7 +16,6 @@ in {
     ncdu
     openssl
     ripgrep
-    tcpdump
     tmux
     z-lua
     unstable.starship
diff --git a/roles/desktop.nix b/roles/desktop.nix
index fffafcc..a713746 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -57,28 +57,21 @@ in {
     mesa
 
     librsvg
-    mypaint
-    mypaint-brushes
+    unstable.mypaint
+    unstable.mypaint-brushes
 
-    capitaine-cursors
-    elementary-xfce-icon-theme
     hicolor-icon-theme
+    numix-icon-theme
 
     alacritty
-    imv
     inkscape
-    libreoffice
     libsecret
-    lxappearance
-    mumble
     mumble
     neofetch
-    pavucontrol
     pulseaudio
     pulsemixer
     unstable.keepassxc
     wl-clipboard
-    xfce.thunar
     (
       pkgs.writeTextFile {
         name = "startsway";
@@ -99,11 +92,6 @@ in {
     )
   ];
 
-  services.gvfs = {
-    enable = true;
-    package = lib.mkForce pkgs.gnome3.gvfs;
-  };
-
   services.syncthing = {
     enable = true;
     openDefaultPorts = true;
diff --git a/roles/dev.nix b/roles/dev.nix
index ebec090..2710627 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -7,19 +7,16 @@ let
   unstable = import <nixos-unstable> {};
 in {
   environment.systemPackages = with pkgs; [
+    emacs
     go
     python37
     python37Packages.pyls-black
     python37Packages.pyls-isort
     python37Packages.pyls-mypy
     rustup
-    unstable.gopls
-    unstable.rust-analyzer
-
-    emacs
     sops
     tig
-
-    openssl pkg-config nasm cmake zlib gcc binutils-unwrapped
+    unstable.gopls
+    unstable.rust-analyzer
   ];
 }