From 5d811f88ad25303995bd6cb532064a098da76385 Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Wed, 3 Dec 2025 12:59:29 +0100
Subject: [PATCH] sorting and minicom

---
 modules/darwin/casks.nix        | 47 ++++++++++++--------------
 modules/darwin/home-manager.nix |  5 ++-
 modules/shared/packages.nix     | 60 +++++++++++++++++++--------------
 3 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index cc16ed7..55d4f61 100644
--- a/modules/darwin/casks.nix
+++ b/modules/darwin/casks.nix
@@ -2,10 +2,10 @@ _:
 
 [
   # Development Tools
+  "arduino-ide"
   "homebrew/cask/docker-desktop"
   "iterm2"
   "oracle-jdk"
-  "arduino-ide"
   "visual-studio-code"
 
   # Creatative tools
@@ -20,51 +20,48 @@ _:
   # Communication Tools
   "adium"
   "discord"
-  #  "slack"
   "signal"
+  "webex"
   "whatsapp"
   "zoom"
-  "webex"
+
 
   # Utility Tools
-  "syncthing-app"
   "blackhole-16ch"
   "blackhole-2ch"
   "box-drive"
   "box-tools"
-  "synology-drive"
-  "spamsieve"
-  "keybase"
   "karabiner-elements"
+  "keybase"
+  "spamsieve"
+  "syncthing-app"
+  "synology-drive"
 
   # Entertainment Tools
-  "vlc"
-  "jellyfin-media-player"
-  "vimediamanager"  
-  "mediaelch"
-  "handbrake-app"
-  "obs"
    "qobuz"
    "steam"
+  "handbrake-app"
+  "jellyfin-media-player"
+  "mediaelch"
+  "obs"
+  "vimediamanager"  
+  "vlc"
 
   # Productivity Tools
   "1Password"
-  "gpg-suite"
-  "mailmate"
-  "spamsieve"
-  "macdown"
   "calibre"
-  "orcaslicer"
-  "element"
-  "virtualbox"
-  "qmk-toolbox"
   "dbeaver-community"
+  "element"
+  "gpg-suite"
+  "macdown"
+  "mailmate"
+  "orcaslicer"
+  "qmk-toolbox"
+  "spamsieve"
   "sqlitestudio"
+  "virtualbox"
 
   # Browsers
-  "google-chrome"
-  "firefox"
-  "tor-browser"
-
+ 
 
 ]
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index 19b8bed..dd77ed8 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -105,7 +105,10 @@ in
         { path = "/System/Applications/Mail.app/"; }
         { path = "/Applications/MailMate.app/"; }
         { path = "/Applications/1Password.app/"; }
-        { path = "/Applications/Firefox.app/"; }
+        
+        { path = "/run/current-system/Applications/Firefox.app/"; }
+        { path = "/run/current-system/Applications/Brave Browser.app/";
+         options = "-l Brave"; }
         { path = "/Applications/Slack.app/"; }
         {
           path = "/Applications/zoom.us.app/";
diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix
index 8e4dd10..1392ff4 100644
--- a/modules/shared/packages.nix
+++ b/modules/shared/packages.nix
@@ -6,6 +6,10 @@ with pkgs;
   nixd
   mas
 
+  # The Web Browsers
+  brave
+  firefox 
+  google-chrome
 
   # General packages for development and system management
   #alacritty
@@ -16,55 +20,58 @@ with pkgs;
   bat
   btop
   coreutils
+  difftastic
+  htop
   killall
+  minicom
+  mtr
+  ncdu
   neofetch
+  nixfmt-rfc-style
   openssh
   sqlite
   wget
   zip
-  htop
-  ncdu
-  mtr
-  nixfmt-rfc-style
-  difftastic
-  # Development
 
+  # Development
   act
   autoconf
   autoconf-archive
   automake
   ccache
+  clang-tools
   cmake
+  dfu-util
+  go
+  jd-diff-patch #json diff patch
+  jq # json tool
+  llvm
   nasm
   ninja
   pkg-config
-  llvm
-  clang-tools
-  dfu-util
-  go
-  jq # json tool
-  jd-diff-patch #json diff patch
+
+
   # Encryption and security tools
   age
-  sops
   gnupg
-  libfido2
   just
+  libfido2
+  sops
 
   # Cloud-related tools and SDKs
   docker
   docker-compose
 
   # Media-related packages
-  emacs-all-the-icons-fonts
   dejavu_fonts
-  ffmpeg
+  emacs-all-the-icons-fonts
   fd
+  ffmpeg
   font-awesome
   hack-font
+  meslo-lgs-nf
   noto-fonts
   noto-fonts-color-emoji
-  meslo-lgs-nf
 
   # Node.js development tools
   nodePackages.npm # globally install npm
@@ -77,14 +84,14 @@ with pkgs;
   htop
   hunspell
   iftop
+  inetutils # includes Telnet
   jetbrains-mono
   jq
   ripgrep
-  tree
   tmux
+  tree
   unrar
   unzip
-  inetutils # includes Telnet
   
   #  zsh-powerlevel10k
 
@@ -95,6 +102,7 @@ with pkgs;
       pandas
       requests
       tkinter
+
   ]))
 
 # Social 
@@ -146,13 +154,13 @@ pidgin
   #  })
 
   # XML, Tex and LaTex
-  pandoc
-  mdbook
-  xml2rfc
-  rubyPackages_3_4.kramdown-rfc2629
-  zotero
 
+  mdbook
+  pandoc
+  rubyPackages_3_4.kramdown-rfc2629
   tex-fmt
+  xml2rfc
+  zotero
 
   (texlive.combine {
     inherit (texlive)
@@ -160,8 +168,8 @@ pidgin
       apa7
       apacite
       biber
-      biblatex-apa6
       biblatex
+      biblatex-apa6
       bibunits
       catchfile
       comment
@@ -172,8 +180,8 @@ pidgin
       enumitem
       fancyhdr
       fontawesome5
-      footnotehyper
       footmisc
+      footnotehyper
       geometry
       ifmtarg
       latexmk