smg1024/nix-darwin
1
0
Fork 0
mirror of https://github.com/smg1024/nix-darwin.git synced 2026-05-22 20:32:59 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

build(nix-25.05-update): update nix 25.05 root primary user

Browse source
This commit is contained in:
Sangmin Kim 2025-06-07 16:10:27 +09:00
parent 1b5fb79416
commit 13cd31c338
3 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744478979, "lastModified": 1748149228,
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "43975d782b418ebf4969e9ccba82466728c2851b", "rev": "a9939228f661df370c4094fe85f683e45d761dbe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1748186667,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1748186667,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
modules/apps.nix
View file

@ -23,9 +23,6 @@
fastfetch fastfetch
gh gh
lsd lsd
jdk
jdk17
jdk11
mkalias mkalias
python310 python310
tldr tldr
@ -47,7 +44,6 @@
jetbrains.idea-ultimate jetbrains.idea-ultimate
ice-bar ice-bar
keka keka
postman
raycast raycast
rectangle rectangle
slack slack
@ -91,9 +87,11 @@
brews = [ brews = [
"wget" "wget"
"curl" # do not install curl via nixpkgs, it's not working well on macOS! "curl" # do not install curl via nixpkgs, it's not working well on macOS!
"node" "nvm"
"uv" "uv"
"pipx" "openjdk"
"openjdk@21"
"openjdk@17"
]; ];
# `brew install --cask` # `brew install --cask`
@ -111,6 +109,16 @@
"readdle-spark" "readdle-spark"
"shottr" "shottr"
"brave-browser" "brave-browser"
# Fonts
"font-fontawesome"
"font-jetbrains-mono-nerd-font"
"font-meslo-lg-nerd-font"
"font-d2coding"
"font-fira-code-nerd-font"
"font-symbols-only-nerd-font"
"font-material-design-icons-webfont"
"font-pretendard"
]; ];
}; };
} }

34
modules/system.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, username, ... }:
################################################################################### ###################################################################################
# #
@ -12,18 +12,14 @@
################################################################################### ###################################################################################
{ {
system = { system = {
stateVersion = 5; primaryUser = username;
stateVersion = 6;
# activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`.
activationScripts.postUserActivation.text = '' activationScripts.extraActivation.text = ''
# activateSettings -u will reload the settings from the database and apply them to the current session, # activateSettings -u will reload the settings from the database and apply them to the current session,
# so we do not need to logout and login again to make the changes take effect. # so we do not need to logout and login again to make the changes take effect.
/System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u sudo -u ${username} /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
'';
activationScripts.extraActivation.text = ''
ln -sf "${pkgs.jdk11}/zulu-11.jdk" "/Library/Java/JavaVirtualMachines/"
ln -sf "${pkgs.jdk17}/zulu-17.jdk" "/Library/Java/JavaVirtualMachines/"
ln -sf "${pkgs.jdk}/zulu-21.jdk" "/Library/Java/JavaVirtualMachines/"
''; '';
activationScripts.applications.text = let activationScripts.applications.text = let
@ -231,7 +227,7 @@
filecount="find . -type f | wc -l"; filecount="find . -type f | wc -l";
cat = "bat --color=always"; cat = "bat --color=always";
man = "tldr"; man = "tldr";
nixrebuild = "darwin-rebuild switch --flake ~/.config/nix-darwin"; nixrebuild = "sudo darwin-rebuild switch --flake ~/.config/nix-darwin";
nixupgrade = "cd ~/.config/nix-darwin && nix flake update"; nixupgrade = "cd ~/.config/nix-darwin && nix flake update";
nixconfig = "code ~/.config/nix-darwin"; nixconfig = "code ~/.config/nix-darwin";
sshconfig = "code ~/.ssh/config"; sshconfig = "code ~/.ssh/config";
@ -251,20 +247,4 @@
# Set your time zone. # Set your time zone.
time.timeZone = "Asia/Seoul"; time.timeZone = "Asia/Seoul";
# Fonts
fonts = {
packages = with pkgs; [
# icon fonts
material-design-icons
font-awesome
# nerdfonts
nerd-fonts.symbols-only
nerd-fonts.meslo-lg
nerd-fonts.d2coding
nerd-fonts.fira-code
nerd-fonts.jetbrains-mono
];
};
} }