From bc124405ae82cfba1176f6c3ddeb3f4579b6fe57 Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Sun, 2 Mar 2025 14:54:26 -0800
Subject: [PATCH] [Rust] Moves cargo env to rust file [Nix] small cleanups
 [Terminal] Removes special Alacritty TERM override

---
 home-manager/features/development/rust.nix |  6 +++++-
 home-manager/features/shell.nix            |  1 -
 home-manager/features/ssh.nix              |  2 +-
 home-manager/features/terminal.nix         | 15 ---------------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/home-manager/features/development/rust.nix b/home-manager/features/development/rust.nix
index 7dbaf65..8151aa8 100644
--- a/home-manager/features/development/rust.nix
+++ b/home-manager/features/development/rust.nix
@@ -1,7 +1,11 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     rust-analyzer
     rustfmt
   ];
+
+  programs.zsh.envExtra = [
+    ". \"$HOME/.cargo/env\""
+  ];
 }
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index e79f8aa..19c44a6 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -30,7 +30,6 @@
   programs.zsh = {
     enable = true;
     envExtra = ''
-      . "$HOME/.cargo/env"
       PATH=$PATH:$HOME/.local/bin
       GITHUB_USERNAME=periodic
     '';
diff --git a/home-manager/features/ssh.nix b/home-manager/features/ssh.nix
index e63b3b7..05ded47 100644
--- a/home-manager/features/ssh.nix
+++ b/home-manager/features/ssh.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   services.ssh-agent.enable = true;
diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix
index aad602b..630ed30 100644
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -97,19 +97,4 @@
       };
     };
   };
-
-  programs.ssh = {
-    enable = true;
-    matchBlocks = {
-      "*" = {
-        setEnv = {
-          # Alacritty sets it's terminfo to 'alacritty' so that environments can have
-          # complete functionality support.  However, this doesn't work well when making
-          # remove connections.  So we set it to 'xterm-256color' which is a more common
-          # terminfo.
-          "TERM" = "xterm-256color";
-        };
-      };
-    };
-  };
 }