emacs hash - remove bitwarden-cli

flake.nix

@@ -2,7 +2,8 @@
   description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs//nixpkgs-25.11-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.11";
+      #     url = "github:nix-darwin/nix-darwin";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew = {
@@ -40,14 +42,14 @@
     nix-vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions";
     };
-    catppuccin= {
+    catppuccin = {
       url = "github:catppuccin/nix";
     };
 
-   # mac-app-util doesn't work with OCLP installed on X86 
+    # mac-app-util doesn't work with OCLP installed on X86
-   # mac-app-util = {
+    # mac-app-util = {
-   #   url = "github:hraban/mac-app-util";
+    #   url = "github:hraban/mac-app-util";
-   # };
+    # };
   };
   outputs =
     {
@@ -125,8 +127,7 @@
     {
       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:
@@ -151,7 +152,7 @@
                 autoMigrate = true;
               };
               home-manager.sharedModules = [
-#                mac-app-util.homeManagerModules.default
+                #                mac-app-util.homeManagerModules.default
                 catppuccin.homeModules.catppuccin
 
               ];

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 = {
@@ -79,7 +81,7 @@ in
         (emacsWithPackagesFromUsePackage {
           config = ../config/emacs/emacs.el;
           defaultInitFile = true;
-          package = emacs-unstable;
+          package = emacs;
           alwaysEnsure = true;
           extraEmacsPackages = epkgs: with epkgs; [
             magit

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;

modules/darwin/casks.nix

@@ -27,10 +27,12 @@ _:
 
 
   # Utility Tools
+
   "blackhole-16ch"
   "blackhole-2ch"
   "box-drive"
   "box-tools"
+  "daisydisk"
   "karabiner-elements"
   "keybase"
   "spamsieve"
@@ -49,6 +51,7 @@ _:
 
   # Productivity Tools
   "1Password"
+  "bitwarden"
   "calibre"
   "dbeaver-community"
   "element"
@@ -56,6 +59,7 @@ _:
   "macdown"
   "mailmate"
   "orcaslicer"
+  "remanager"
   "qmk-toolbox"  
   "smartsheet"
   "spamsieve"

modules/darwin/home-manager.nix

@@ -51,7 +51,7 @@ in
       "Affinity Designer 2" = 1616831348;
       "Affinity Photo 2: Image Editor" = 1616822987;
       "Affinity Publisher 2" = 1606941598;
-      "DaisyDisk" = 411643860; # (4.32)
+      # "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)
@@ -95,6 +95,7 @@ in
         } // import ../shared/home-manager.nix { inherit config pkgs lib; };
 
         catppuccin = {
+          autoEnable = true;
           enable = true;
           flavor = "mocha";
         };
@@ -126,7 +127,7 @@ in
         { path = "/System/Applications/Mail.app/"; }
         { path = "/Applications/MailMate.app/"; }
         { path = "/Applications/1Password.app/"; }
-        { path = "/run/current-system/Applications/Bitwarden.app/"; }
+        { path = "/Applications/Bitwarden.app"; }
         { path = "/Applications/Calendar.app/"; }
         { path = "/Applications/Notes.app/"; }
         { path = "/run/current-system/Applications/Firefox.app/"; }

modules/shared/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "11p1c1l04zrn8dd5w8zyzlv172z05dwi9avbckav4d5fk043m754";
+  emacsOverlaySha256 = "1znsmrj68k1asv154ckw3yqllpwqd77452zm31yjv7zdk8gdj2nw";
 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/home-manager.nix

@@ -313,29 +313,29 @@ in
     enable = true;
 
     enableDefaultConfig = false;
-    matchBlocks."*" = {
+    settings= {
-      forwardAgent = false;
+      "*" = {
-      addKeysToAgent = "no";
+        forwardAgent = false;
-      compression = false;
+        addKeysToAgent = "no";
-      serverAliveInterval = 0;
+        compression = false;
-      serverAliveCountMax = 3;
+        serverAliveInterval = 0;
-      hashKnownHosts = false;
+        serverAliveCountMax = 3;
-      userKnownHostsFile = "~/.ssh/known_hosts";
+        hashKnownHosts = false;
-      controlMaster = "no";
+        userKnownHostsFile = "~/.ssh/known_hosts";
-      controlPath = "~/.ssh/master-%r@%n:%p";
+       controlMaster = "no";
-      controlPersist = "no";
+       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")
     ];
-    matchBlocks = {
-     "moonunit.kolkman.org" = {
-        hostname = "moonunit.kolkman.org";
-        user = "root";
-        port = 2222;
-      };
-    };
   };
 
   tmux = {

modules/shared/packages.nix

@@ -9,12 +9,12 @@ with pkgs;
   # The Web Browsers
   brave
   firefox
-#  google-chrome. #stopped working
+  #  google-chrome. #stopped working
 
   # security and some such
-  bitwarden-desktop
+  # bitwarden-desktop #Does not compile properly
-#  bitwarden-cli
+  # bitwarden-cli # Fails on i386
-  yubikey-manager   # provides ykman
+  yubikey-manager # provides ykman
   pinentry_mac
 
   # General packages for development and system management
@@ -32,8 +32,8 @@ with pkgs;
   minicom
   mtr
   ncdu
-  neofetch
+  fastfetch
-  nixfmt-rfc-style
+  nixfmt
   openssh
   postgresql
   sqlite
@@ -51,14 +51,13 @@ with pkgs;
   cmake
   dfu-util
   go
-  jd-diff-patch #json diff patch
+  jd-diff-patch # json diff patch
   jq # json tool
   llvm
   nasm
   ninja
   pkg-config
 
-
   # Encryption and security tools
   age
   gnupg
@@ -76,15 +75,15 @@ with pkgs;
   fd
   ffmpeg
   font-awesome
+  #   jetbrains-mono
   hack-font
   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
-
 
   # Text and terminal utilities
   xterm
@@ -92,8 +91,7 @@ with pkgs;
   htop
   hunspell
   iftop
-#  inetutils # includes Telnet
+  inetutils # includes Telnet
-  jetbrains-mono
   jq
   ripgrep
   tmux
@@ -107,21 +105,49 @@ with pkgs;
   # python3
   virtualenv
 
-  
+  (python3.withPackages (
-
+    python-pkgs: with python-pkgs; [
- (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
    
 
-# LLM
-ollama
 
-# Social 
+  # Social
-pidgin
+  pidgin
 
   # Rust Related
   rustc