From 94fd156120b27ceecec7ae9951d73c2ef95c981e Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 28 Jun 2023 22:27:09 -0600
Subject: [PATCH] [NixOS] Move packages around

---
 nixos/all.nix       |  3 --
 nixos/android.nix   |  3 ++
 nixos/code.nix      |  8 ++---
 nixos/desktop.nix   | 72 +++++++++++++++++++++++++++++++++++++++++++++
 nixos/essential.nix | 63 ++-------------------------------------
 nixos/extra.nix     |  2 ++
 6 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/nixos/all.nix b/nixos/all.nix
index 62f0351f..e86e7103 100644
--- a/nixos/all.nix
+++ b/nixos/all.nix
@@ -3,7 +3,6 @@
   environment.systemPackages = with pkgs; [
     # Applications
     alacritty
-    # calibre
     gnome.cheese
     dfeet
     discord
@@ -15,11 +14,9 @@
     keybase-gui
     kitty
     kleopatra
-    # kodi
     libreoffice
     lxappearance
     okular
-    # pulseeffects
     quassel
     slack
     simplescreenrecorder
diff --git a/nixos/android.nix b/nixos/android.nix
index a7b63503..ff9db1cc 100644
--- a/nixos/android.nix
+++ b/nixos/android.nix
@@ -1,5 +1,8 @@
 { pkgs, ... }:
 {
+  environment.systemPackages = with pkgs; [
+    android-udev-rules
+  ];
   nixpkgs.config.android_sdk.accept_license = true;
   programs.adb.enable = true;
 }
diff --git a/nixos/code.nix b/nixos/code.nix
index aab35fd9..ab94858b 100644
--- a/nixos/code.nix
+++ b/nixos/code.nix
@@ -5,11 +5,9 @@
     cabal-install
     cabal2nix
     ghc
-    # stack
     haskellPackages.hpack
     haskellPackages.hasktags
     haskellPackages.hoogle
-    # (all-hies.selection { selector = p: { inherit (p) ghc864 ghc865; }; })
 
     # Scala
     sbt
@@ -20,10 +18,7 @@
     nodejs
 
     # Rust
-    cargo
-    # rls
-    rustc
-    rustfmt
+    rustup
 
     # Clojure
     boot
@@ -45,5 +40,6 @@
 
     # misc
     perf-tools
+    protobuf
   ];
 }
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index 5546e301..4db92de8 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -7,6 +7,7 @@
     xmonad.overlay
     xmonad-contrib.overlay
     notifications-tray-icon.overlay
+    (import ../dotfiles/config/xmonad/overlay.nix)
   ] ++ taffybar.overlays;
 
   services.autorandr.enable = true;
@@ -38,4 +39,75 @@
       '';
     };
   };
+
+  environment.systemPackages = with pkgs; [
+    # Appearance
+    numix-icon-theme-circle
+    papirus-icon-theme
+    hicolor-icon-theme
+
+    # XOrg
+    autorandr
+    wmctrl
+    xclip
+    xdotool
+    xorg.xev
+    xorg.xkbcomp
+    xorg.xwininfo
+    xsettingsd
+
+    # Haskell Desktop
+    haskellPackages.xmonad
+    haskellPackages.imalison-xmonad
+    # haskellPackages.notifications-tray-icon
+    haskellPackages.gtk-sni-tray
+    haskellPackages.status-notifier-item
+    haskellPackages.dbus-hslogger
+
+    # Desktop
+    alacritty
+    betterlockscreen
+    blueman
+    clipit
+    dfeet
+    discord
+    dolphin
+    element-desktop
+    emacs
+    feh
+    firefox
+    gitter
+    gnome.cheese
+    gnome.gpaste
+    google-chrome
+    hexchat
+    keybase-gui
+    kitty
+    kleopatra
+    libnotify
+    libreoffice
+    lxappearance
+    lxqt.lxqt-powermanagement
+    networkmanagerapplet
+    notify-osd-customizable
+    okular
+    pasystray
+    picom
+    pinentry
+    quassel
+    rofi
+    rofi-pass
+    rofi-systemd
+    simplescreenrecorder
+    skippy-xd
+    slack
+    spotify
+    synergy
+    transmission-gtk
+    vlc
+    volnoti
+    wire-desktop
+    xfce.thunar
+    zoom-us
+  ];
 }
diff --git a/nixos/essential.nix b/nixos/essential.nix
index 210825d2..c7b8fe90 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -15,71 +15,14 @@ let
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
 in
 {
-  nixpkgs.overlays = [
-    (import ../dotfiles/config/xmonad/overlay.nix)
-  ];
-
   nixpkgs.config.allowBroken = true;
-  programs.hyprland.enable = true;
+
   environment.systemPackages = with pkgs; [
     python-with-my-packages
-    alacritty
     (emacs29.override {
       withNativeCompilation = true;
       withTreeSitter = true;
     })
-    vscode
-    firefox
-    kitty
-    vlc
-    transmission-gtk
-    dolphin
-    element-desktop
-    gpick
-
-    # Appearance
-    numix-icon-theme-circle
-    papirus-icon-theme
-    hicolor-icon-theme
-
-    # XOrg
-    wmctrl
-    xclip
-    xdotool
-    xorg.xev
-    xorg.xkbcomp
-    xorg.xwininfo
-    xsettingsd
-
-    # Haskell Desktop
-    haskellPackages.xmonad
-    haskellPackages.imalison-xmonad
-    # haskellPackages.notifications-tray-icon
-    haskellPackages.gtk-sni-tray
-    haskellPackages.status-notifier-item
-    haskellPackages.dbus-hslogger
-
-    # Desktop
-    autorandr
-    betterlockscreen
-    blueman
-    clipit
-    feh
-    gnome.gpaste
-    libnotify
-    lxqt.lxqt-powermanagement
-    networkmanagerapplet
-    notify-osd-customizable
-    pasystray
-    picom
-    pinentry
-    rofi
-    rofi-pass
-    rofi-systemd
-    skippy-xd
-    synergy
-    udiskie
-    volnoti
 
     # Audio
     playerctl
@@ -89,11 +32,9 @@ in
     bazel
     bind
     binutils
-    binutils
     cmake
     dex
     direnv
-    direnv
     dpkg
     fd
     file
@@ -109,13 +50,13 @@ in
     nix-index
     pass
     pciutils
-    protobuf
     rclone
     rcm
     ripgrep
     silver-searcher
     tmux
     tzupdate
+    udiskie
     unzip
     usbutils
     wget
diff --git a/nixos/extra.nix b/nixos/extra.nix
index 8f9afcaf..ce0d1392 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 {
   services.expressvpn.enable = true;
+  programs.hyprland.enable = true;
+
   environment.systemPackages = with pkgs; [
     ffmpeg
     rust-analyzer