Required updates for newer version of beets

common/configuration.nix

@@ -25,6 +25,20 @@ in
         config.allowUnfree = true;
       };
     })
+    # https://discourse.nixos.org/t/dolphin-does-not-have-mime-associations/48985/14
+    # https://github.com/rumboon/dolphin-overlay/blob/main/default.nix
+    (final: prev: {
+      kdePackages = prev.kdePackages.overrideScope (kfinal: kprev: {
+        dolphin = kprev.dolphin.overrideAttrs (oldAttrs: {
+          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [ prev.makeWrapper ];
+          postInstall = (oldAttrs.postInstall or "") + ''
+        wrapProgram $out/bin/dolphin \
+            --set XDG_CONFIG_DIRS "${prev.libsForQt5.kservice}/etc/xdg:$XDG_CONFIG_DIRS" \
+            --run "${kprev.kservice}/bin/kbuildsycoca6 --noincremental ${prev.libsForQt5.kservice}/etc/xdg/menus/applications.menu"
+      '';
+        });
+      });
+    })
   ] ++ import ./overlays.nix inputs ++ [
     inputs.emacs-overlay.overlays.default
   ];

common/development-machine.nix

@@ -12,6 +12,8 @@
     zstd.dev
     zstd.out
 
+    godot
+
     devenv
 
     racket
@@ -21,8 +23,8 @@
     lldb
     mold
     lld
-    clang-tools # clangd, clang-format
+    clang-tools_16 # clangd, clang-format
-    llvmPackages.libllvm
+    llvmPackages_16.libllvm
     bear
     rr
     valgrind

common/user-facing.nix

@@ -58,6 +58,7 @@
     packages = with pkgs; [
       roboto-mono
       noto-fonts
+      noto-fonts-extra
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       commit-mono
@@ -67,7 +68,7 @@
   environment.systemPackages = with pkgs; [
     update.firefox
     update.google-chrome
-    bitwarden-desktop
+    bitwarden
     vlc
     mpv
     obs-studio

flake.lock

@@ -8,11 +8,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1765729484,
+        "lastModified": 1754929898,
-        "narHash": "sha256-exsMvinnpTWm+lZiq8RucYejmS605EP8uny/32KzlE8=",
+        "narHash": "sha256-QkKnm58KMyb0ki5F+hdPC9SP18Q2t9It58xRgBFrLdE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "60f44dfc7fedf818666436d3b341858a400e31e0",
+        "rev": "6d0695fbc0800c0d9073db9cf52294179ee2aa3c",
         "type": "github"
       },
       "original": {
@@ -63,16 +63,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1765605144,
+        "lastModified": 1753592768,
-        "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -117,32 +117,32 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765608474,
+        "lastModified": 1754767907,
-        "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
+        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
+        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1765363881,
+        "lastModified": 1750330365,
-        "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
+        "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
+        "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -176,11 +176,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1765472234,
+        "lastModified": 1763966396,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
         "type": "github"
       },
       "original": {
@@ -192,16 +192,16 @@
     },
     "update": {
       "locked": {
-        "lastModified": 1765608474,
+        "lastModified": 1754767907,
-        "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
+        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
+        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,14 +1,14 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    update.url = "github:nixos/nixpkgs/nixos-25.11";
+    update.url = "github:nixos/nixpkgs/nixos-25.05";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay = {

home/users/benson.nix

@@ -107,8 +107,6 @@
       passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
 
       mu.enable = true;
-
-      mujmap.enable = true;
     };
   };
 

hosts/NixDawn/configuration.nix

@@ -8,8 +8,7 @@
     ../../common/configuration.nix
     ../../common/user-facing.nix
     ../../common/development-machine.nix
-    # Unmaintained
+    ../../common/lxd-setup.nix
-    # ../../common/lxd-setup.nix
     ../../common/moms-house
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -79,12 +78,10 @@
     fwupd.enable = true;
 
     logind = {
-      settings = {
+      extraConfig = ''
-        Login = {
+        IdleAction=hybrid-sleep
-          IdleAction = "hybrid-sleep";
+        IdleActionSec=30min
-          IdleActionSec = "30min";
+      '';
-        };
-      };
     };
 
     apcupsd = {
@@ -145,7 +142,7 @@
     # unstable.rustdesk
     tarsnap
     # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } )
-    clasp-common-lisp
+    clasp
     leiningen
     supercollider-with-sc3-plugins
   ];

submodules/beets-config

@@ -1 +1 @@
-Subproject commit ae7e236072bcc0fc7d7bd3ca58bc0ad5cff0fdd2
+Subproject commit 2c8225b986dfd503cc3e5ce82d8105ccd2a57131