From e540fab11c90a61d16dca853991f638a698e5c18 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 11 Apr 2022 12:37:54 +0200 Subject: [PATCH] rm woodhouse --- nixos/README.md | 9 ----- nixos/logical/frumar.nix | 2 +- nixos/logical/pennyworth.nix | 2 +- nixos/logical/woodhouse.nix | 72 ----------------------------------- nixos/logical/zazu.nix | 5 --- nixos/overlay.nix | 2 +- nixos/secrets.nix | Bin 994 -> 904 bytes nixos/vpn.nix | 2 - 8 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 nixos/logical/woodhouse.nix diff --git a/nixos/README.md b/nixos/README.md index e515c04..c7e76ef 100644 --- a/nixos/README.md +++ b/nixos/README.md @@ -26,15 +26,6 @@ Hetzner cloud VPS (Storage: 20GB, RAM: 2GB, 1 core) - irc/weechat - vpn + http gateway for some services -[woodhouse](https://en.wikipedia.org/wiki/List_of_Archer_characters#Recurring_characters) ------------ - -intel nuc connected to the tv (storage: 250GB ssd, RAM: 8GB) - -- plex media player -- todo: sshfs mount to frumar - - [jarvis](https://en.wikipedia.org/wiki/Edwin_Jarvis) -------- diff --git a/nixos/logical/frumar.nix b/nixos/logical/frumar.nix index e850a73..d0fbc4e 100644 --- a/nixos/logical/frumar.nix +++ b/nixos/logical/frumar.nix @@ -62,7 +62,7 @@ exporters.node.enable = true; # exporters.unifi = { # enable = true; - # unifiAddress = "https://woodhouse.home.yori.cc:8443"; + # unifiAddress = "https://localhost:8443"; # unifiInsecure = true; # unifiUsername = "ReadOnlyUser"; # unifiPassword = "ReadOnlyPassword"; diff --git a/nixos/logical/pennyworth.nix b/nixos/logical/pennyworth.nix index 821ee9c..1538ef6 100644 --- a/nixos/logical/pennyworth.nix +++ b/nixos/logical/pennyworth.nix @@ -64,7 +64,7 @@ in { "yorickvanpelt.nl".locations."/p1".return = "301 https://git.yori.cc/yorick/meterkast"; "grafana.yori.cc" = sslforward "http://${vpn.ips.frumar}:3000"; - "ubiquiti.yori.cc" = sslforward "https://${vpn.ips.woodhouse}:8443"; + #"ubiquiti.yori.cc" = sslforward "https://${vpn.ips.frumar}:8443"; "prometheus.yori.cc" = { # only over vpn listen = [{ diff --git a/nixos/logical/woodhouse.nix b/nixos/logical/woodhouse.nix deleted file mode 100644 index b8df6b5..0000000 --- a/nixos/logical/woodhouse.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ config, pkgs, lib, ... }: -let - #secrets = import ; - mkFuseMount = device: opts: { - # todo: "ServerAliveCountMax=3" "ServerAliveInterval=30" - - device = "${pkgs.sshfsFuse}/bin/sshfs#${device}"; - fsType = "fuse"; - options = [ - "noauto" - "x-systemd.automount" - "_netdev" - "users" - "idmap=user" - "defaults" - "allow_other" - "transform_symlinks" - "default_permissions" - "uid=1000" - "reconnect" - "IdentityFile=/root/.ssh/id_sshfs" - ] ++ opts; - }; -in { - imports = [ - ../physical/nuc.nix - ../roles/graphical.nix - # - ]; - - # nixpkgs.overlays = [ (import (builtins.fetchTarball https://github.com/colemickens/nixpkgs-wayland/archive/master.tar.gz)) ]; - # system.stateVersion = "17.09"; - - # fuse mounts - system.fsPackages = [ pkgs.sshfsFuse ]; - - # programs.sway = { - # enable = true; - # extraSessionCommands = '' - # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${lib.makeLibraryPath (with pkgs; [ libxkbcommon libglvnd wayland ])} - # ''; - # }; - #fileSystems."/mnt/frumar" = mkFuseMount "yorick@${secrets.hostnames.frumar}:/data/yorick" []; - hardware.bluetooth.enable = true; - - # kodi ports - networking.firewall.allowedTCPPorts = [ 7 8080 8443 9090 9777 ]; - users.users.tv = { - isNormalUser = true; - uid = 1043; - extraGroups = [ "wheel" ]; - hashedPassword = - "$6$hD4ESAGS8O1d$yctx6spOPZ0nt/6cgYpsWZ86UoXw3ISRpf2gbdhbl8JgDz6Psjx6JCqJ9NsMi5BHnXlgRRK/z2SVrTjHEsqQR."; - packages = with pkgs; [ plex-media-player ]; - }; - services.xserver.windowManager.i3.enable = true; - networking.useNetworkd = true; - networking.dhcpcd.enable = false; - services.resolved.enable = true; - #services.nscd.enable = false; - networking.interfaces.eno1.useDHCP = true; - networking.useDHCP = false; - #services.xserver.enable = lib.mkForce false; - # services.unifi = { - # enable = true; - # unifiPackage = pkgs.unifiStable; - # }; - # todo: debug: - services.resolved.extraConfig = "MulticastDNS=true"; - systemd.network.networks."40-eno1".networkConfig.MulticastDNS = "yes"; - services.fstrim.enable = true; -} diff --git a/nixos/logical/zazu.nix b/nixos/logical/zazu.nix index 5704452..ca99c48 100644 --- a/nixos/logical/zazu.nix +++ b/nixos/logical/zazu.nix @@ -145,11 +145,6 @@ in { config, lib, pkgs, ... }: ethernetAddress = "b4:fb:e4:2d:fc:f3"; ipAddress = "192.168.178.32"; } - { - hostName = "woodhouse"; - ethernetAddress = "94:c6:91:15:1f:c5"; - ipAddress = "192.168.178.39"; - } ]; extraConfig = '' subnet 192.168.178.0 netmask 255.255.255.0 { diff --git a/nixos/overlay.nix b/nixos/overlay.nix index 521f246..cac1450 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -1,4 +1,4 @@ -let names = [ "pennyworth" "jarvis" "blackadder" "woodhouse" "frumar" "zazu" "smithers" ]; +let names = [ "pennyworth" "jarvis" "blackadder" "frumar" "zazu" "smithers" ]; in pkgs: super: { yorick = (super.yorick or { }) // rec { nixos = configuration: extraArgs: diff --git a/nixos/secrets.nix b/nixos/secrets.nix index be02921ce6a068bb6d2ce46317bf9edfbb4957cd..cf483bcbbb9f43e1d9bdf191063039381984eb3e 100644 GIT binary patch literal 904 zcmV;319$uYM@dveQdv+`0M1>8UN*PMs=}E3DEP^ixTfM{GCpR7FLYDTYbD^K3j+Ws zqc@d&&}FMwwNmAPA{($?yze z$EL&SH+$@dUniQN61pqEbB$Uz47ZQ&faiYas&SGyu%b|R>yoZ<-ug-;g!~TLu7>z( zhalp~P-Z_JVT-{T9}l8=yx4B_Ewmz1m}Yuha6dfIae1gF0I&qV8?s<0CDid+%GIBK zyd$1fk<{yzhY^T#ZcCY3K39fRY)GR3$sjK2q>`)_pC90e|Ndm>@q`VKD2GZH>{0x`=#EuNOWqCIY zL%uHk9?Y`@4s<12T=ad;F%$}D2d}00TYstF*sW&Kc*OE<9BWkD{2fdl_3t<|I;2-j zaX0h9>e|^e>O9rab@rW+iJGltK-?II6<2f+z>7SbYU)q}1XHbuRuL5IT;IO$aNd1y zwuJ1)+L%maj*Si_3Wo_P*z5|qg4~xo?d^ABtam0U4uY)Ip?h2%${)^P;9Pf+x|P@rV*EtFU9Xw?zPBvx^Ca>Wa<0KL%dfU$S+O!C3@?v z<|4lxkj7P3icbv{F4leHZnA52Exf>V*CS0Q6!cNW$S~rn;<2K(_-GK-k>{|5#|4t= zb%2X+N`Nv*_7pie6{E37H=_3CWRo&C$t&kNHb%C=G`z_G literal 994 zcmV<810DPTM@dveQdv+`0AnKt>bJ0eaZL@GILklX$1ytaorlUfo zXXdF;l?1)%p6oxel5A*ttPKnOWYLo7iRJ$tDyzN{ATtI_&&Np1LZmtL-uTYBS5H&T z3w+S0Tj$_q#2k0rQ0--|vD;A*r|FQ5l6W~eEcY~C@!)_C$F&EFert0Nb9%~9eLz&( ztIOM?=7DoUAM4+&@K4PYrhAnP`3qSpgx0_vFJKx{qh$^#=U09#J|KSKk4lf1) zCFWUCoI&Yk?xiafxFju{p)9Zrl6>$9mMDA^Ai{DnuCI;7>i}=lmCrzdzLYv$O8Hg|sJ9#FvzW<+8f& z!x`fLh%S4@4_-grNXLXH*QdajwIKWl$sL341B}l{FEPOIhCX*pHAAy}#)(J-CB+7g0u9&4!e#)5!ThJ?gA3;wJYowS|E367 z5j9u+6)*B_Rv0>V3pRhY%!q@Uq150bg&U+(PFAp+%b74}O4Wp1yZ(Zc3vGZ@s6HG` zgJK2AWB*s!`jSGhLsJnOo+**DMD+)!^@qAHSTayY^^-5YVBhNP;(1gG?N|O6{evtL zbFbam{ITUX{{d`==Hf@0`q)TPO(K(e1gu=JLD8S6Asjpo+vq7A~M8sTpq37;!3rNL=+bA^_8tWr+?FU Q$PY9%t8evD?PPY)xkw)J4gdfE diff --git a/nixos/vpn.nix b/nixos/vpn.nix index aeea09e..197b3be 100644 --- a/nixos/vpn.nix +++ b/nixos/vpn.nix @@ -3,7 +3,6 @@ pennyworth = "10.209.0.1"; jarvis = "10.209.0.2"; frumar = "10.209.0.3"; - woodhouse = "10.209.0.4"; blackadder = "10.209.0.6"; zazu = "10.209.0.7"; smithers = "10.209.0.8"; @@ -14,7 +13,6 @@ frumar = "UpFw4KmrvmOWdMOJ+LHvMzgN7cQMnasqlkzF8/apoGI="; jarvis = "2/Qaq5uiy8uGGnZLIfjeomL47XjZCsJ1dDFDD9Nlq3E="; pennyworth = "XoeUMsiSOWBFEFuAu+S4iQd3MzkyGhIj9dtxzZ0I500="; - woodhouse = "ICzlnC4zKUYvpQ0o5AFq2rG7CCqWUFVn3UqkLSoYNgI="; zazu = "6X5EdNMO1MtFi18LCRGZ2cBD0d50Wq+pwkwVubjY1Ew="; smithers = "CXsx26Xi+mBeuB6U8hdeuOBC3o4gTnBc6biez/BCqzM="; };