diff --git a/nixos/essential-packages.nix b/nixos/essential-packages.nix
new file mode 100644
index 00000000..b1e02bce
--- /dev/null
+++ b/nixos/essential-packages.nix
@@ -0,0 +1,68 @@
+{ pkgs }:
+{
+  environment.systemPackages = with pkgs; [
+    firefox
+    vlc
+    nautilus
+
+    # Appearance
+    gnome-breeze
+    gnome3.adwaita-icon-theme
+    hicolor-icon-theme
+    materia-theme
+    numix-icon-theme-circle
+    papirus-icon-theme
+
+    # XOrg
+    wmctrl
+    xclip
+    xdotool
+    xorg.xev
+    xorg.xkbcomp
+    xorg.xwininfo
+    xsettingsd
+
+    # Haskell Desktop
+    haskellPackages.imalison-xmonad
+    haskellPackages.imalison-taffybar
+    haskellPackages.status-notifier-item
+    haskellPackages.dbus-hslogger
+
+    # Desktop
+    autorandr
+    betterlockscreen
+    blueman
+    clipit
+    feh
+    gnome3.gpaste
+    kdeconnect
+    libnotify
+    lxqt.lxqt-powermanagement
+    networkmanagerapplet
+    notify-osd-customizable
+    pasystray
+    picom
+    pinentry
+    pommed_light
+    rofi
+    rofi-pass
+    rofi-systemd
+    skippy-xd
+    synergy
+    udiskie
+    volnoti
+
+    # Audio
+    playerctl
+
+    # Tools
+    binutils
+    gitFull
+    rcm
+    silver-searcher
+    ripgrep
+    usbutils
+    tmux
+    wget
+  ];
+}
diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix
index 01abc8d2..41225d21 100644
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     <nixos-hardware/raspberry-pi/4>
+    ./essential-packages.nix
   ];
 
   nixpkgs.overlays = [
@@ -11,12 +12,6 @@
 
   hardware.raspberry-pi."4".fkms-3d.enable = true;
 
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.android_sdk.accept_license = true;
-  nixpkgs.config.permittedInsecurePackages = [
-    "openssl-1.0.2u"
-  ];
-
   boot = {
     kernelPackages = pkgs.linuxPackages_rpi4;
     tmpOnTmpfs = true;
@@ -83,10 +78,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    emacs
-    firefox
     raspberrypi-eeprom
-    transmission-gtk
     vlc
     yubikey-manager
     networkmanagerapplet