From 083c83b14c8565a1d734e80f2e8d1faa779d566e Mon Sep 17 00:00:00 2001
From: Peter Stolz <50801264+PeterStolz@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:59:36 +0100
Subject: [PATCH] Order packages

---
 home-manager/fish.nix |  5 ++++-
 home-manager/home.nix | 52 ++++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index d43f409..0e49e7f 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -7,7 +7,10 @@
     set fish_greeting # Disable greeting
     set -gx GPG_TTY (tty)
     set -gx LD_LIBRARY_PATH $NIX_LD_LIBRARY_PATH
-  '';
+  '' + (if pkgs.stdenv.isDarwin then
+    ''
+    fish_add_path /opt/homebrew/bin
+  '' else "");
   shellAliases = {
     vim = "nvim";
     hm = "home-manager";
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 14215d5..2bdce3a 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,40 +9,42 @@ let
   username = builtins.getEnv "USER";
 
   commonPackages = with pkgs; [
-    pinentry-tty
-    python312Full
-    keepassxc
-    nixfmt-rfc-style
-    htop
-    kubectl
-    unzip
-    redis
+    ansible
+    argocd
+    cmctl
+    ctlptl
+    devbox
     dig
-    libargon2
-    hcloud
     ffmpeg_7
-    jq
-    devbox
     file
+    gh
     gnupg
-    opentofu
-    ansible
+    hadolint
+    hcloud
+    htop
+    imagemagick
+    jq
     k3d
-    linkerd
-    gh
+    keepassxc
+    kind
+    kubectl
     kubernetes-helm
-    s3cmd
-    tilt
-    postgresql_16
-    argocd
-    cmctl
+    libargon2
+    linkerd
     micromamba
-    imagemagick
-    hadolint
-    pre-commit
+    nix-index
+    nixfmt-rfc-style
     nodejs_20
+    opentofu
+    pinentry-tty
+    postgresql_16
+    pre-commit
+    python312Full
+    redis
+    s3cmd
+    tilt
+    unzip
     yarn
-    nix-index
   ];
 
   # Packages only available or relevant on Linux