From cf6b9dcf17b67ab6052d435f826458b1b21e14e2 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 7 Dec 2025 13:50:03 -0800 Subject: update to nix 25.11 --- flake.lock | 24 +++++++++--------- flake.nix | 6 ++--- home/profiles/git.nix | 59 ++++++++++++++++++++++--------------------- home/profiles/go.nix | 15 ++++++----- home/profiles/mac.nix | 4 +++ home/profiles/media.nix | 1 - home/profiles/onepassword.nix | 7 +---- home/profiles/ssh.nix | 14 +++++----- 8 files changed, 66 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index 59f1bfa..f6ecd31 100644 --- a/flake.lock +++ b/flake.lock @@ -52,16 +52,16 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1765066094, + "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -269,16 +269,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -354,14 +354,14 @@ }, "nixpkgs_2": { "locked": { - "narHash": "sha256-79T1mnDzWNjktwvynnm0ptFJW5qVfuzavIRDCzKFiZ8=", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "narHash": "sha256-pyyfJp6Q80D0YhEuuP/qzasUZjoK3C3PrCp8BPWcDZE=", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.812778.3acb677ea67d/nixexprs.tar.xz?lastModified=1763049705" + "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.1056.d9bc5c7dceb3/nixexprs.tar.xz?lastModified=1764983851" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz" } }, "nur": { diff --git a/flake.nix b/flake.nix index ebe5464..7a8b03a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "personal NixOS configurations"; inputs = { - nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"; + nixpkgs.url = "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-25.05"; + url = "github:lnl7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/profiles/git.nix b/home/profiles/git.nix index c88705c..4821498 100644 --- a/home/profiles/git.nix +++ b/home/profiles/git.nix @@ -10,40 +10,22 @@ in { home.packages = with pkgs; [ git-credential-manager - gitAndTools.pre-commit + pre-commit ]; - programs.git = { + programs.delta = { enable = true; + options.features = "decorations side-by-side line-numbers"; + }; - delta = { - enable = true; - options.features = "decorations side-by-side line-numbers"; - }; - - userName = lib.mkDefault userinfo.fullName; - userEmail = lib.mkDefault userinfo.email; - - aliases = { - amend = "commit --amend"; - a = "commit --amend --no-edit"; - st = "status"; - co = "checkout"; - br = "branch"; - rb = "pull --rebase"; - hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all"; - llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative"; - logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate"; - logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat"; - }; - - ignores = [ - ".DS_Store" - ".aider.*" - ".direnv" - ]; + programs.git = { + enable = true; + settings = { + user = { + name = lib.mkDefault userinfo.fullName; + email = lib.mkDefault userinfo.email; + }; - extraConfig = { core.whitespace = "trailing-space,space-before-tab"; color.ui = true; @@ -85,6 +67,25 @@ in autosetuprebase = "remote"; sort = "authordate"; }; + + aliases = { + amend = "commit --amend"; + a = "commit --amend --no-edit"; + st = "status"; + co = "checkout"; + br = "branch"; + rb = "pull --rebase"; + hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all"; + llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative"; + logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate"; + logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat"; + }; }; + + ignores = [ + ".DS_Store" + ".aider.*" + ".direnv" + ]; }; } diff --git a/home/profiles/go.nix b/home/profiles/go.nix index 87e7add..d6ea5f4 100644 --- a/home/profiles/go.nix +++ b/home/profiles/go.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { home.packages = with pkgs; [ go-tools # collection of tools, https://github.com/dominikh/go-tools @@ -8,11 +8,12 @@ programs.go = { enable = true; - goPath = ".local/share/pkg.go"; - goBin = ".local/bin.go"; - goPrivate = [ - "github.rbx.com/*" - "github.com/fcuny/*" - ]; + env = { + GOPATH = "${config.xdg.dataHome}/pkg.go"; + GOPRIVATE = [ + "github.rbx.com/*" + "fcuny.net/*" + ]; + }; }; } diff --git a/home/profiles/mac.nix b/home/profiles/mac.nix index c7cfd3a..2aa369f 100644 --- a/home/profiles/mac.nix +++ b/home/profiles/mac.nix @@ -62,5 +62,9 @@ in SHELL = "${pkgs.fish}/bin/fish"; }; + home.sessionPath = [ + "${config.home.homeDirectory}/.local/bin" + ]; + xdg.enable = true; } diff --git a/home/profiles/media.nix b/home/profiles/media.nix index 0d53f42..a2cfd9d 100644 --- a/home/profiles/media.nix +++ b/home/profiles/media.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { home.packages = with pkgs; [ - darktable ffmpeg transmission_4 vlc-bin diff --git a/home/profiles/onepassword.nix b/home/profiles/onepassword.nix index 232092e..f364a9e 100644 --- a/home/profiles/onepassword.nix +++ b/home/profiles/onepassword.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { programs.onepassword = { enable = true; @@ -6,9 +6,4 @@ { account = "my.1password.com"; } # All keys from personal account ]; }; - - home.sessionPath = [ - config.home.sessionVariables.GOBIN - "${config.home.homeDirectory}/.local/bin" - ]; } diff --git a/home/profiles/ssh.nix b/home/profiles/ssh.nix index 250aff5..8e39def 100644 --- a/home/profiles/ssh.nix +++ b/home/profiles/ssh.nix @@ -2,13 +2,15 @@ { programs.ssh = { enable = true; - forwardAgent = true; - serverAliveInterval = 60; - controlMaster = "auto"; - controlPersist = "30m"; - controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p"; - + enableDefaultConfig = false; matchBlocks = { + "*" = { + forwardAgent = true; + serverAliveInterval = 60; + controlPersist = "30m"; + controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p"; + controlMaster = "auto"; + }; "github.com" = { hostname = "github.com"; user = "git"; -- cgit v1.2.3