Upgrade to 25.05HEADmain

13 files changed, 44 insertions, 44 deletions

diff --git a/flake.lock b/flake.lock
index 9f2f627..d23cf58 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1745630506,
-        "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
+        "lastModified": 1747575206,
+        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "96e078c646b711aee04b82ba01aefbff87004ded",
+        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
         "type": "github"
       },
       "original": {
@@ -151,16 +151,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747331121,
-        "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -172,43 +172,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1741126078,
-        "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
+        "lastModified": 1748044287,
+        "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "c172f50b55b087f8e7801631de977461603bb976",
+        "rev": "2456ff5c95edfc3b197cb012b947012faed77591",
         "type": "github"
       },
       "original": {
         "owner": "LnL7",
-        "ref": "nix-darwin-24.11",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1748026106,
+        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1742751914,
-        "narHash": "sha256-G//YHkdXeW8I8SjhANbTFgmAaUvb0n2qeLcs+KKsQdE=",
+        "lastModified": 1748173519,
+        "narHash": "sha256-lFeGoidhN/GTnW05VrXGZlTOAepPRnrYIx1YFU0MtUs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "57e0d726d3d7b3543ab743eadd09aad608e1aa6e",
+        "rev": "b47c95c381aafc0efe28a8d9638cec546654384f",
         "type": "github"
       },
       "original": {
@@ -248,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727814191,
-        "narHash": "sha256-ABLkHkIpz+DC+XDv40tx4o6tq3h0QcbqT+4MVe4C/Gg=",
+        "lastModified": 1747500400,
+        "narHash": "sha256-ekaxTLMkLFKWOYUW0iBFbtFrkJswn42hC3M8AZgGdyI=",
         "owner": "linnnus",
         "repo": "push-notification-api",
-        "rev": "4457cb2ea67409f1cf406fbd0ac28be93e50f164",
+        "rev": "159d3a361dc346ef31be37c557adb67dfe105447",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ccd7440..68fb87b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,17 @@
 {
   inputs = {
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-24.11";
+      url = "github:NixOS/nixpkgs/nixos-25.05";
     };
     nixpkgs-unstable = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-darwin = {
-      url = "github:LnL7/nix-darwin/nix-darwin-24.11";
+      url = "github:LnL7/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     agenix = {
diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix
index 12dbef8..e0c510a 100644
--- a/hosts/muhammed/configuration.nix
+++ b/hosts/muhammed/configuration.nix
@@ -18,9 +18,6 @@
   # See: https://cohost.org/fullmoon/post/1728807-nix-s-tarball-ttl-op
   nix.settings.tarball-ttl = 604800;
 
-  # Use the Nix daemon.
-  services.nix-daemon.enable = true;
-
   # Set up main account.
   users.users.linus = {
     description = "Personal user account";
@@ -42,7 +39,7 @@
 
   # Let's use fingerprint to authenticate sudo. Very useful as an indicator of
   # when darwin-rebuild is finished...
-  security.pam.enableSudoTouchIdAuth = true;
+  security.pam.services.sudo_local.touchIdAuth = true;
 
   # Don't request password for running pmset.
   environment.etc."sudoers.d/10-unauthenticated-commands".text = let
diff --git a/hosts/muhammed/syncthing.nix b/hosts/muhammed/syncthing.nix
index 7e1bc29..50e5e3f 100644
--- a/hosts/muhammed/syncthing.nix
+++ b/hosts/muhammed/syncthing.nix
@@ -23,8 +23,6 @@
     key = config.age.secrets.syncthing-key.path;
     cert = config.age.secrets.syncthing-cert.path;
 
-    openDefaultPorts = true;
-
     settings = {
       folders = {
         "ebooks" = {
diff --git a/modules/home-manager/iterm2/default.nix b/modules/home-manager/iterm2/default.nix
index 4788e1d..bd5edfb 100644
--- a/modules/home-manager/iterm2/default.nix
+++ b/modules/home-manager/iterm2/default.nix
@@ -53,7 +53,7 @@ in {
       "/Library/Preferences/com.googlecode.iterm2.plist".text = toPlist {} cfg.config;
     };
 
-    programs.zsh.initExtra = mkIf cfg.shellIntegration.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.shellIntegration.enableZshIntegration ''
       # Added by home-manager because programs.iterm2.enableZshIntegration == true.
       source "${cfg.package}"/Applications/iTerm2.app/Contents/Resources/iterm2_shell_integration.zsh
     '';
diff --git a/pkgs/pbv/default.nix b/pkgs/pbv/default.nix
index c61e021..9d62d34 100644
--- a/pkgs/pbv/default.nix
+++ b/pkgs/pbv/default.nix
@@ -18,7 +18,6 @@ swiftPackages.stdenv.mkDerivation {
   buildInputs = [
     swiftPackages.swift
     xcbuild
-    swiftPackages.apple_sdk.frameworks.Cocoa
   ];
 
   installPhase = ''
diff --git a/pkgs/still-awake/default.nix b/pkgs/still-awake/default.nix
index 4bcd3ca..a383896 100644
--- a/pkgs/still-awake/default.nix
+++ b/pkgs/still-awake/default.nix
@@ -1,10 +1,10 @@
 {
   stdenv,
-  pypy3,
+  python3,
   lib,
 }: let
   # Needs python interpreter with tkinter support.
-  python3' = pypy3;
+  python3' = python3.withPackages (ps: [ps.tkinter]);
 in
   stdenv.mkDerivation {
     pname = "still-awake";
diff --git a/pkgs/still-awake/test.py b/pkgs/still-awake/test.py
new file mode 100644
index 0000000..0e49d2d
--- /dev/null
+++ b/pkgs/still-awake/test.py
@@ -0,0 +1,8 @@
+from tkinter import *
+from tkinter import ttk
+root = Tk()
+frm = ttk.Frame(root, padding=10)
+frm.grid()
+ttk.Label(frm, text="Hello World!").grid(column=0, row=0)
+ttk.Button(frm, text="Quit", command=root.destroy).grid(column=1, row=0)
+root.mainloop()
diff --git a/pkgs/trash/default.nix b/pkgs/trash/default.nix
index d71a209..de63805 100644
--- a/pkgs/trash/default.nix
+++ b/pkgs/trash/default.nix
@@ -17,9 +17,6 @@ stdenv.mkDerivation rec {
   };
   patches = [./trash-dont-hardcode-arch.patch];
   buildInputs = [
-    darwin.apple_sdk.frameworks.Cocoa
-    darwin.apple_sdk.frameworks.AppKit
-    darwin.apple_sdk.frameworks.ScriptingBridge
     perl538Packages.podlators
   ];
 
diff --git a/shared/home-manager/javascript/default.nix b/shared/home-manager/javascript/default.nix
index b5fa0e8..d3d1870 100644
--- a/shared/home-manager/javascript/default.nix
+++ b/shared/home-manager/javascript/default.nix
@@ -2,7 +2,8 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     unstable.deno
-    unstable.nodejs_latest
+    nodejs_latest
+    yarn
   ];
 
   programs.neovim.extraLuaConfig = ''
diff --git a/shared/home-manager/zsh/default.nix b/shared/home-manager/zsh/default.nix
index 13ba312..52ade39 100644
--- a/shared/home-manager/zsh/default.nix
+++ b/shared/home-manager/zsh/default.nix
@@ -12,7 +12,7 @@
     dotDir = ".config/zsh";
     history.path = config.xdg.cacheHome + "/zsh/history";
 
-    initExtra = ''
+    initContent = ''
       set -o PROMPTSUBST
       if [ -v NVIM -o -v VIM ]; then
         # smol prompt
diff --git a/shared/home-manager/zsh/editing.nix b/shared/home-manager/zsh/editing.nix
index 241ef3c..c3321dc 100644
--- a/shared/home-manager/zsh/editing.nix
+++ b/shared/home-manager/zsh/editing.nix
@@ -25,7 +25,7 @@ in {
 
     plugins = map (p: removeAttrs p ["config"]) plugins;
 
-    initExtra = ''
+    initContent = ''
       # Set up external editing by pressing '!' in normal mode.
       autoload -z edit-command-line
       zle -N edit-command-line
diff --git a/shared/home-manager/zsh/plugins.nix b/shared/home-manager/zsh/plugins.nix
index b1cfdfb..cc979dc 100644
--- a/shared/home-manager/zsh/plugins.nix
+++ b/shared/home-manager/zsh/plugins.nix
@@ -42,7 +42,7 @@ in {
   programs.zsh = {
     plugins = map (p: removeAttrs p ["config"]) plugins;
 
-    initExtra = concatStringsSep "\n" (catAttrs "config" plugins);
+    initContent = concatStringsSep "\n" (catAttrs "config" plugins);
   };
 
   programs.direnv = {