feat: Update Nix to 25.05 and fix a few things

- Homebrew is now Declarative
- Update Lix
- Remove hardcoded username
- Use delta as Git diff pager
- Use Snacks in Neovim
- Fix TMUX resurrect

Author: DoomHammer

.config/nix/flake.lock

@@ -7,23 +7,23 @@
   description = "My system configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?rev=5ef6c425980847c78a80d759abc476e941a9bf42";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nix-darwin = {
-      url = "github:LnL7/nix-darwin/nix-darwin-24.11";
+      url = "github:LnL7/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-rosetta-builder = {
       url = "github:cpick/nix-rosetta-builder";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.inputs.systems.follows = "systems";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # Prebuilt package index - provides comma package
@@ -72,6 +72,18 @@
       repo = "treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-homebrew.url = "github:zhaofengli/nix-homebrew";
+
+    # Optional: Declarative tap management
+    homebrew-core = {
+      url = "github:homebrew/homebrew-core";
+      flake = false;
+    };
+    homebrew-cask = {
+      url = "github:homebrew/homebrew-cask";
+      flake = false;
+    };
   };
 
   outputs =

.config/nix/flake.nix

@@ -13,19 +13,24 @@ let
 in
 {
   home.packages = with pkgs; [
+    p7zip
     btop
     curl
+    dogdns
     du-dust
     eza
     fd
     htop
     jq
     just
     lesspipe
+    nodejs # yuck
     ripgrep
     silver-searcher
+    tre
     unzip
     wget
+    wtfutil
     zstd
   ];
   programs = {

.config/nix/home-manager/_mixins/features/basics/default.nix

@@ -23,8 +23,7 @@ in
 
   xdg.configFile."colima/default/colima.yaml".source =
     config.lib.file.mkOutOfStoreSymlink "${dir}/colima-config/default/colima.yaml";
-  # FIXME: This home directory should be computed (home.homeDirectory?)
   programs.ssh.extraConfig = ''
-    Include /Users/doomhammer/.config/colima/ssh_config
+    Include ${config.home.homeDirectory}/.config/colima/ssh_config
   '';
 }