add ssh to tty-progs

.config/vdirsyncer/config

@@ -72,7 +72,6 @@ url.fetch = ["command", "rbw", "get", "pco-ical-sync"]
 type = "http"
 
 url.fetch = ["command", "rbw", "get", "school-ical-sync"]
-
 [storage calendar_remote]
 type = "caldav"
 

boxes/mlg/default.nix

@@ -44,7 +44,7 @@
   services.ssh-phone-home = {
     enable = true;
     localUser = "usr";
-    remoteHostname = "192.168.1.100";
+    remoteHostname = "mainsail";
     remotePort = 22;
     remoteUser = "usr";
     bindPort = 2222;

builds/utils.nix

@@ -18,6 +18,7 @@
 , ytfzf
 , xrandr
 , svkbd
+, xkbset
 , libsForQt5
 }:
 
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   src = ./utils;
 
   nativeBuildInputs = [ makeWrapper pkg-config libxcb ];
-  buildInputs = [ libxcb bash feh xrandr jq curl fzy ytfzf ffmpeg sshuttle svkbd scrcpy libsForQt5.kolourpaint ];
+  buildInputs = [ libxcb bash feh xrandr jq curl fzy ytfzf ffmpeg sshuttle svkbd scrcpy xkbset libsForQt5.kolourpaint ];
 
   buildPhase = ''
     ls

builds/utils/sh/disp

@@ -18,6 +18,8 @@ keyboard () {
 	setxkbmap -option caps:super
 	pkill xcape
 	xcape -e 'Super_L=Escape'
+	xkbset bo 50
+	xkbset exp =bo
 	xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
 	xset -r 161 # tablet rotate key doesn't need repeat
 	xset r rate 200 80
@@ -81,22 +83,22 @@ case "$(hostname)" in
 		             # but it's just a link, so it's a regular file.
 		             # in conclusion, good either way
 		mkdir -p $HOME/.cache/mount_point
-		sshfs usr@192.168.1.120:/home/usr/doc $HOME/.cache/mount_point
+		sshfs usr@x230t:/home/usr/doc $HOME/.cache/mount_point
 		ln -sf $HOME/.cache/mount_point $HOME/doc
 
 		rm $HOME/.thunderbird # see previous comment
 		mkdir -p $HOME/.cache/mount_point3
-		sshfs usr@192.168.1.120:/home/usr/.thunderbird $HOME/.cache/mount_point3
+		sshfs usr@x230t:/home/usr/.thunderbird $HOME/.cache/mount_point3
 		ln -sf $HOME/.cache/mount_point3 $HOME/.thunderbird
 
 		rm $HOME/Mail
 		mkdir -p $HOME/.cache/mount_point4
-		sshfs usr@192.168.1.120:/home/usr/Mail $HOME/.cache/mount_point4
+		sshfs usr@x230t:/home/usr/Mail $HOME/.cache/mount_point4
 		ln -sf $HOME/.cache/mount_point4 $HOME/Mail
 
 		rm $HOME/vdir
 		mkdir -p $HOME/.cache/mount_point5
-		sshfs usr@192.168.1.120:/home/usr/vdir $HOME/.cache/mount_point5
+		sshfs usr@x230t:/home/usr/vdir $HOME/.cache/mount_point5
 		ln -sf $HOME/.cache/mount_point5 $HOME/vdir
 
 		;;

home/ssh/config

@@ -1,5 +1,4 @@
 Host mainsail
-	HostName 192.168.1.100
 	User usr
 	Port 22
 
@@ -19,3 +18,9 @@ Host mlg-prox
 	User usr
 	Port 2222
 	ProxyJump mainsail-prox
+
+Host x230t-prox
+	HostName x230t
+	User usr
+	Port 22
+	ProxyJump mainsail-prox

home/tty.nix

@@ -9,6 +9,7 @@
     ./python
     ./gnupg
     ./elinks
+    ./ssh
 
     ./tty-progs.nix
   ];

manual/site.md

@@ -0,0 +1,9 @@
+# Site Operations Manual
+
+# Home Network Layout
+- `192.168.1.1`: Netgear R9000 router
+- `192.168.1.2-199`: DHCP assignment range
+- `192.168.1.200`: `mainsail`
+- `192.168.1.201`: `x230t`
+- `192.168.1.202`: `mlg`
+- `192.168.1.203-255`: Unassigned

manual/site.tex

@@ -1,12 +0,0 @@
-\documentclass{article}
-
-\usepackage{tikz}
-
-\begin{document}
-
-\section{Network Diagram}
-\begin{tikzpicture}
-	\node
-
-\end{tikzpicture}
-\end{document}

modules/hosts.nix

@@ -2,9 +2,11 @@
 
 {
   networking.hosts = {
-    "192.168.1.120" = [ "x230t" ];
-    "192.168.1.52" = [ "mlg" ];
-    "192.168.1.100" = [ "mainsail" ];
+    "192.168.1.1" = [ "router" ];
+    "192.168.1.200" = [ "mainsail" ];
+    "192.168.1.201" = [ "x230t" ];
+    "192.168.1.202" = [ "mlg" ];
+    "149.28.63.115" = [ "netbox" ];
   };
 }