From 126b92831acd5dbd145c961be7e0610f4d14b08e Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Sun, 31 May 2026 09:28:21 +0200
Subject: [PATCH] Bitwarden broke and now stable 26.05

---
 flake.nix                       | 24 +++++++++++-----------
 modules/darwin/casks.nix        |  2 ++
 modules/darwin/home-manager.nix |  3 ++-
 modules/shared/default.nix      |  5 ++++-
 modules/shared/home-manager.nix | 36 ++++++++++++++++-----------------
 modules/shared/packages.nix     |  6 +++---
 6 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2b29569..5202b4c 100644
--- a/flake.nix
+++ b/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-unstable";
+      url = "github:nixos/nixpkgs//nixpkgs-26.05-darwin";
+      #      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,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 = {
-   #   url = "github:hraban/mac-app-util";
-   # };
+    # mac-app-util doesn't work with OCLP installed on X86
+    # mac-app-util = {
+    #   url = "github:hraban/mac-app-util";
+    # };
   };
   outputs =
     {
@@ -64,7 +65,7 @@
       nixd,
       sops-nix,
       nix-vscode-extensions,
-      catppuccin, 
+      catppuccin,
       ...
     }@inputs:
     let
@@ -126,8 +127,7 @@
     {
       devShells = forAllSystems devShell;
       apps =
-        nixpkgs.lib.genAttrs linuxSystems mkLinuxApps
-        // nixpkgs.lib.genAttrs darwinSystems mkDarwinApps;
+        nixpkgs.lib.genAttrs linuxSystems mkLinuxApps // 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
 
               ];
diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index 4ee033f..7935d47 100644
--- a/modules/darwin/casks.nix
+++ b/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"
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index 141c419..d72c86a 100644
--- a/modules/darwin/home-manager.nix
+++ b/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/"; }
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index ecbd7e5..f8ffa5e 100644
--- a/modules/shared/default.nix
+++ b/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 =
diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix
index 061d14d..0780f4c 100644
--- a/modules/shared/home-manager.nix
+++ b/modules/shared/home-manager.nix
@@ -313,29 +313,29 @@ in
     enable = true;
 
     enableDefaultConfig = false;
-    matchBlocks."*" = {
-      forwardAgent = false;
-      addKeysToAgent = "no";
-      compression = false;
-      serverAliveInterval = 0;
-      serverAliveCountMax = 3;
-      hashKnownHosts = false;
-      userKnownHostsFile = "~/.ssh/known_hosts";
-      controlMaster = "no";
-      controlPath = "~/.ssh/master-%r@%n:%p";
-      controlPersist = "no";
+    settings= {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+       controlMaster = "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 = {
diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix
index 85ea3be..37c8ecf 100644
--- a/modules/shared/packages.nix
+++ b/modules/shared/packages.nix
@@ -12,8 +12,8 @@ with pkgs;
   #  google-chrome. #stopped working
 
   # security and some such
-  bitwarden-desktop
-  #  bitwarden-cli
+  # bitwarden-desktop #Does not compile properly
+  bitwarden-cli
   yubikey-manager # provides ykman
   pinentry_mac
 
@@ -143,7 +143,7 @@ with pkgs;
 
   # LLM
   ollama
-  mlx42  
+   
 
 
   # Social