From 8210c8b3972539c3361227ee92ca3e2a9d12b4d6 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sat, 7 Apr 2018 20:20:22 +0200
Subject: [PATCH] nixify ssh, streamlink, remove gtk

---
 gtk/.config/gtk-3.0/settings.ini |  3 --
 gtk/.gtkrc-2.0                   |  2 --
 install.sh                       |  2 +-
 misc/.ssh/config                 | 51 --------------------------------
 misc/.streamlinkrc               |  2 --
 nix/.config/nixpkgs/home.nix     | 20 +++++++++++++
 6 files changed, 21 insertions(+), 59 deletions(-)
 delete mode 100644 gtk/.config/gtk-3.0/settings.ini
 delete mode 100644 gtk/.gtkrc-2.0
 delete mode 100644 misc/.ssh/config
 delete mode 100644 misc/.streamlinkrc

diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
deleted file mode 100644
index 3076972..0000000
--- a/gtk/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-theme-name = Arc-Dark
-gtk-font-name = Source Code Pro 10
diff --git a/gtk/.gtkrc-2.0 b/gtk/.gtkrc-2.0
deleted file mode 100644
index 1289bc3..0000000
--- a/gtk/.gtkrc-2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-gtk-theme-name = "Arc-Dark"
-gtk-font-name = "Source Code Pro 10"
diff --git a/install.sh b/install.sh
index 41c1f3f..c99b178 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 #!nix-shell -i bash -p stow
 set -e
-$(nix-build '<nixpkgs>' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix x gtk gpg mutt misc bash stow rofi
+$(nix-build '<nixpkgs>' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix x gtk gpg mutt bash stow rofi
 nix build -f. $(hostname -s)
diff --git a/misc/.ssh/config b/misc/.ssh/config
deleted file mode 100644
index b47b847..0000000
--- a/misc/.ssh/config
+++ /dev/null
@@ -1,51 +0,0 @@
-Compression yes
-ServerAliveInterval 120
-ControlMaster auto
-ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host oxygen
-	HostName oxygen.obfusk.ch
-
-Host nyamsas
-    hostname nyamsas.quezacotl.nl
-    port 1337
-
-Host phassa
-    hostname karpenoktem.nl
-    port 33933
-
-
-Host lilo4
-    HostName lilo4.science.ru.nl
-    User yvpelt
-Host lilo5
-    HostName lilo5.science.ru.nl
-    User yvpelt
-Host lilo
-    HostName lilo.science.ru.nl
-    User yvpelt
-
-Host c2n_fr
-    HostName collect2net.osso.nl
-    User alectryon
-    ProxyJump yorick@frumar.yori.cc
-
-Host pub.yori.cc
-    User public
-    IdentityFile ~/.ssh/id_rsa_pub
-    IdentitiesOnly yes
-
-Host asc_wh
-    hostname 192.168.1.4
-    ProxyJump yorick@woodhouse.onion
-
-Host skl_deployer
-    hostname deployer.serokell.team
-    RemoteForward /home/yorick/.aws/pass-socket /home/yorick/.aws/pass-socket
-    RemoteForward /home/yorick/.gnupg/S.gpg-agent /home/yorick/.gnupg/S.gpg-agent.extra
-   ForwardAgent yes
-Host skl_deployer_vbox
-    hostname 192.168.56.101
-    ForwardAgent yes
-    RemoteForward /home/yorick/.aws/pass-socket /home/yorick/.aws/pass-socket
-    RemoteForward /home/yorick/.gnupg/S.gpg-agent /home/yorick/.gnupg/S.gpg-agent.extra
diff --git a/misc/.streamlinkrc b/misc/.streamlinkrc
deleted file mode 100644
index 9f38e93..0000000
--- a/misc/.streamlinkrc
+++ /dev/null
@@ -1,2 +0,0 @@
-player = mpv --cache 2048
-default-stream = best
diff --git a/nix/.config/nixpkgs/home.nix b/nix/.config/nixpkgs/home.nix
index ef41992..4d6f399 100644
--- a/nix/.config/nixpkgs/home.nix
+++ b/nix/.config/nixpkgs/home.nix
@@ -28,5 +28,25 @@
       };
     };
 
+    ssh = {
+      enable = true;
+      compression = true;
+      serverAliveInterval = 120;
+      controlMaster = "auto";
+      matchBlocks = {
+        "pub.yori.cc" = {
+          user = "public";
+          identityFile = "~/.ssh/id_rsa_pub";
+          identitiesOnly = true;
+        };
+        oxygen.hostname = "oxygen.obfusk.ch";
+        nyamsas = { hostname = "nyamsas.quezacotl.nl"; port = 1337; };
+        phassa = { hostname = "karpenoktem.nl"; port = 33933; };
+      };
+    };
   };
+  xdg.configFile."streamlink/config".text = ''
+    player = mpv --cache 2048
+    default-stream = best
+  '';
 }