diff --git a/roles/base.nix b/roles/base.nix
index 4ce365a..e76d8c9 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -4,11 +4,9 @@ let
   unstable = import <nixos-unstable> {};
 in {
   environment.systemPackages = with pkgs; [
-    acpi
     bash
     bash-completion
     bat
-    borgbackup
     direnv
     fd
     fzf
diff --git a/roles/desktop.nix b/roles/desktop.nix
index a8108cd..1e6d25a 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -69,9 +69,9 @@ in {
     hicolor-icon-theme
     numix-icon-theme
 
+    unstable.alacritty
     imv
     inkscape
-    libqrencode
     libreoffice
     libsecret
     lxappearance
@@ -81,10 +81,9 @@ in {
     pcmanfm
     pulseaudio
     pulsemixer
+    unstable.keepassxc
     wl-clipboard
     xdg_utils
-    unstable.alacritty
-    unstable.keepassxc
     (
       pkgs.writeTextFile {
         name = "startsway";
diff --git a/roles/private.nix b/roles/embedded.nix
similarity index 87%
rename from roles/private.nix
rename to roles/embedded.nix
index 8ce8d02..f998876 100644
--- a/roles/private.nix
+++ b/roles/embedded.nix
@@ -10,8 +10,5 @@ in {
     pkgsCross.avr.libcCross
     pkgsCross.avr.buildPackages.gcc8
     pkgsCross.avr.buildPackages.binutils
-    unstable.cura
-    openscad
-    kicad
   ];
 }