From 816eb25479535a02c470f713535c3cf1e43d073f Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sat, 10 Jan 2026 14:27:26 +0000
Subject: [PATCH] treewide: fix evaluation warnings

---
 flake.nix                     | 1 -
 hosts/common.nix              | 2 +-
 users/jordan/common/git.nix   | 8 +++-----
 users/jordan/common/shell.nix | 3 ++-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index dbf2b0a..9964a7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,7 +86,6 @@
     nix-topology = {
       url = "github:oddlama/nix-topology";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
     };
 
     pre-commit-hooks = {
diff --git a/hosts/common.nix b/hosts/common.nix
index 2cb9f26..6f04af2 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -30,7 +30,7 @@
           config = {
             allowUnfree = true;
           };
-          system = final.system;
+          system = final.stdenv.hostPlatform.system;
         };
       })
       (import ../overlays/default.nix)
diff --git a/users/jordan/common/git.nix b/users/jordan/common/git.nix
index a4ae2dc..4da73a0 100644
--- a/users/jordan/common/git.nix
+++ b/users/jordan/common/git.nix
@@ -17,6 +17,9 @@
         email = "jordan@vimium.com";
         name = "Jordan Holt";
       };
+      rebase.autosquash = true;
+      push.default = "current";
+      pull.rebase = true;
     };
     ignores = [
       ".Trash-*"
@@ -37,10 +40,5 @@
       key = "B8CFFF61F1CCF520";
       signByDefault = true;
     };
-    extraConfig = {
-      rebase.autosquash = true;
-      push.default = "current";
-      pull.rebase = true;
-    };
   };
 }
diff --git a/users/jordan/common/shell.nix b/users/jordan/common/shell.nix
index 3fb2d2d..00f60db 100644
--- a/users/jordan/common/shell.nix
+++ b/users/jordan/common/shell.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }:
 let
@@ -19,7 +20,7 @@ in
         strategy = [ "completion" ];
       };
       defaultKeymap = "viins";
-      dotDir = ".config/zsh";
+      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       enableVteIntegration = true;