diff --git a/flake.lock b/flake.lock index 17c2c16d..4281abae 100644 --- a/flake.lock +++ b/flake.lock @@ -43,15 +43,16 @@ ] }, "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", + "lastModified": 1739025120, + "narHash": "sha256-D16qN7opcPTNxtpO65STlRAD34DGZaG50aLny+YsHqc=", + "owner": "LnL7", "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", + "rev": "3f4351d233ddd48b19d6530463f7c4b4eca25d1a", "type": "github" }, "original": { - "owner": "lnl7", + "owner": "LnL7", + "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -64,11 +65,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738910045, - "narHash": "sha256-GG2e9+Zi892LJTECD9z4D99HywOzpvtQ2LrTsp4zhkg=", + "lastModified": 1738996274, + "narHash": "sha256-Xrpx/wxKnId4R7kR9c5Ro53QD6RWQZ3reBLgIZWTRug=", "owner": "nix-community", "repo": "fenix", - "rev": "bcae0353191b6033d300082df80e970438937820", + "rev": "09d396f370bd6c06386f82021162bb7f22023f97", "type": "github" }, "original": { @@ -463,11 +464,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738979878, - "narHash": "sha256-1P8Eq3nspI/EkS/ppDde9BwWEj0WZ8vOaiNrWsd53xE=", + "lastModified": 1739021622, + "narHash": "sha256-uiXBGkhA9nQFJHhWyhgp3NXRWqisUnJFO3/pa27Qe7E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0eccf247721298ea23349309b1963db253943c2f", + "rev": "fb4bbf7e6349850728cb519015f55ec5a0a481f9", "type": "github" }, "original": { @@ -479,11 +480,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738927596, - "narHash": "sha256-oZLdIlpBKY+WEJlKMafIUK+MBqddHreSeGc4b4yF1uU=", + "lastModified": 1738958807, + "narHash": "sha256-h0WKgHTLkjwjRNTkqByQquS7N/15SqIFMQ356Ww8uCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d", + "rev": "e8d0b02af0958823c955aaab3c82b03f54411d91", "type": "github" }, "original": { @@ -542,11 +543,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738754241, - "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", + "lastModified": 1738925138, + "narHash": "sha256-rQSG+cocqif/8Ddcd86JMah8BPfpbg/hXJbfGmylcnE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", + "rev": "039ac844f1c6ef78472f9790f2ff05376d3dcdbc", "type": "github" }, "original": { @@ -672,11 +673,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1738888193, - "narHash": "sha256-SFpXqgxC0LJmeaz/02GYmSDnL7GJssRIjArEBgO8zk8=", + "lastModified": 1739016609, + "narHash": "sha256-sSv3XLBOXux1dP4rJbmOzrCYm106VVES/dAhmKkcBqc=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "653b84cc366ecabe244c6aff9f12ce382623d775", + "rev": "a1740fede543291440cc71c3ae2a93285904db28", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 80d8c8e5..19e47d46 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin"; + url = "github:LnL7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; }; mac-app-util.url = "github:hraban/mac-app-util"; diff --git a/nix/darwin/apps.nix b/nix/darwin/apps.nix index ca9b4337..57c99267 100644 --- a/nix/darwin/apps.nix +++ b/nix/darwin/apps.nix @@ -2,13 +2,10 @@ { environment.systemPackages = with pkgs; [ raycast - vscode + # vscode logseq # brave ice-bar - man-pages - man-pages-posix - groff ]; homebrew = { diff --git a/nix/darwin/configuration.nix b/nix/darwin/configuration.nix index 5fa454e8..da7dde96 100644 --- a/nix/darwin/configuration.nix +++ b/nix/darwin/configuration.nix @@ -2,6 +2,7 @@ pkgs, username, config, + system, ... }: { @@ -17,7 +18,7 @@ home = "/Users/${username}"; shell = pkgs.fish; }; - + nixpkgs.hostPlatform = system; environment = { variables = { EDITOR = "${config.vars.editor}"; @@ -79,6 +80,7 @@ # for nix-direnv keep-outputs = true; keep-derivations = true; + sandbox = "relaxed"; # -- substituters = [ "https://dots.cachix.org" @@ -88,9 +90,7 @@ "https://cache.nixos.org" ]; trusted-users = [ - "root" - "@staff" - username + "${username}" ]; trusted-public-keys = [ "dots.cachix.org-1:H/gV3a5Ossrd/R+qrqrAk9tr3j51NHEB+pCTOk0OjYA=" @@ -100,10 +100,8 @@ ]; }; package = pkgs.nix; - gc = { + optimise = { automatic = true; - interval.Day = 7; - options = "--delete-older-than 7d"; }; extraOptions = '' # auto-optimise-store = true @@ -112,7 +110,7 @@ }; system = { - stateVersion = 4; + stateVersion = 6; defaults = { screencapture.location = "~/Pictures/Screenshots"; @@ -121,8 +119,5 @@ }; }; }; - documentation.enable = true; - programs.info.enable = true; - programs.man.enable = true; security.pam.enableSudoTouchIdAuth = true; } diff --git a/nix/hm/lazygit.nix b/nix/hm/lazygit.nix index 48ccdc61..955b853b 100644 --- a/nix/hm/lazygit.nix +++ b/nix/hm/lazygit.nix @@ -1,7 +1,8 @@ -{ ... }: +{ pkgs-stable, ... }: { # docs: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md programs.lazygit = { + package = pkgs-stable.lazygit; enable = true; settings = { gui = { diff --git a/nix/hm/starship.nix b/nix/hm/starship.nix index 1983dc58..5069b9ec 100644 --- a/nix/hm/starship.nix +++ b/nix/hm/starship.nix @@ -72,7 +72,7 @@ in show_always = false; }; nodejs = { - disabled = true; + disabled = false; format = "via [🤖 $version](bold green) "; }; direnv = { diff --git a/nix/home.nix b/nix/home.nix index c653e0ea..60846388 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -72,7 +72,7 @@ in # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. - stateVersion = "23.11"; # Please read the comment before changing. + stateVersion = "24.11"; # Please read the comment before changing. packages = locals.packages; # The home.packages option allows you to install Nix packages into your # environment. @@ -162,6 +162,7 @@ in # Let Home Manager install and manage itself. programs = { + man.enable = false; man.generateCaches = false; home-manager.enable = true; # Direnv integration for flakes