Move unstable to main config, add SSH aliases to read local config

markob94 · Jun 9, 2021 · e62d6b3 · e62d6b3
1 parent a34ce04
commit e62d6b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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 = "";
 	};