rm woodhouse

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)
 --------

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";

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 = [{

nixos/logical/woodhouse.nix

@@ -1,72 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  #secrets = import <secrets>;
-  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
-    #<yori-nix/roles/homeserver.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;
-}

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 {

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:

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=";
   };