From 5e1932a2b3bb07ab6a25561aea344ae74028f387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Thu, 4 Jul 2024 21:26:15 +0200
Subject: [PATCH] Tidy package list

---
 home/packages/default.nix | 92 ++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 50 deletions(-)

diff --git a/home/packages/default.nix b/home/packages/default.nix
index d371062..e2eeda1 100644
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -1,89 +1,72 @@
 { pkgs, osConfig, ... }:
 let
-  my-pomodoro = pkgs.callPackage ../../packages/open-pomodoro.nix { };
   withCuda = if (osConfig.system.name == "gunter") then true else false;
 in
 {
   home.packages = with pkgs; [
-    # My own packages
-    my-pomodoro
-
-    # Generic tools
+    # CLI utils 
     age
-    alacritty
     bat
-    # btop
-    (btop.override {
-      cudaSupport = withCuda;
-    })
     bzip2
     croc
+    devenv
     distrobox
     dust
     easyeffects
     eza
     fd
-    feh
     ffmpeg
     file
     fzf
-    go-task
     glib
+    go-task
     grimblast
+    ijq
     incus
     jq
-    ijq
     kitty
     kubectl
-    krita
     ncdu
-    nwg-look
-    mumble
-    mpv
     nvd
-    pamixer
+    nwg-look
     pinentry
     pre-commit
-    (prismlauncher.override {
-      withWaylandGLFW = true;
-    })
     pulseaudio
     pulsemixer
     rbw
     restic
     ripgrep
-    rofi-rbw-wayland
     sops
-    spotify
-    spicetify-cli
     sshfs
     tldr
-    devenv
-    ventoy
-    virt-manager
-    discord
-    zoxide
-
-    # k8s tools
-    talosctl
-    k9s
-    cilium-cli
-    kubernetes-helm
-    cmctl
-    krew
-
-    # steam
-    # steam-run
-    # steamcmd
-    # gamescope
     tokei
     unzip
+    ventoy
+    zoxide
+
+    # Non-CLI stuff
+    alacritty
+    discord
+    feh
+    krita
+    mpv
+    mumble
+    pamixer
+    rofi-rbw-wayland
+    spicetify-cli
+    spotify
+    virt-manager
+    vmware-horizon-client
     yt-dlp
     zoom-us
-    vmware-horizon-client
 
-    # Editors
-    # vscode
+    # k8s tools
+    cilium-cli
+    cmctl
+    k9s
+    krew
+    kubernetes-helm
+    talosctl
 
     # Go stuff
     go
@@ -108,13 +91,22 @@ in
     cargo
     rust-analyzer
 
-    # blender
-    (blender.override {
-      cudaSupport = withCuda;
-    })
-
     # Homemade shit
     ghettoptt
     huecli
+
+    # Stuff with overrides
+    # Blender
+    (blender.override {
+      cudaSupport = withCuda;
+    })
+    # Btop
+    (btop.override {
+      cudaSupport = withCuda;
+    })
+    # PrismLauncher
+    (prismlauncher.override {
+      withWaylandGLFW = true;
+    })
   ];
 }