From 4d8740e530f5157c5cd433c85035240177d3a5e6 Mon Sep 17 00:00:00 2001 From: Tim McCarthy Date: Wed, 9 Sep 2026 13:37:25 -0700 Subject: [PATCH] Nix flake update --- nix/flake.lock | 12 ++++++------ nix/home.nix | 3 ++- nix/modules/git.nix | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index 06e3ad7..e625957 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1773093840, - "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=", + "lastModified": 1788985386, + "narHash": "sha256-dTXvCtgUYxh7VXpaBDkgBK2XyHRA0PUhJDRLGEvXWLA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86", + "rev": "9bdbf423512a9b45d9dac3c25e745f00cf2a6137", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772956932, - "narHash": "sha256-M0yS4AafhKxPPmOHGqIV0iKxgNO8bHDWdl1kOwGBwRY=", + "lastModified": 1788922888, + "narHash": "sha256-QMX3uerxnW2R5dHcWpIQILHDltOZnon3x3Spq7EzBFI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "608d0cadfed240589a7eea422407a547ad626a14", + "rev": "a391f95d4557d685fd8e5dc0d4b1f9271aa2f342", "type": "github" }, "original": { diff --git a/nix/home.nix b/nix/home.nix index 077f908..9416d9d 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -10,7 +10,7 @@ programs.home-manager.enable = true; # Enable integration with generic Linux OSs - targets.genericLinux.enable = pkgs.stdenv.isLinux; + targets.genericLinux.enable = pkgs.stdenv.hostPlatform.isLinux; home.packages = with pkgs; [ # Better cat @@ -28,6 +28,7 @@ roboto-mono sops just + codex ]; imports = [ diff --git a/nix/modules/git.nix b/nix/modules/git.nix index eb0e586..445df94 100644 --- a/nix/modules/git.nix +++ b/nix/modules/git.nix @@ -2,10 +2,10 @@ { programs.git = { enable = true; - aliases = { - lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; - }; - extraConfig = { + settings = { + alias = { + lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; + }; user.name = "Tim McCarthy"; user.email = "thoomfish@gmail.com"; color.ui = true;