Bitwarden broke and now stable 26.05

flake.nix

@@ -2,7 +2,8 @@
   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-26.05-darwin";
+      #      url = "github:nixos/nixpkgs/nixpkgs-unstable";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,7 +12,8 @@
       url = "github:nix-community/nixd";
     };
     darwin = {
-      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
+      #     url = "github:nix-darwin/nix-darwin";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew = {
@@ -40,6 +42,14 @@
     nix-vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions";
     };
+    catppuccin = {
+      url = "github:catppuccin/nix";
+    };
+
+    # mac-app-util doesn't work with OCLP installed on X86
+    # mac-app-util = {
+    #   url = "github:hraban/mac-app-util";
+    # };
   };
   outputs =
     {
@@ -55,7 +65,8 @@
       nixd,
       sops-nix,
       nix-vscode-extensions,
-
+      catppuccin,
+      ...
     }@inputs:
     let
       user = "olaf";
@@ -104,26 +115,19 @@
       mkLinuxApps = system: {
         "apply" = mkApp "apply" system;
         "build-switch" = mkApp "build-switch" system;
-        "copy-keys" = mkApp "copy-keys" system;
-        "create-keys" = mkApp "create-keys" system;
-        "check-keys" = mkApp "check-keys" system;
         "install" = mkApp "install" system;
       };
       mkDarwinApps = system: {
         "apply" = mkApp "apply" system;
         "build" = mkApp "build" system;
         "build-switch" = mkApp "build-switch" system;
-        "copy-keys" = mkApp "copy-keys" system;
-        "create-keys" = mkApp "create-keys" system;
-        "check-keys" = mkApp "check-keys" system;
         "rollback" = mkApp "rollback" system;
       };
     in
     {
       devShells = forAllSystems devShell;
       apps =
-        nixpkgs.lib.genAttrs linuxSystems mkLinuxApps
+        nixpkgs.lib.genAttrs linuxSystems mkLinuxApps // nixpkgs.lib.genAttrs darwinSystems mkDarwinApps;
-        // nixpkgs.lib.genAttrs darwinSystems mkDarwinApps;
 
       darwinConfigurations = nixpkgs.lib.genAttrs darwinSystems (
         system:
@@ -134,6 +138,7 @@
             #    sops-nix.nixosModules.sops
             home-manager.darwinModules.home-manager
             nix-homebrew.darwinModules.nix-homebrew
+            # mac-app-util.darwinModules.default
             {
               nix-homebrew = {
                 inherit user;
@@ -146,6 +151,11 @@
                 mutableTaps = false;
                 autoMigrate = true;
               };
+              home-manager.sharedModules = [
+                #                mac-app-util.homeManagerModules.default
+                catppuccin.homeModules.catppuccin
+
+              ];
             }
             ./hosts/darwin
           ];

hosts/config/emacs/emacs.el

@@ -0,0 +1,56 @@
+      (eval-when-compile
+        (require 'use-package))
+
+      ;; load some packages
+
+      (use-package company
+        :bind ("<C-tab>" . company-complete)
+        :diminish company-mode
+        :commands (company-mode global-company-mode)
+        :defer 1
+        :config
+        (global-company-mode))
+
+      (use-package counsel
+        :commands (counsel-descbinds)
+        :bind (([remap execute-extended-command] . counsel-M-x)
+               ("C-x C-f" . counsel-find-file)
+               ("C-c g" . counsel-git)
+               ("C-c j" . counsel-git-grep)
+               ("C-c k" . counsel-ag)
+               ("C-x l" . counsel-locate)
+               ("M-y" . counsel-yank-pop)))
+
+      (use-package flycheck
+        :defer 2
+        :config (global-flycheck-mode))
+
+      (use-package ivy
+        :defer 1
+        :bind (("C-c C-r" . ivy-resume)
+               ("C-x C-b" . ivy-switch-buffer)
+               :map ivy-minibuffer-map
+               ("C-j" . ivy-call))
+        :diminish ivy-mode
+        :commands ivy-mode
+        :config
+        (ivy-mode 1))
+
+      (use-package magit
+        :defer
+        :if (executable-find "git")
+        :bind (("C-x g" . magit-status)
+               ("C-x G" . magit-dispatch-popup))
+        :init
+        (setq magit-completing-read-function 'ivy-completing-read))
+
+      (use-package projectile
+        :commands projectile-mode
+        :bind-keymap ("C-c p" . projectile-command-map)
+        :defer 5
+        :config
+        (projectile-global-mode))
+
+
+
+(global-set-key (kbd "C-.") 'set-mark-command)

hosts/darwin/default.nix

@@ -39,7 +39,9 @@ in
         "https://nix-community.cachix.org"
         "https://cache.nixos.org"
       ];
-      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" 
+       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+       ];
     };
 
     gc = {
@@ -57,6 +59,17 @@ in
     '';
   };
 
+
+  users.groups= {
+    gidevelopert={
+      description="Git Common Rights";
+      gid=500;
+      name= "gitdeveloper";
+      members = [ "olaf" ] ;
+    };
+  };
+
+  users.knownGroups=["gitdeveloper"];
   # Turn off NIX_PATH warnings now that we're using flakes
   system.checks.verifyNixPath = false;
 
@@ -64,7 +77,19 @@ in
   environment.systemPackages =
     with pkgs;
     [
-      emacs-unstable
+    # Emacs with automatic package management from overlay
+        (emacsWithPackagesFromUsePackage {
+          config = ../config/emacs/emacs.el;
+          defaultInitFile = true;
+          package = emacs;
+          alwaysEnsure = true;
+          extraEmacsPackages = epkgs: with epkgs; [
+            magit
+            company
+            nix-mode
+            use-package
+          ];
+        })
     ]
     ++ (import ../../modules/shared/packages.nix { inherit pkgs; })
 

hosts/nixos/default.nix

@@ -62,7 +62,8 @@ in
         "https://nix-community.cachix.org"
         "https://cache.nixos.org"
       ];
-      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
     };
 
     package = pkgs.nix;
@@ -330,10 +331,24 @@ in
     jetbrains-mono
     font-awesome
     noto-fonts
-    noto-fonts-emoji
+    noto-fonts-color-emoji
   ];
 
   environment.systemPackages = with pkgs; [
+    # Emacs with automatic package management from overlay
+    (emacsWithPackagesFromUsePackage {
+      config = ../config/emacs/emacs.el;
+      defaultInitFile = true;
+      package = emacs-unstable;
+      alwaysEnsure = true;
+      extraEmacsPackages =
+        epkgs: with epkgs; [
+          magit
+          company
+          nix-mode
+          use-package
+        ];
+    })
     gitAndTools.gitFull
     inetutils
   ];

modules/darwin/casks.nix

@@ -2,72 +2,72 @@ _:
 
 [
   # Development Tools
-  "homebrew/cask/docker"
+  "arduino-ide"
+  "homebrew/cask/docker-desktop"
   "iterm2"
   "oracle-jdk"
-  "arduino-ide"
   "visual-studio-code"
 
   # Creatative tools
-  "spotify"
   "blender"
   "gimp"
   "inkscape"
   "vcv-rack"
-  "affinity-designer"
+  #"affinity-designer"
-  "affinity-photo"
+  #"affinity-photo"
-  "affinity-publisher"
+  #"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"
+  "daisydisk"
-  "spamsieve"
-  "keybase"
   "karabiner-elements"
+  "keybase"
+  "spamsieve"
+  "syncthing-app"
+  "synology-drive"
 
   # Entertainment Tools
-  "vlc"
+   "qobuz"
+   "steam"
+  "handbrake-app"
   "jellyfin-media-player"
-  "vimediamanager"
   "mediaelch"
-  "handbrake"
   "obs"
+  "vimediamanager"  
+  "vlc"
 
   # Productivity Tools
   "1Password"
-  "zotero"
+  "bitwarden"
-  "gpg-suite"
-  "home-assistant"
-  "Fantastical"
-  "Remarkable"
-  "mailmate"
-  "spamsieve"
-  "libreoffice"
-  "macdown"
   "calibre"
-  "superslicer"
-  "element"
-  "mqtt-explorer"
-  "virtualbox"
-  "autodesk-fusion"
-  "qmk-toolbox"
   "dbeaver-community"
-  "sqlitestudio"
+  "element"
+  "gpg-suite"
+  "macdown"
+  "mailmate"
+  "orcaslicer"
+  "remanager"
+  "qmk-toolbox"  
+  "smartsheet"
+  "spamsieve"
+#  "sqlitestudio" # Doesn't work without Rosetta
+  "virtualbox"
+  "copilot-cli"
 
-  "wireshark"
   # Browsers
-  "google-chrome"
+ 
-  "firefox"
+
 ]

modules/darwin/home-manager.nix

@@ -17,6 +17,7 @@ let
   additionalFiles = import ./files.nix { inherit user config pkgs; };
 in
 {
+
   imports = [
     ./dock
   ];
@@ -46,7 +47,23 @@ in
     # This message is safe to ignore. (https://github.com/dustinlyons/nixos-config/issues/83)
 
     masApps = {
-      "wireguard" = 1451685025;
+      "1Password for Safari" = 1569813296; # (8.10.82)
+      "Affinity Designer 2" = 1616831348;
+      "Affinity Photo 2: Image Editor" = 1616822987;
+      "Affinity Publisher 2" = 1606941598;
+      # "DaisyDisk" = 411643860; # (4.32)  # Don't use this, we need the official version that is not sandboxed
+      "Fantastical - Calendar" = 975937182;
+      "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)
+      ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
     };
   };
 
@@ -61,6 +78,7 @@ in
         ...
       }:
       {
+
         home = {
           enableNixpkgsReleaseCheck = false;
           packages = pkgs.callPackage ./packages.nix { };
@@ -68,12 +86,32 @@ in
             sharedFiles
             additionalFiles
             { "emacs-launcher.command".source = myEmacsLauncher; }
+
           ];
 
           stateVersion = "23.11";
         };
-        programs = { } // import ../shared/home-manager.nix { inherit config pkgs lib; };
+        programs = {
+        } // import ../shared/home-manager.nix { inherit config pkgs lib; };
 
+        catppuccin = {
+          autoEnable = true;
+          enable = true;
+          flavor = "mocha";
+        };
+
+        services = {
+          gpg-agent = {
+            enable = true;
+            enableSshSupport = true;
+            extraConfig = ''
+            default-cache-ttl 600
+            max-cache-ttl 7200 
+            pinentry-program /Users/olaf/.nix-profile/bin/pinentry-mac
+            '';
+          };
+        };
+        
         # Marked broken Oct 20, 2022 check later to remove this
         # https://github.com/nix-community/home-manager/issues/3344
         manual.manpages.enable = false;
@@ -89,23 +127,33 @@ in
         { path = "/System/Applications/Mail.app/"; }
         { path = "/Applications/MailMate.app/"; }
         { path = "/Applications/1Password.app/"; }
-        { path = "/Applications/Firefox.app/"; }
+        { path = "/Applications/Bitwarden.app"; }
+        { path = "/Applications/Calendar.app/"; }
+        { path = "/Applications/Notes.app/"; }
+        { path = "/run/current-system/Applications/Firefox.app/"; }
+
         { path = "/Applications/Slack.app/"; }
         {
           path = "/Applications/zoom.us.app/";
-          options = " -l Zooom";
+          options = " -l Zoom";
         }
         { path = "/System/Applications/Messages.app/"; }
 
         { path = "/Applications/iTerm.app/"; }
         { path = "/Applications/Fantastical.app/"; }
-        #        { path = "${pkgs.alacritty}/Applications/Alacritty.app/"; }
+        { path = "${pkgs.alacritty}/Applications/Alacritty.app/"; }
-        { path = "/Applications/Spotify.app/"; }
+        #        { 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/"; }
         { path = "/Applications/WhatsApp.app/"; }
+        { path = "/Applications/Ice\ Cubes.app/"; }
 
         {
           path = "/Applications/Jellyfin Media Player.app/";
@@ -118,8 +166,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 = "/Applications/";
           section = "others";

modules/nixos/home-manager.nix

@@ -8,7 +8,7 @@
 let
   user = "olaf";
   xdg_configHome = "/home/${user}/.config";
-  shared-programs = import ../shared/home-manager.nix { inherit config pkgs lib; };
+  shared-programs = import ../shared/home-manager.nix { inherit config pkgs lib;  };
   shared-files = import ../shared/files.nix { inherit config pkgs; };
 
   polybar-user_modules = builtins.readFile (

modules/nixos/packages.nix

@@ -1,18 +1,23 @@
 { pkgs }:
 
 with pkgs;
-let shared-packages = import ../shared/packages.nix { inherit pkgs; }; in
+let
-shared-packages ++ [
+  shared-packages = import ../shared/packages.nix { inherit pkgs; };
+in
+shared-packages
+++ [
 
   # Security and authentication
   yubikey-agent
   keepassxc
+  private-internet-access
 
   # App and package management
   appimage-run
   gnumake
   cmake
   home-manager
+  ansible
 
   # Media and design tools
   vlc
@@ -33,6 +38,9 @@ shared-packages ++ [
   postgresql
   libtool # for Emacs vterm
 
+  # System
+  istat-menus
+  
   # Screenshot and recording tools
   flameshot
 

modules/shared/config/emacs/init.el

@@ -1,142 +0,0 @@
-;; -------------------------
-;; Variable Declarations
-;; -------------------------
-(defvar org-config-file "~/.local/share/src/nixos-config/modules/shared/config/emacs/config.org")
-(defvar default-config-file "~/.emacs.d/default-config.org")
-(defvar default-config-url "https://git.kolkman.org/olaf/nixos-config_to_rule_them_all/raw/branch/main/modules/shared/config/emacs/config.org")
-
-;; -------------------------
-;; Package Manager Setup
-;; -------------------------
-(require 'package)
-(setq package-archives '(("melpa" . "https://melpa.org/packages/")
-                         ("gnu" . "http://elpa.gnu.org/packages/")))
-
-(unless (assoc-default "melpa" package-archives)
-  (message "Warning: MELPA source not found. Adding MELPA to package-archives.")
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
-(unless (assoc-default "org" package-archives)
-  (message "Warning: Org source not found. Adding Org to package-archives.")
-  (add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t))
-
-(setq package-enable-at-startup nil)
-
-;; -------------------------
-;; Use-Package Setup
-;; -------------------------
-(unless (package-installed-p 'use-package)
-  (package-initialize)
-  (if (package-install 'use-package)
-      (message "use-package installed successfully.")
-    (error "Error: Failed to install use-package."))
-  (setq use-package-verbose t)
-  (setq use-package-always-ensure t)
-  (require 'use-package))
-
-;; -------------------------
-;; Environment Variables Setup
-;; -------------------------
-(use-package exec-path-from-shell
-  :if (memq window-system '(mac ns x))
-  :config
-  (setq exec-path-from-shell-variables '("PATH" "GOPATH" "PNPM_HOME"))
-  (if (exec-path-from-shell-initialize)
-      (message "Environment variables initialized successfully.")
-    (error "Error: Failed to initialize environment variables.")))
-
-(when (daemonp)
-  (exec-path-from-shell-initialize))
-
-;; -------------------------
-;; Straight.el Setup
-;; -------------------------
-(setq straight-repository-branch "develop")
-(defvar bootstrap-version)
-(let ((bootstrap-file
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 6))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer
-        (url-retrieve-synchronously
-         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
-         'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (if (load bootstrap-file nil 'nomessage)
-      (message "Straight.el loaded successfully.")
-    (error "Error: Failed to load Straight.el.")))
-
-(setq straight-use-package-by-default t)
-(package-initialize)
-
-;; -------------------------
-;; Window and UI Setup
-;; -------------------------
-(defun dl/window-setup ()
-  (condition-case nil
-      (progn
-        (column-number-mode)
-        (scroll-bar-mode 0)
-        (menu-bar-mode -1)
-        (tool-bar-mode 0)
-        (winner-mode 1)
-        (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
-        (add-to-list 'default-frame-alist '(ns-appearance . dark))
-        (setq ns-use-proxy-icon nil)
-        (setq frame-title-format nil)
-        (message "Window and UI setup completed successfully."))
-    (error (message "Error occurred in Window and UI setup."))))
-(dl/window-setup)
-
-;; -------------------------
-;; Org Mode Setup
-;; -------------------------
-(defun dl/org-mode-setup ()
-  (condition-case nil
-      (progn
-        (org-indent-mode)
-        (variable-pitch-mode 1)
-        (auto-fill-mode 0)
-        (visual-line-mode 1)
-        (setq evil-auto-indent nil)
-        (message "Org mode setup completed successfully."))
-    (error (message "Error occurred in Org mode setup."))))
-
-(use-package org
-  :defer t
-  :hook (org-mode . dl/org-mode-setup)
-  :config
-  (setq org-edit-src-content-indentation 2
-        org-ellipsis " ▾"
-        org-hide-emphasis-markers t
-        org-hide-block-startup nil)
-  :bind (("C-c a" . org-agenda)))
-
-;; -------------------------
-;; Default Config Download
-;; -------------------------
-(defun dl/download-default-config ()
-  (condition-case nil
-      (progn
-        (unless (file-exists-p default-config-file)
-          (url-retrieve default-config-url
-                        (lambda (_status)
-                          ;; delete-region removes the HTTP headers from the downloaded content.
-                          (delete-region (point-min) (1+ url-http-end-of-headers))
-                          ;; save the contents of the buffer to the file.
-                          (write-file default-config-file)))
-          (message "Default configuration downloaded successfully.")))
-    (error (message "Error occurred while downloading the default configuration."))))
-
-;; -------------------------
-;; Load Org Config or Default
-;; -------------------------
-(condition-case nil
-    (progn
-      (unless (file-exists-p org-config-file)
-        (dl/download-default-config))
-      (if (file-exists-p org-config-file)
-          (org-babel-load-file org-config-file)
-        (org-babel-load-file default-config-file))
-      (message "Configuration loaded successfully."))
-  (error (message "Error occurred while loading the configuration.")))

modules/shared/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "06413w510jmld20i4lik9b36cfafm501864yq8k4vxl5r4hn0j0h";
+  emacsOverlaySha256 = "1hr951gdyqymb1rlkpxb09cx02a6h99sd9fsk7744hvqsdpz5hd6";
 in
 {
   home-manager.backupFileExtension = "nix-backup";
@@ -11,6 +11,9 @@ in
       allowBroken = true;
       allowInsecure = false;
       allowUnsupportedSystem = true;
+      permittedInsecurePackages = [
+        "electron-39.8.10"
+      ];
     };
 
     overlays =
@@ -22,7 +25,7 @@ in
                   (attrNames (readDir path)))
 
       ++ [(import (builtins.fetchTarball {
-               url = "https://github.com/dustinlyons/emacs-overlay/archive/refs/heads/master.tar.gz";
+               url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
                sha256 = emacsOverlaySha256;
            }))];
   };

modules/shared/files.nix

@@ -9,8 +9,4 @@
   #   text = githubPublicKey;
   # };
 
-  # Initializes Emacs with org-mode so we can tangle the main config
-  ".emacs.d/init.el" = {
-    text = builtins.readFile ../shared/config/emacs/init.el;
-  };
 }

modules/shared/home-manager.nix

@@ -11,6 +11,16 @@ let
 in
 {
 
+  gpg = {
+    enable = true;
+    settings = {
+      default-key = "01B157D574FEDBB2" ;
+      no-emit-version = true;
+      auto-key-retrieve = true;
+      personal-digest-preferences= "SHA512 SHA384 SHA256 SHA224";
+    };
+  };
+
 
   # Shared shell configuration
   zsh = {
@@ -34,6 +44,10 @@ in
             . /nix/var/nix/profiles/default/etc/profile.d/nix.sh
           fi
 
+
+          # GPGAgent for SSH
+          export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
           # Define variables for directories
           export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH
           export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH
@@ -88,12 +102,11 @@ in
   git = {
     enable = true;
     ignores = [ "*.swp" ];
-    userName = name;
+
-    userEmail = email;
     lfs = {
       enable = true;
     };
-    extraConfig = {
+    settings = {
       init.defaultBranch = "main";
       core = {
         editor = "vim";
@@ -102,6 +115,15 @@ in
       commit.gpgsign = false;
       pull.rebase = true;
       rebase.autoStash = true;
+      user = {
+        name = name;
+        email = email;
+      };
+    };
+    signing = {
+      format = "openpgp";
+      key = null;
+      signByDefault = true;
     };
   };
 
@@ -289,27 +311,31 @@ in
 
   ssh = {
     enable = true;
-    includes = [
+
-      (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
+    enableDefaultConfig = false;
-      (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
+    settings= {
-    ];
+      "*" = {
-    matchBlocks = {
+        forwardAgent = false;
-      "Host *" = {
+        addKeysToAgent = "no";
-        identityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
+        compression = false;
-      };
+        serverAliveInterval = 0;
-      "github.com" = {
+        serverAliveCountMax = 3;
-        identitiesOnly = true;
+        hashKnownHosts = false;
-        identityFile = [
+        userKnownHostsFile = "~/.ssh/known_hosts";
-          (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/id_github")
+       controlMaster = "no";
-          (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/id_github")
+       controlPath = "~/.ssh/master-%r@%n:%p";
-        ];
+       controlPersist = "no";
       };
       "moonunit.kolkman.org" = {
         hostname = "moonunit.kolkman.org";
         user = "root";
         port = 2222;
-      };
+     };  
     };
+    includes = [
+      (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
+      (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
+    ];
   };
 
   tmux = {
@@ -395,4 +421,7 @@ in
       bind-key -T copy-mode-vi 'C-\' select-pane -l
     '';
   };
+
+
+
 }

modules/shared/packages-scratch

@@ -0,0 +1,39 @@
+(vscode-with-extensions.override {
+    vscodeExtensions =
+      with vscode-extensions;
+      [
+        #bbenoist.nix
+        jnoortheen.nix-ide
+        ms-python.python
+        ms-azuretools.vscode-docker
+        #        ms-vscode-remote.remote-ssh
+        # ms-vscode.cpptools
+        eamodio.gitlens
+
+      ]
+      ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        #        {
+        #          name = "remote-ssh-edit";
+        #          publisher = "ms-vscode-remote";
+        #          version = "0.47.2";
+        #          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+        #        }
+        {
+          name = "cpptools";
+          publisher = "ms-vscode";
+          version = "1.26.1";
+          sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0=";
+        }
+        #        {
+        #          name = "minifyall";
+        #          publisher = "josee9988";
+        #          version = "2.10";
+        #        }
+        {
+          name = "platformio-ide";
+          publisher = "platformio";
+          version = "3.3.4";
+          sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
+        }
+      ];
+  })

modules/shared/packages.nix

@@ -4,81 +4,151 @@ with pkgs;
 [
   # Nix
   nixd
+  mas
+
+  # The Web Browsers
+  brave
+  firefox
+  #  google-chrome. #stopped working
+
+  # security and some such
+  # bitwarden-desktop #Does not compile properly
+  bitwarden-cli
+  yubikey-manager # provides ykman
+  pinentry_mac
+
   # General packages for development and system management
-  #alacritty
+  alacritty
+  ansible
   aspell
   aspellDicts.en
   bash-completion
   bat
   btop
   coreutils
+  difftastic
+  htop
   killall
-  neofetch
+  minicom
+  mtr
+  ncdu
+  fastfetch
+  nixfmt
   openssh
+  postgresql
   sqlite
+  unrar
   wget
   zip
-  htop
+
-  ncdu
-  mtr
-  nixfmt-rfc-style
-  difftastic
   # 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
   # Encryption and security tools
   age
-  sops
   gnupg
+  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
+  #   jetbrains-mono
   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.npm # globally install npm
-  nodePackages.prettier
+  #nodePackages.prettier
-  nodejs
 
   # Text and terminal utilities
+  xterm
+
   htop
   hunspell
   iftop
-  jetbrains-mono
+  inetutils # includes Telnet
   jq
   ripgrep
-  tree
   tmux
+  tree
   unrar
   unzip
-  rmapi
+
   #  zsh-powerlevel10k
 
   # Python packages
-  python3
+  # python3
   virtualenv
 
+  (python3.withPackages (
+    python-pkgs: with python-pkgs; [
+      bidict
+      blinker
+      certifi
+      charset-normalizer
+      click
+      flask
+      flask-socketio
+      h11
+      idna
+      importlib-metadata
+      itsdangerous
+      jinja2
+      markupsafe
+      mercantile
+      mlx-lm
+      numpy
+      pandas
+      pillow
+      pillow
+      python-engineio
+      python-socketio
+      requests
+      requests
+      shapely
+      simple-websocket
+      tkinter
+      tqdm
+      urllib3
+      werkzeug
+      wsproto
+      zipp
+    ]
+  ))
+
+  # LLM
+  ollama
+   
+
+
+  # Social
+  pidgin
+
   # Rust Related
   rustc
   cargo
@@ -87,7 +157,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
@@ -124,31 +194,61 @@ with pkgs;
   #      ];
   #  })
 
-  # Tex and LaTex
+  # XML, Tex and LaTex
-  pandoc
+
   mdbook
+  pandoc
+  rubyPackages_3_4.kramdown-rfc2629
+  tex-fmt
+  xml2rfc
+  zotero
 
   (texlive.combine {
     inherit (texlive)
       apa6
+      apa7
+      apacite
+      biber
+      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
       ;