Bitwarden broke and now stable 26.05

flake.nix

@@ -2,8 +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";
+      #      url = "github:nixos/nixpkgs/nixpkgs-unstable";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -12,7 +12,8 @@
       url = "github:nix-community/nixd";
     };
     darwin = {
-      url = "github:nix-darwin/nix-darwin";
+      #     url = "github:nix-darwin/nix-darwin";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew = {
@@ -41,7 +42,7 @@
     nix-vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions";
     };
-    catppuccin= {
+    catppuccin = {
       url = "github:catppuccin/nix";
     };
 
@@ -126,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:
@@ -152,7 +152,7 @@
                 autoMigrate = true;
               };
               home-manager.sharedModules = [
-#                mac-app-util.homeManagerModules.default
+                #                mac-app-util.homeManagerModules.default
                 catppuccin.homeModules.catppuccin
 
               ];

modules/darwin/casks.nix

@@ -27,6 +27,7 @@ _:
 
 
   # Utility Tools
+
   "blackhole-16ch"
   "blackhole-2ch"
   "box-drive"
@@ -50,6 +51,7 @@ _:
 
   # Productivity Tools
   "1Password"
+  "bitwarden"
   "calibre"
   "dbeaver-community"
   "element"

modules/darwin/home-manager.nix

@@ -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 = "/Applications/Nix\ Apps/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 = "1hr951gdyqymb1rlkpxb09cx02a6h99sd9fsk7744hvqsdpz5hd6";
 in
 {
   home-manager.backupFileExtension = "nix-backup";
@@ -11,6 +11,9 @@ in
       allowBroken = true;
       allowInsecure = false;
       allowUnsupportedSystem = true;
+      permittedInsecurePackages = [
+        "electron-39.8.10"
+      ];
     };
 
     overlays =

modules/shared/home-manager.nix

@@ -313,7 +313,8 @@ in
     enable = true;
 
     enableDefaultConfig = false;
-    matchBlocks."*" = {
+    settings= {
+      "*" = {
         forwardAgent = false;
         addKeysToAgent = "no";
         compression = false;
@@ -325,17 +326,16 @@ in
        controlPath = "~/.ssh/master-%r@%n:%p";
        controlPersist = "no";
       };
-    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;
      };  
     };
+    includes = [
+      (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
+      (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
+    ];
   };
 
   tmux = {

modules/shared/packages.nix

@@ -12,8 +12,8 @@ with pkgs;
   #  google-chrome. #stopped working
 
   # security and some such
-  bitwarden-desktop
+  # bitwarden-desktop #Does not compile properly
-  #  bitwarden-cli
+  bitwarden-cli
   yubikey-manager # provides ykman
   pinentry_mac
 
@@ -143,7 +143,7 @@ with pkgs;
 
   # LLM
   ollama
-  mlx42  
+   
 
 
   # Social