From e62d6b381f6bf41a59821129910dbb169a81799f Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Wed, 9 Jun 2021 08:22:06 +0200
Subject: [PATCH] Move unstable to main config, add SSH aliases to read local
 config

---
 configuration.nix | 7 +++++++
 vim.nix           | 8 --------
 zsh.nix           | 3 +++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index e506f55..2ea0cdd 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,8 @@
 { config, pkgs, ... }:
+let
+	unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+	unstableOverride = import ( unstableTarball ) { config = config.nixpkgs.config; };
+in
 {
 	imports = [
 		./bootloader.nix
@@ -33,6 +37,9 @@
 	nixpkgs.config = {
 		allowUnfree = true;
 		allowBroken = false;
+		packageOverrides = pkgs: {
+			unstable = unstableOverride;
+		};
 	};
 
 	networking = {
diff --git a/vim.nix b/vim.nix
index 983637a..a84d1a2 100644
--- a/vim.nix
+++ b/vim.nix
@@ -1,13 +1,5 @@
 { config, pkgs, ... }:
-let
-	unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
-	unstableOverride = import ( unstableTarball ) { config = config.nixpkgs.config; };
-in
 {
-	nixpkgs.config.packageOverrides = pkgs: {
-		unstable = unstableOverride;
-	};
-
 	environment.systemPackages = with pkgs; [
 		vimPlugins.base16-vim
 		vimPlugins.coc-git
diff --git a/zsh.nix b/zsh.nix
index f158e9f..d5c547b 100644
--- a/zsh.nix
+++ b/zsh.nix
@@ -18,6 +18,9 @@
 			gvim = "nvim-qt";
 			make = "make -j$(nproc)";
 			makevars = "make -pn | grep -A1 '^# makefile' | grep -v '^#\\|^--' | sort | uniq";
+			scp = "scp -F $HOME/.ssh/config";
+			ssh = "ssh -F $HOME/.ssh/config";
+			sshfs = "sshfs -F $HOME/.ssh/config";
 		};
 		promptInit = "";
 	};