move order

flake.nix

@@ -2,7 +2,7 @@
   description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin";
+      url = "github:nixos/nixpkgs//nixpkgs-25.11-darwin";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,7 +11,7 @@
       url = "github:nix-community/nixd";
     };
     darwin = {
-      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew = {

hosts/nixos/default.nix

@@ -330,7 +330,7 @@ in
     jetbrains-mono
     font-awesome
     noto-fonts
-    noto-fonts-emoji
+    noto-fonts-color-emoji
   ];
 
   environment.systemPackages = with pkgs; [

modules/darwin/casks.nix

@@ -2,10 +2,10 @@ _:
 
 [
   # Development Tools
-  "homebrew/cask/docker"
+  "arduino-ide"
+  "homebrew/cask/docker-desktop"
   "iterm2"
   "oracle-jdk"
-  "arduino-ide"
   "visual-studio-code"
 
   # Creatative tools
@@ -18,59 +18,50 @@ _:
   #"affinity-publisher"
 
   # Communication Tools
+  "adium"
   "discord"
-  #  "slack"
   "signal"
+  "webex"
   "whatsapp"
   "zoom"
-  "webex"
+
 
   # Utility Tools
-  "syncthing"
   "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"
-  "obs"
    "qobuz"
    "steam"
+  "handbrake-app"
+  "jellyfin-media-player"
+  "mediaelch"
+  "obs"
+  "vimediamanager"  
+  "vlc"
 
   # Productivity Tools
   "1Password"
-  #"zotero"
-  "gpg-suite"
-  #"home-assistant"
-  #"Fantastical"
-  #"Remarkable"
-  "mailmate"
-  "spamsieve"
-  "macdown"
   "calibre"
-  # "superslicer" # Removed in favor of OrcaSlicer
-  "orcaslicer"
-  "element"
-  #  "mqtt-explorer"
-  "virtualbox"
- # "autodesk-fusion" #fails to install
-  "qmk-toolbox"
   "dbeaver-community"
+  "element"
+  "gpg-suite"
+  "macdown"
+  "mailmate"
+  "orcaslicer"
+  "qmk-toolbox"
+  "spamsieve"
   "sqlitestudio"
+  "virtualbox"
 
-  # "wireshark"
   # Browsers
-  "google-chrome"
-  "firefox"
-
+ 
 
 ]

modules/darwin/home-manager.nix

@@ -55,8 +55,10 @@ in
       "Home Assistant" = 1099568401; # (2025.7.1)
       "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
       "LibreOffice" = 1630474372;
+      "Monal - XMPP Chatting "=1637078500; #
       "MQTT Explorer" = 1455214828; # (0.3.5)
       "Night Sky" = 475772902; # 475772902
+      "Native SQLite Manager"= 1416282836; #  (1.31.0)
       "Remarkable Desktop" = 1276493162; # (3.19.0)
       "Slack for Desktop" = 803453959; # (4.45.60)
       "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
@@ -103,7 +105,9 @@ 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 = "/Applications/Slack.app/"; }
         {
           path = "/Applications/zoom.us.app/";
@@ -117,6 +121,8 @@ in
         #        { path = "/Applications/Spotify.app/"; }
         { path = "/Applications/Qobuz.app/"; }
         { path = "/System/Volumes/Preboot/Cryptexes/App/System/Applications/Safari.app/"; }
+        { path = "/run/current-system/Applications/Brave Browser.app/";
+                 options = "-l Brave"; }
         { path = "/System/Applications/Photos.app/"; }
         { path = "/System/Applications/System Settings.app/"; }
         { path = "/Applications/Signal.app/"; }
@@ -134,9 +140,10 @@ in
         { path = "/Applications/Microsoft Word.app/"; }
         { path = "/Applications/Microsoft PowerPoint.app/"; }
         { path = "/Applications/Microsoft Teams.app/"; }
+        { path = "/Applications/Monal.app/"; }
         { path = "/System/Applications/Utilities/Screen Sharing.app/"; }
         { path = "/run/current-system/Applications/Emacs.app/"; }
-        { path = "/run/current-system/Applications/Zotero.app/"; }
+        { path = "/run/current-system/Applications/Zotero.app"; }
         {
           path = "/Applications/";
           section = "others";

modules/shared/home-manager.nix

@@ -88,12 +88,11 @@ in
   git = {
     enable = true;
     ignores = [ "*.swp" ];
-    userName = name;
-    userEmail = email;
+
     lfs = {
       enable = true;
     };
-    extraConfig = {
+    settings = {
       init.defaultBranch = "main";
       core = {
         editor = "vim";
@@ -102,6 +101,10 @@ in
       commit.gpgsign = false;
       pull.rebase = true;
       rebase.autoStash = true;
+      user = {
+        name = name;
+        email = email;
+      };
     };
   };
 

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,75 +20,78 @@ 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
-  noto-fonts
-  noto-fonts-emoji
   meslo-lgs-nf
+  noto-fonts
+  noto-fonts-color-emoji
 
   # Node.js development tools
   nodePackages.npm # globally install npm
   nodePackages.prettier
-  nodejs
+
 
   # Text and terminal utilities
-  xquartz
   xterm 
   
   htop
   hunspell
   iftop
+  inetutils # includes Telnet
   jetbrains-mono
   jq
   ripgrep
-  tree
   tmux
+  tree
   unrar
   unzip
-  inetutils # includes Telnet
   
   #  zsh-powerlevel10k
 
@@ -95,9 +102,11 @@ with pkgs;
       pandas
       requests
       tkinter
+
   ]))
 
-
+# Social 
+pidgin
 
   # Rust Related
   rustc
@@ -107,7 +116,7 @@ with pkgs;
   #  (vscode-with-extensions.override {
   #    vscodeExtensions =
   #      with vscode-extensions;
-  #      [
+  #      [https://github.com/dustinlyons/nixos-config/
   #        #bbenoist.nix
   #        jnoortheen.nix-ide
   #        ms-python.python
@@ -145,38 +154,60 @@ with pkgs;
   #  })
 
   # 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)
       apa6
+      apa7
+      apacite
       biber
-      biblatex-apa6
       biblatex
+      biblatex-apa6
       bibunits
+      catchfile
+      comment
+      courier
+      csquotes
       draftwatermark
+      endfloat
       enumitem
+      fancyhdr
       fontawesome5
+      footmisc
       footnotehyper
+      geometry
       ifmtarg
+      latexmk
+      lipsum
       lualatex-math
       makecell
       microtype
+      multirow
+      nowidow
       parskip
+      ragged2e
+      scalerel
       scheme-small
       selnolig
       sourcesanspro
+      svg
       tcolorbox
       texcount
       threeparttable
       tikzfill
+      titlesec
       titling
+      tocloft
+      transparent
       upquote
+      url
       xifthen
       xurl
       ;