Skip to content

Commit 9608bae

Browse files
committed
chore: upgrade to nixpkgs/nix-darwin/home-manager 25.05
Update all flake inputs from 24.11 to 25.05 and address breaking changes: - nix-darwin: Replace services.nix-daemon.enable with nix.enable - nix-darwin: Add system.primaryUser for new user management - nixpkgs: Update nerd-fonts syntax (nerdfonts.override → nerd-fonts.*) - nixpkgs: Fix package rename (darwin.iproute2mac → iproute2mac) - home-manager: Replace deprecated initExtra with initContent - nix-darwin: Remove deprecated configureBuildUsers option - overlays: Fix allowUnfree configuration for unstable packages
1 parent f85dcd2 commit 9608bae

File tree

8 files changed

+33
-36
lines changed

8 files changed

+33
-36
lines changed

flake.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
description = "refnode's Nix configurations";
33

44
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
5+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
66
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
7-
nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-24.11";
7+
nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
88
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
9-
home-manager.url = "github:nix-community/home-manager/release-24.11";
9+
home-manager.url = "github:nix-community/home-manager/release-25.05";
1010
home-manager.inputs.nixpkgs.follows = "nixpkgs";
1111
pre-commit-hooks.url = "github:cachix/git-hooks.nix";
1212
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";

hosts/common/core/fonts.nix

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
{pkgs, ...}: {
22
fonts = {
33
packages = [
4-
(pkgs.nerdfonts.override {
5-
fonts = [
6-
"JetBrainsMono"
7-
"Meslo"
8-
];
9-
})
4+
pkgs.nerd-fonts.jetbrains-mono
5+
pkgs.nerd-fonts.meslo-lg
106
];
117
};
128
}

hosts/common/core/nix.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
nix = {
33
# package = pkgs.nixVersions.nix_2_16;
44
checkConfig = true;
5-
configureBuildUsers = true;
65
settings = {
76
# Necessary for using flakes on this system.
87
experimental-features = [
@@ -28,6 +27,6 @@
2827
};
2928
};
3029

31-
# Auto upgrade nix package and the daemon service.
32-
services.nix-daemon.enable = true;
30+
# nix-darwin manages nix-daemon unconditionally when
31+
nix.enable = true;
3332
}

hosts/common/darwin/core/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
};
2323

2424
environment.systemPath = ["/opt/homebrew/bin"];
25+
26+
system.primaryUser = "refnode";
2527
}

overlays/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
unstable = import nixpkgs-unstable {
66
system = final.system;
77
# activate unfree when I know that I need it.
8-
config.allowUnfree = false;
8+
config.allowUnfree = true;
99
};
1010
};
1111
}

users/refnode/common/core/zsh/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
autosuggestion.enable = true;
3030
autosuggestion.highlight = "fg=#d8dee9,bg=#4c566a";
3131

32-
initExtra = builtins.readFile ./zsh.sh;
32+
initContent = builtins.readFile ./zsh.sh;
3333
};
3434

3535
# enable the fzf zsh integration by default history, file and directory

users/refnode/common/optional/desktop/darwin.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
...
66
}: {
77
home.packages = with pkgs; [
8-
darwin.iproute2mac
8+
iproute2mac
99
];
1010
}

0 commit comments

Comments
 (0)