From db61bc4b910ce682d7131bbee87f3e91db2e304b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Mon, 9 Nov 2020 09:39:37 +0100 Subject: [PATCH] chore: RIP homeros --- configs/cloud.nix | 5 +-- configs/mail.nix | 1 - configs/moodle-dl.nix | 1 - configs/ssh.nix | 5 --- deploy.nix | 5 --- lib/local-network.nix | 2 +- systems/homeros/configuration.nix | 40 ---------------------- systems/homeros/hardware-configuration.nix | 34 ------------------ 8 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 systems/homeros/configuration.nix delete mode 100644 systems/homeros/hardware-configuration.nix diff --git a/configs/cloud.nix b/configs/cloud.nix index aac5397..077f8a0 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -29,8 +29,6 @@ cert = toString ; key = toString ; devices = { - homeros.id = - "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA"; wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF"; heym.id = @@ -41,8 +39,7 @@ folders = let syncthing-dir = "${config.users.users.me.home}/cloud/syncthing"; in { - "${syncthing-dir}/common".devices = - [ "homeros" "wilde" "manakish" ]; + "${syncthing-dir}/common".devices = [ "wilde" "manakish" ]; "${syncthing-dir}/library".devices = lib.attrNames devices; "${syncthing-dir}/mundoiu".devices = lib.attrNames devices; "${syncthing-dir}/music".devices = lib.attrNames devices; diff --git a/configs/mail.nix b/configs/mail.nix index 865a3b6..e34d333 100644 --- a/configs/mail.nix +++ b/configs/mail.nix @@ -119,7 +119,6 @@ in { }; in lib.listToAttrs (map muchsyncConfig [ "wilde" - "homeros" "manakish" ]); diff --git a/configs/moodle-dl.nix b/configs/moodle-dl.nix index 40ce41a..eb5d5a6 100644 --- a/configs/moodle-dl.nix +++ b/configs/moodle-dl.nix @@ -43,7 +43,6 @@ in openssh.authorizedKeys.keys = [ # for sshfs mount "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtIFmbspaBHaSkLEx43V0uaVd7l9NUFiwt2VOP++KzLjvRMLkyF2hg2HjmogTjUvTyoDs7RHwEH/cHZlJ5JQkM1jRqQpnYwGfkZEwYvmXAl6LY9+vQMP36gNPfXmKX3y3LelO7oD2uhUs0guTtg0tHUyN5/UY5u+VinyD6djxDkHaCUn3S7CS/odBcs/4flXT654wsvzgYicnSKH9R4W+7C0YsckZ/NoIkA4jnuwtWZYWrUkxd4/290buX6pAc5+zVVZqyy0sI4i8s6pO9RL5W7xvYt+w+U0u0dMxm5ckiRmLVKfIbMN4YtDxsZbZDajlQ1nDbOsEsrSXWz4H4cSNot7J820x1qh5SSxL4GSQlcT+6xCFk9kKyflxoS3oLoPLttx3rmOMkZKJWxF/IKLW47orxV6wkG5mHxdeR3cf6jX4j3nkwFVyC9R+WG4w2Z4vKONVE7uWGYU3y4OpR1e6MGHVShkNKqEvC/Kjcc/6v7I7AKRAuPZB0WEw36tA65/8= root@wilde" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDccC/BVon+XhDLKd8XyF71WcTUcbAkFLVW95bIOtq5as2VBPTN3RvnQ1UvjfbKtzqP9zUPQ0NcqlfDK3d8GTzEpiCldBlOmb2SMR6a8Vr9dg+FtYQPnzylHJxpNjdwaapbtJwFIqF/E6SJ52L5gH7xIfCnbceZlX5qk3O1izyhcUNEvI+KyQ6nhvzGJhf8VoclwEpYK3Icu9pSEBGw7ZhCPiNNCDh8G3FQ9EVgOGKJCnZWeTlR6pvy89j6qq4AawRnHSjgOuLcACDXEbsEfI8AnGg+1+PnPv1ulqMfu9+WTi2Sv73T5ADcowfIaFI+KfM5im3IACuNnnjCdx2o9naBe23U81NxG6A6aNsLGY8q7/ibWCfXoESDuebSuWlSO25GOzraG9w/Fu7FfoR0K4hMPYl9qegSqudiYQk75cHx4VQIJuWXhiFbKdUXmwaZVdhMbRW3e/17K1pRV0H8CimRXzHiDj4QkxQL/K154QZ4I/gv32Tajb/5mhUBOXOqeps= root@homeros" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFFPHt+FPQ6gq8Ev65YsBZrafdtpWGpCNnlVvy67S1BK root@manakish" ]; useDefaultShell = true; diff --git a/configs/ssh.nix b/configs/ssh.nix index 0206c36..2aef020 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -30,11 +30,6 @@ in { user = "kfm"; port = sshPort; }; - homeros = { - hostname = "homeros.r"; - user = "kfm"; - port = sshPort; - }; toum = { hostname = "toum.r"; user = "root"; diff --git a/deploy.nix b/deploy.nix index f3b58ba..1d553a1 100644 --- a/deploy.nix +++ b/deploy.nix @@ -40,11 +40,6 @@ in { name = "zaatar"; address = "192.168.178.21"; }); - homeros = writeDeploy "deploy-homeros" (regularSystem { - path = systems/homeros; - name = "homeros"; - address = "homeros.r"; - }); wilde = writeDeploy "deploy-wilde" (regularSystem { path = systems/wilde; name = "wilde"; diff --git a/lib/local-network.nix b/lib/local-network.nix index aa93fbf..98219b3 100644 --- a/lib/local-network.nix +++ b/lib/local-network.nix @@ -1,9 +1,9 @@ { toum = "192.168.178.24"; zaatar = "192.168.178.21"; - homeros = "192.168.178.22"; wilde = "192.168.178.32"; android = "192.168.178.35"; + manakish = "192.168.178.29"; tradfri = "192.168.178.28"; officejet = "192.168.178.27"; diff --git a/systems/homeros/configuration.nix b/systems/homeros/configuration.nix deleted file mode 100644 index 1e37eae..0000000 --- a/systems/homeros/configuration.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, pkgs, lib, ... }: { - imports = [ - - - ./hardware-configuration.nix - ]; - - environment.systemPackages = [ pkgs.zeroad pkgs.minecraft ]; - - niveum = { - batteryName = "BAT1"; - wirelessInterface = "wlp3s0"; - promptColours.success = "green"; - }; - - boot.loader.systemd-boot = { - enable = true; - configurationLimit = 5; - }; - - boot.loader.efi.canTouchEfiVariables = true; - - # ref https://askubuntu.com/questions/575020/ubuntu-14-04-brightness-problem-lenovo-z500 - boot.kernelParams = [ "acpi_backlight=vendor" ]; - services.xserver.deviceSection = '' - Option "Backlight" "ideapad" - BusID "PCI:0:2:0" - ''; - - services.xserver.videoDrivers = [ "intel" ]; - - networking.retiolum = { - ipv4 = "10.243.2.1"; - ipv6 = "42:0:3c46:53e:e63d:e62a:56ea:c705"; - }; - - networking.hostName = "homeros"; - - system.stateVersion = "18.09"; -} diff --git a/systems/homeros/hardware-configuration.nix b/systems/homeros/hardware-configuration.nix deleted file mode 100644 index a63f3e1..0000000 --- a/systems/homeros/hardware-configuration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, lib, pkgs, ... }: { - imports = [ ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "sr_mod" - "rtsx_usb_sdmmc" - ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/83544ad3-1d23-4c2d-82bc-fafef13a996f"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/8F9E-7556"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/5ea3a65e-8fdb-45fb-ad32-3759d991a83a"; }]; - - # services.xserver.videoDrivers = [ "nvidia" ]; - - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; -}