From 0a88804fc02167840bb579b84c6561d77630e628 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 29 Feb 2020 21:27:09 +0100
Subject: [PATCH] Wrap ssh so that we use a TERM commonly known by servers

---
 profiles/common/default.nix | 16 ++++++++++++++++
 programs/neovim/default.nix |  9 +++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/profiles/common/default.nix b/profiles/common/default.nix
index ffe0a4fa..1adeadca 100644
--- a/profiles/common/default.nix
+++ b/profiles/common/default.nix
@@ -45,6 +45,22 @@
     home.packages = with pkgs; [
       htop
       inotify-tools
+      (
+        symlinkJoin {
+          name = "openssh";
+          paths = [
+            (
+              pkgs.writeScriptBin "ssh" ''
+                #!${zsh}/bin/zsh
+
+                export TERM=xterm-256color
+                ${openssh}/bin/ssh $@
+              ''
+            )
+            openssh
+          ];
+        }
+      )
       unzip
     ];
   };
diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index b80095ca..bf37ecbd 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -2,15 +2,12 @@ with import <nixpkgs> {};
 
 {
   home-manager.users.charlotte = { pkgs, ... }: {
-    nixpkgs.overlays = [
+    home.packages = [
       (
-        self: super: {
-          neovim = super.neovim.override {
-            configure = (import ./base.nix { pkgs = self; });
-          };
+        pkgs.neovim.override {
+          configure = (import ./base.nix { inherit pkgs; });
         }
       )
     ];
-    home.packages = [ pkgs.neovim ];
   };
 }