From 4e3b12a9951157f2a9ae14fd0266de77df6c1c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C4=83t=C4=83lin?= <catalin@roboces.dev>
Date: Thu, 11 Jun 2026 17:12:22 +0200
Subject: [PATCH] split system packages

---
 hosts/limgrave/nixos/default.nix          |  8 +-
 hosts/limgrave/nixos/flatpaks.nix         |  7 +-
 hosts/limgrave/nixos/packages.nix         | 89 -----------------------
 hosts/limgrave/nixos/packages/cli.nix     | 53 ++++++++++++++
 hosts/limgrave/nixos/packages/gui.nix     | 14 ++++
 hosts/limgrave/nixos/packages/pandora.nix |  3 +
 hosts/limgrave/nixos/packages/rice.nix    | 10 +++
 hosts/limgrave/nixos/packages/system.nix  | 14 ++++
 8 files changed, 103 insertions(+), 95 deletions(-)
 delete mode 100644 hosts/limgrave/nixos/packages.nix
 create mode 100644 hosts/limgrave/nixos/packages/cli.nix
 create mode 100644 hosts/limgrave/nixos/packages/gui.nix
 create mode 100644 hosts/limgrave/nixos/packages/pandora.nix
 create mode 100644 hosts/limgrave/nixos/packages/rice.nix
 create mode 100644 hosts/limgrave/nixos/packages/system.nix

diff --git a/hosts/limgrave/nixos/default.nix b/hosts/limgrave/nixos/default.nix
index 360a784..400f6bb 100644
--- a/hosts/limgrave/nixos/default.nix
+++ b/hosts/limgrave/nixos/default.nix
@@ -175,7 +175,13 @@
             NIXOS_OZONE_WL = "1";
         };
 
-        systemPackages = import ./packages.nix pkgs;
+        systemPackages = with pkgs; (
+          import ./packages/system.nix pkgs
+          ++ import ./packages/cli.nix pkgs
+          ++ import ./packages/gui.nix pkgs
+          ++ import ./packages/rice.nix pkgs
+          ++ import ./packages/pandora.nix pkgs
+        );
           loginShellInit = ''
             [[ "$(tty)" = "/dev/tty1" ]] &&  ~/.dotfiles/conf.d/utils/gs.sh
           '';
diff --git a/hosts/limgrave/nixos/flatpaks.nix b/hosts/limgrave/nixos/flatpaks.nix
index c954a75..4501f53 100644
--- a/hosts/limgrave/nixos/flatpaks.nix
+++ b/hosts/limgrave/nixos/flatpaks.nix
@@ -1,8 +1,4 @@
 [
-    "com.microsoft.Edge"
-    "dev.vencord.Vesktop"
-    "chat.revolt.RevoltDesktop"
-    "io.github.hkdb.Aerion"
     "io.github.mpobaschnig.Vaults"
     "com.bitwarden.desktop"
     "com.google.Chrome"
@@ -17,7 +13,8 @@
     "com.obsproject.Studio"
     "org.kde.kdenlive"
     "com.vysp3r.ProtonPlus"
-    "com.github.IsmaelMartinez.teams_for_linux"
     "io.github.Foldex.AdwSteamGtk"
     "io.github.seadve.Kooha"
+    "org.equicord.equibop"
+    "com.discordapp.Discord"
 ]
diff --git a/hosts/limgrave/nixos/packages.nix b/hosts/limgrave/nixos/packages.nix
deleted file mode 100644
index 5efe8e0..0000000
--- a/hosts/limgrave/nixos/packages.nix
+++ /dev/null
@@ -1,89 +0,0 @@
- pkgs: with pkgs; [
-    bat
-    git
-    neovim
-    jetbrains-toolbox
-    coder
-    kitty
-    steam
-    steam-run
-    mpv
-    gnumake
-    kubernetes-helm
-    opentofu
-    kubeseal
-    openssl
-    xclip
-    #resticprofile
-    gnupg
-    awscli2
-    kor
-    exiftool
-    gnome-themes-extra
-    hmcl
-    vlc
-    unrar-wrapper
-    atkinson-hyperlegible
-    libreoffice-qt
-    hunspell
-    hunspellDicts.es_ES
-    hunspellDicts.en_US
-    sqlite-interactive
-    ffmpeg
-    lrcget
-    yq
-    p7zip
-    ansible
-    k3sup
-    gamemode
-    lm_sensors
-    appimage-run
-    xcolor
-    samrewritten
-    protontricks
-    nmap
-    terragrunt
-    adwaita-icon-theme
-    ayugram-desktop
-    restic
-    pre-commit
-    cargo
-    inconsolata
-    k9s
-    kubectl
-    dotter
-    kubecolor
-    trash-cli
-    gnomeExtensions.appindicator
-    bruno
-    devenv
-    vim
-    direnv
-    marble-shell-theme
-    colloid-gtk-theme
-    colloid-icon-theme
-    sysprof
-    steam-run
-    streamlink
-    twitch-chat-downloader
-    jq
-    hmcl
-    tmux
-    atuin
-    tor
-    tor-browser
-    remmina
-    yt-dlp
-    mangohud
-    difftastic
-    libheif
-    ffmpegthumbnailer
-    signal-desktop
-    tflint
-    kubeconform
-    shellcheck
-    ncdu
-    python3
-    poetry
-    pulumi
- ]
diff --git a/hosts/limgrave/nixos/packages/cli.nix b/hosts/limgrave/nixos/packages/cli.nix
new file mode 100644
index 0000000..347c95f
--- /dev/null
+++ b/hosts/limgrave/nixos/packages/cli.nix
@@ -0,0 +1,53 @@
+pkgs: with pkgs; [
+  kubectl
+  k9s
+  kubecolor
+  kubeseal
+  kubeconform
+  kubernetes-helm
+  k3sup
+
+  opentofu
+  tflint
+  terragrunt
+  ansible
+  pulumi
+  awscli2
+  yq
+
+  git
+  neovim
+  vim
+  bat
+  jq
+  tmux
+  direnv
+  cargo
+  python3
+  poetry
+  pre-commit
+  shellcheck
+  atuin
+  dotter
+  restic
+  kor
+  devenv
+
+  yt-dlp
+  streamlink
+  lrcget
+  exiftool
+  hunspell
+  hunspellDicts.es_ES
+  hunspellDicts.en_US
+
+  xclip
+  unrar-wrapper
+  p7zip
+  xcolor
+  trash-cli
+
+  steam-run
+  protontricks
+  mangohud
+]
\ No newline at end of file
diff --git a/hosts/limgrave/nixos/packages/gui.nix b/hosts/limgrave/nixos/packages/gui.nix
new file mode 100644
index 0000000..30ed56d
--- /dev/null
+++ b/hosts/limgrave/nixos/packages/gui.nix
@@ -0,0 +1,14 @@
+pkgs: with pkgs; [
+  steam
+  mpv
+  vlc
+  jetbrains-toolbox
+  coder
+  kitty
+  libreoffice-qt
+  signal-desktop
+  remmina
+  ayugram-desktop
+  tor-browser
+  samrewritten
+]
\ No newline at end of file
diff --git a/hosts/limgrave/nixos/packages/pandora.nix b/hosts/limgrave/nixos/packages/pandora.nix
new file mode 100644
index 0000000..7c5a36f
--- /dev/null
+++ b/hosts/limgrave/nixos/packages/pandora.nix
@@ -0,0 +1,3 @@
+pkgs: with pkgs; [
+  difftastic
+]
\ No newline at end of file
diff --git a/hosts/limgrave/nixos/packages/rice.nix b/hosts/limgrave/nixos/packages/rice.nix
new file mode 100644
index 0000000..a4ffcb7
--- /dev/null
+++ b/hosts/limgrave/nixos/packages/rice.nix
@@ -0,0 +1,10 @@
+pkgs: with pkgs; [
+  gnome-themes-extra
+  adwaita-icon-theme
+  atkinson-hyperlegible
+  inconsolata
+  marble-shell-theme
+  colloid-gtk-theme
+  colloid-icon-theme
+  gnomeExtensions.appindicator
+]
\ No newline at end of file
diff --git a/hosts/limgrave/nixos/packages/system.nix b/hosts/limgrave/nixos/packages/system.nix
new file mode 100644
index 0000000..b64ed65
--- /dev/null
+++ b/hosts/limgrave/nixos/packages/system.nix
@@ -0,0 +1,14 @@
+pkgs: with pkgs; [
+  openssl
+  gnupg
+  sqlite-interactive
+  ffmpeg
+  lm_sensors
+  nmap
+  gnumake
+  gamemode
+  libheif
+  ffmpegthumbnailer
+  appimage-run
+  sysprof
+]
\ No newline at end of file