From 043b767900cb63cd546d1a563d2eedd42fbf1212 Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Thu, 11 May 2023 22:37:42 +0300
Subject: [PATCH] Move some packages to packages.nix

---
 machines/asus/default.nix             |  4 ----
 machines/asus/intellij/default.nix    |  5 -----
 machines/asus/libreoffice/default.nix |  7 -------
 machines/asus/packages.nix            | 10 +++++++++-
 machines/asus/qbittorrent/default.nix |  5 -----
 machines/asus/wine/default.nix        |  5 -----
 6 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 machines/asus/intellij/default.nix
 delete mode 100644 machines/asus/libreoffice/default.nix
 delete mode 100644 machines/asus/qbittorrent/default.nix
 delete mode 100644 machines/asus/wine/default.nix

diff --git a/machines/asus/default.nix b/machines/asus/default.nix
index c28c306..45b3034 100644
--- a/machines/asus/default.nix
+++ b/machines/asus/default.nix
@@ -5,15 +5,11 @@
   ./docker
   ./firefox
   ./git
-  ./intellij
-  ./libreoffice
   ./neovim
   ./networkmanager
   ./nushell
   ./openttd
   ./pipewire
-  ./qbittorrent
-  ./wine
   ./xserver
 
   ./fonts.nix
diff --git a/machines/asus/intellij/default.nix b/machines/asus/intellij/default.nix
deleted file mode 100644
index 607d64f..0000000
--- a/machines/asus/intellij/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, packages, ... }:
-
-with pkgs.jetbrains; packages [
-    idea-ultimate
-]
diff --git a/machines/asus/libreoffice/default.nix b/machines/asus/libreoffice/default.nix
deleted file mode 100644
index 3e02418..0000000
--- a/machines/asus/libreoffice/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, packages, ... }:
-
-with pkgs; packages [
-  libreoffice
-  hunspellDicts.en_US
-  hunspellDicts.en_GB-ize
-]
diff --git a/machines/asus/packages.nix b/machines/asus/packages.nix
index 0c3ca4e..8f82bef 100644
--- a/machines/asus/packages.nix
+++ b/machines/asus/packages.nix
@@ -4,8 +4,14 @@ with pkgs; packages [
   bat
   htop
   neofetch
+  wine
 
-  lightly-qt
+  jetbrains.idea-ultimate
+  qbittorrent
+
+  libreoffice
+  hunspellDicts.en_US
+  hunspellDicts.en_GB-ize
 
   gcc
   go
@@ -24,4 +30,6 @@ with pkgs; packages [
   ]))
   virtualenv
   poetry
+
+  lightly-qt
 ]
diff --git a/machines/asus/qbittorrent/default.nix b/machines/asus/qbittorrent/default.nix
deleted file mode 100644
index 9536655..0000000
--- a/machines/asus/qbittorrent/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, packages, ... }:
-
-with pkgs; packages [
-    qbittorrent
-]
diff --git a/machines/asus/wine/default.nix b/machines/asus/wine/default.nix
deleted file mode 100644
index e5f49cf..0000000
--- a/machines/asus/wine/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, packages, ... }:
-
-with pkgs; packages [
-    wine
-]