diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index 2a9df2f..09590c9 100644 --- a/boxes/mlg/default.nix +++ b/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; diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 2ce2156..5941105 100755 --- a/builds/utils/sh/disp +++ b/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 ;; diff --git a/home/ssh/config b/home/ssh/config index 059b3f2..9bdc79c 100644 --- a/home/ssh/config +++ b/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 diff --git a/manual/site.md b/manual/site.md new file mode 100644 index 0000000..2aecb0d --- /dev/null +++ b/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 diff --git a/manual/site.tex b/manual/site.tex deleted file mode 100644 index d1c45eb..0000000 --- a/manual/site.tex +++ /dev/null @@ -1,12 +0,0 @@ -\documentclass{article} - -\usepackage{tikz} - -\begin{document} - -\section{Network Diagram} -\begin{tikzpicture} - \node - -\end{tikzpicture} -\end{document} diff --git a/modules/hosts.nix b/modules/hosts.nix index 9a2d351..565438e 100644 --- a/modules/hosts.nix +++ b/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" ]; }; }