diff --git a/flake.lock b/flake.lock index 4d26a88..5c9dd7d 100644 --- a/flake.lock +++ b/flake.lock @@ -171,16 +171,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1767634391, - "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=", - "owner": "LnL7", + "lastModified": 1768764703, + "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", + "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2", + "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", "type": "github" }, "original": { - "owner": "LnL7", - "ref": "nix-darwin-25.11", + "owner": "nix-darwin", + "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -1095,16 +1095,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764491476, - "narHash": "sha256-E4rtgPS7fntINb6fVJ5qQdkhfbZn8pzMYNdmiXqZmCo=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54f09efd2ca0dd5bb9c5fafc89573ab3ac44701d", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-25.11-darwin", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f78d24d..d46eda9 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - darwin.url = "github:LnL7/nix-darwin/nix-darwin-25.11"; + darwin.url = "github:nix-darwin/nix-darwin/master"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix index 1b52394..16fe14f 100644 --- a/packages/raspberrypi/linux-rpi/default.nix +++ b/packages/raspberrypi/linux-rpi/default.nix @@ -49,7 +49,7 @@ lib.overrideDerivation inherit modDirVersion; pname = "linux-rpi${toString rpiVersion}"; - src = sources.kernel; + src = sources.stable; defconfig = { diff --git a/packages/raspberrypi/raspberrypi-utils/version.json b/packages/raspberrypi/raspberrypi-utils/version.json index 7c9fca3..e7c6393 100644 --- a/packages/raspberrypi/raspberrypi-utils/version.json +++ b/packages/raspberrypi/raspberrypi-utils/version.json @@ -6,7 +6,7 @@ "owner": "raspberrypi", "repo": "utils", "rev": "f0ceb02829c3f8349b53633747527f4e2e5c0ae7", - "hash": "sha256-6sN2Wi0Y826EENMmGcPzOxyHoPtDGFfTsxnoH+cofWA=" + "hash": "sha256-uY5W0M6ygY2LxOA4k3JEphhaveRa46c055JvGfsLWZo=" } } } diff --git a/systems/aarch64-darwin/macbook-pro/homebrew.nix b/systems/aarch64-darwin/macbook-pro/homebrew.nix index 2cede8c..b56eabb 100644 --- a/systems/aarch64-darwin/macbook-pro/homebrew.nix +++ b/systems/aarch64-darwin/macbook-pro/homebrew.nix @@ -26,7 +26,7 @@ }; casks = [ "aldente" - "bartender" + # "bartender" "betterdisplay" "chromium" "discord" @@ -34,6 +34,7 @@ "gstreamer-runtime" "iterm2" "jagex" + "jordanbaird-ice" "kitty" "minecraft" "omnissa-horizon-client" diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix index 2be06b7..0dfef8f 100755 --- a/systems/aarch64-linux/pi4/default.nix +++ b/systems/aarch64-linux/pi4/default.nix @@ -95,4 +95,5 @@ isSystemUser = true; isNormalUser = false; }; + fileSystems."/etc".neededForBoot = true; } diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index 70db8f8..29a3bc9 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -135,6 +135,7 @@ # ################################################### boot.supportedFilesystems = [ "bcachefs" ]; + fileSystems."/etc".neededForBoot = true; fileSystems."/data" = { device = "/dev/disk/by-uuid/a85420cc-a026-4100-80d2-a999081d792a"; fsType = "bcachefs"; diff --git a/systems/x86_64-linux/nuc-nixos/default.nix b/systems/x86_64-linux/nuc-nixos/default.nix index 77455dc..0d2732d 100644 --- a/systems/x86_64-linux/nuc-nixos/default.nix +++ b/systems/x86_64-linux/nuc-nixos/default.nix @@ -4,8 +4,6 @@ ... }: { - - fileSystems."/etc".neededForBoot = true; # imports = [ ./hardware-configuration.nix ]; ${namespace} = { # ################################################### @@ -123,5 +121,6 @@ # ################################################### boot.kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-server-lto; + fileSystems."/etc".neededForBoot = true; }