From b0dd25be754d203cac5b989dcdb482ad839b7053 Mon Sep 17 00:00:00 2001
From: pompydev <pompydev@proton.me>
Date: Sun, 29 Sep 2024 10:31:34 +0900
Subject: [PATCH] reorder configs

---
 configuration.nix | 209 +++++++++++++++++++++++-----------------------
 1 file changed, 105 insertions(+), 104 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 50e6614..7411eb7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,10 +15,6 @@
     inputs.home-manager.nixosModules.default
   ];
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
   nix.settings = {
     substituters = [
       "https://nix-community.cachix.org"
@@ -29,6 +25,11 @@
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
     ];
+
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
   };
   home-manager = {
     users = {
@@ -36,6 +37,106 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    # Desktop
+    gnomeExtensions.bluetooth-battery-meter
+    gnomeExtensions.appindicator
+    gnomeExtensions.pop-shell
+    nautilus-open-any-terminal
+
+    # Icons & Themes
+    papirus-icon-theme
+    pop-gtk-theme
+
+    # Fonts
+    meslo-lgs-nf
+    ubuntu-sans-mono
+    noto-fonts-cjk-sans
+    terminus-nerdfont
+    nerdfonts
+
+    # Shell
+    zsh
+    fzf-zsh
+    fzf
+    eza
+    atuin
+
+    # Dev
+    btop
+    nvitop
+    just
+    bun
+    nodejs_latest
+    deno
+    git
+    pnpm
+    go
+    rustup
+    yarn
+    yarn-berry
+    zig
+    tree
+    nixd
+    nixfmt-rfc-style
+    vim
+    kitty
+    vscodium
+    zed-editor
+    virtualbox
+    jetbrains-toolbox
+    pgadmin4
+    pgadmin4-desktopmode
+
+    # Gaming
+    gamemode
+    osu-lazer-bin
+    steam
+
+    # Browsers
+    brave
+    mullvad-browser
+
+    # Communication
+    kiwitalk
+    slack
+    discord
+    vesktop
+
+    # Media
+    obs-studio
+    vlc
+    gimp
+    kdePackages.kdenlive
+    blender
+
+    # Configuration & Monitor
+    dconf-editor
+    mission-center
+    resources
+    gnome-tweaks
+    baobab
+    gnome-disk-utility
+    polychromatic
+
+    # Misc
+    nautilus
+    opentabletdriver
+    appimage-run
+    anytype
+    rustdesk
+    collision
+    open-webui
+    gnupg
+    pinentry
+    protonvpn-gui
+    file-roller
+    font-manager
+    gparted
+    menulibre
+    gpa
+  ];
+
   # User & Shell
   programs.zsh.enable = true;
   users.users.pomp = {
@@ -135,106 +236,6 @@
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
-  environment.systemPackages = with pkgs; [
-    # System / Component
-    gnomeExtensions.bluetooth-battery-meter
-    gnomeExtensions.appindicator
-    gnomeExtensions.pop-shell
-    nautilus-open-any-terminal
-    papirus-icon-theme
-    pop-gtk-theme
-    file-roller
-    gnupg
-    pinentry
-    protonvpn-gui
-
-    # fonts
-    meslo-lgs-nf
-    ubuntu-sans-mono
-    noto-fonts-cjk-sans
-    terminus-nerdfont
-    nerdfonts
-
-    # shell
-    fzf-zsh
-    fzf
-    eza
-    btop
-    atuin
-    zsh
-
-    # System / GUI Util
-    font-manager
-    gnome-tweaks
-    dconf-editor
-    mission-center
-    resources
-    gparted
-    menulibre
-    gpa
-
-    # CLI / Dev
-    just
-    bun
-    nodejs_latest
-    deno
-    git
-    pnpm
-    go
-    rustup
-    yarn
-    yarn-berry
-    zig
-    tree
-    nixd
-    nixfmt-rfc-style
-    nvitop
-
-    # Applications / Browser
-    brave
-    mullvad-browser
-
-    # Applications / Communication
-    kiwitalk
-    slack
-    discord
-    vesktop
-
-    # Applications / Media
-    obs-studio
-    vlc
-    gimp
-    kdePackages.kdenlive
-    blender
-
-    # Applications / Dev
-    vim
-    kitty
-    vscodium
-    zed-editor
-    virtualbox
-    jetbrains-toolbox
-    pgadmin4
-    pgadmin4-desktopmode
-
-    # Applications / Misc
-    nautilus
-    opentabletdriver
-    appimage-run
-    anytype
-    rustdesk
-    polychromatic
-    collision
-    baobab
-    gnome-disk-utility
-    open-webui
-
-    # Gaming
-    gamemode
-    osu-lazer-bin
-    steam
-  ];
-
   services.open-webui.enable = true;
   services.ollama = {
     enable = true;