From bdbf702929a3bfae32269fe28016f9e0b01dd64a Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 20 May 2025 15:20:16 -0700 Subject: [PATCH] darwin: 25.05 update --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 6 +++--- home/darwin/default.nix | 2 +- home/profiles/cli/default.nix | 4 +++- hosts/darwin/default.nix | 7 ++++--- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index d172b238..c380a312 100644 --- a/flake.lock +++ b/flake.lock @@ -110,16 +110,16 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", - "owner": "LnL7", + "lastModified": 1747752302, + "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", + "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", "type": "github" }, "original": { - "owner": "LnL7", - "ref": "master", + "owner": "nix-darwin", + "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } @@ -496,16 +496,16 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -770,16 +770,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 23a7c2c7..1d868f39 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; @@ -36,7 +36,7 @@ # OSX darwin = { - url = "github:LnL7/nix-darwin/master"; + url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-homebrew = { diff --git a/home/darwin/default.nix b/home/darwin/default.nix index c6f7e130..eb3ba43b 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -14,7 +14,7 @@ home.homeDirectory = "/Users/anishlakhwara"; home.stateVersion = "22.05"; - programs.zsh.initExtra = '' + programs.zsh.initContent = '' PATH=/Users/anishlakhwara/.sourcegraph/bin:/Users/anishlakhwara/.sourcegraph/sg.zsh_autocomplete:/Users/anishlakhwara/google-cloud-sdk/bin:/Users/anishlakhwara/google-cloud-sdk/completion.zsh.inc:/Users/anishlakhwara/google-cloud-sdk/path.zsh.inc:/Users/anishlakhwara/.sg:/opt/homebrew/bin:$PATH ''; diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index de1c6b65..0d2b86ca 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -65,6 +65,8 @@ taskwarrior-tui zk diffnav + jj + git-spice # llms (needs 24.11) aider-chat @@ -137,7 +139,7 @@ enableCompletion = true; autosuggestion.enable = false; - initExtra = '' + initContent = '' bindkey -v autopair-init ''; diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix index bf037e46..817f9ab2 100644 --- a/hosts/darwin/default.nix +++ b/hosts/darwin/default.nix @@ -44,8 +44,8 @@ }; }; + system.primaryUser = "anishlakhwara"; # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; nixpkgs.hostPlatform = "aarch64-darwin"; programs.zsh.enable = true; @@ -55,7 +55,6 @@ settings.trusted-users = [ "@admin" "anishlakhwara" ]; gc = { - user = "root"; automatic = true; interval = { Weekday = 0; Hour = 2; Minute = 0; }; options = "--delete-older-than 30d"; @@ -85,7 +84,9 @@ siji font-awesome proggyfonts - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; }) + nerd-fonts.fira-code + nerd-fonts.droid-sans-mono + nerd-fonts.iosevka ]; system = {