diff --git a/keys/machines/nunotaba.asc b/keys/machines/nunotaba.asc deleted file mode 100644 index 7ab5b65..0000000 --- a/keys/machines/nunotaba.asc +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -xsFNBAAAAAABEACo9KbNVEL7yttMyACGIxYS5UvkJDsXJiuIzPWmrzhVzDXTs1hi -3iS0EjkVB8mm8GLBKI25Pc9b7Rb2B3XeRcu2btUtWH61aBPOwcqpg8vt0MtcieZN -lpmwFBg0QtBdSrnUr/GdekRDcenSmIVPh8cyb9KCyJgcGxvTFWkd5lhrdQoAWAdM -TynUd8tKvmp9R6z54uPuGNUHbmNmHHDtv7LSOD79DIi+32bQGHevNTkCeXJNLO1P -5YJdz04xb7kGEhUodYoAx7RB2M18BdTk97XA7sHmoI3TayARHssPWtqJb1B8CK8x -uSHi1L7tHOF74pmo6V4Rt41gECMKjxLzXwB87hnrBxQ5UT8VZx5MBBQm+nfNKYH0 -MWAvWvaHGwBzNPabeGgaCoRT2OhC+0q4hPnYMxdSA61IYN6fch7LYfJdaPxOdGKH -/IMW091tS1JF9aY0ZGGy52DCVa+bC+4yHziqpCzf7aPJ4oCYtxZ904t6hocKlggG -bEM879Or9/nZ63smodUP907msUpFdvXUfFckAWAKms/SECN3lRvBnVj7VsHylvdi -gwUI+XkEw6NXscsTGepSWgQppz4hmQWFAhfkYZYl0P59HRyXa+PdyQeH+jDOlyNg -B6yIdCJWwDEiCvErqfJ9mulgrmZWePrjPYHOy1iFUueSoupxEbzBkm6LIwARAQAB -zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT -AQgAFgUCAAAAAAkQQ+4ZdD+sHVwCGw8CGQEAAHFMEAAB8oxf8GD/w6932R30qybr -Y6kJukhmsTSPszeILmIU+F0BDBekgPxApFZRHRjAbAfra131emtj1xrUXGi+Y2UL -E4wN/Ebaxc5TfJk46iklxHsRUNG6ikJOcSz8zIl2LYN1BEOYOOGTtJqpWq607ngF -hkK6FDqKYcomrWGfGOzp33ts4j8t52zwsipms7Z1x9DqQmYEZcT6kvPbAUKQh2oj -chTI6FixsL63UH26JtlxPwrXqDGy1LwL2VUzlTHYYAuo3A+t6gEWveMCv99jLa2U -jVdjhjSTC6vX+7Rj3qko1Gns9h2JmsBSpocEvpsOGseAGA6uVoZcbWG5AzW/729b -xkQ9mL2Ya/htPwG/pzzuHvmK/YdFdUYQvZJr82Gvtkiu0/KUN21FU5BeE0Zg0kCk -pM5s8vJtj87eJ4UsUNlDtVX1DtwHAP8G2Dmpd2lWkD6ulovwpNcHLQ+Q+YH7UyU6 -OjZzlX5yf4Tndm+Gv8YhnTOm6Bo6jgiMIZpJh5qObA0oY8dEAiDdy7mVsNR0AFUn -lWBjVAfO4keEwMPqs/RBONofixRkZLoX54s3ypAS8ltr/Qlxjk3fzDLf/en01uL8 -qOjTkYBRwfGZdIPVuTYsncxBVSh9/MPKF1zEYpTSFF4hxhW+00R9mpvNiqO4CHia -x2KNnq/P36Mpcv6X7j4U4Q== -=5d0j ------END PGP PUBLIC KEY BLOCK----- diff --git a/machines/default.nix b/machines/default.nix index 9734320..df5048b 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -3,13 +3,6 @@ let hardware = inputs.nixos-hardware.nixosModules; in { - nunotaba = { - system = "x86_64-linux"; - extraModules = [ - hardware.common-cpu-intel - hardware.common-pc-ssd - ]; - }; sayuri = { system = "x86_64-linux"; extraModules = [ diff --git a/machines/fuuko/services/prometheus.nix b/machines/fuuko/services/prometheus.nix index 7543ccd..7feedfe 100644 --- a/machines/fuuko/services/prometheus.nix +++ b/machines/fuuko/services/prometheus.nix @@ -73,7 +73,6 @@ in static_configs = mkStaticTargets [ "fuuko.vpn.sbruder.de:9100" "mayushii.vpn.sbruder.de:9100" - "nunotaba.vpn.sbruder.de:9100" "sayuri.vpn.sbruder.de:9100" "vueko.vpn.sbruder.de:9100" ]; @@ -141,7 +140,7 @@ in rules = map mkAlert [ { name = "InstanceDown"; - expr = ''up{instance!~"(nunotaba|sayuri|mayushii).vpn.sbruder.de:.*"} == 0''; + expr = ''up{instance!~"(sayuri|mayushii).vpn.sbruder.de:.*"} == 0''; description = "Instance {{ $labels.instance }} of job {{ $labels.job }} has been down for more than 1 minutes."; } { @@ -161,12 +160,6 @@ in for = "2m"; description = "Node {{ $labels.instance }} is using more than 90 % of available RAM."; } - { - name = "TP440ACPIBroken"; - expr = ''node_hwmon_temp_celsius{chip="thermal_thermal_zone0",instance="nunotaba.vpn.sbruder.de:9100",job="node",sensor="temp1"} == 48''; - for = "10m"; - description = "Thinkpad T440’s ACPI temperature is broken. Its reported temperature is 48 °C for the last 10 minutes. That doesn’t seem right. Try suspending"; - } { name = "TorrentNoPeers"; expr = "sum by (instance) (aria2_torrent_peers) == 0"; diff --git a/machines/nunotaba/README.md b/machines/nunotaba/README.md deleted file mode 100644 index 0d56e75..0000000 --- a/machines/nunotaba/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# nunotaba - -## Hardware - -ThinkPad T440 with mods to make it acceptable: - - * Touchpad is changed for the T450’s, which has physical mouse buttons (I - fucked up during the installation and the touchpad part does not work, so it - does not need to be disabled in software). - * Screen has a resolution of 1920×1080 and has an IPS panel - -It is used standalone or in on a docking station that connects it to an -external mouse, keyboard and monitor (Dell U2410). - -## Purpose - -It is my daily driver so it does everything (except server stuff obviously). - -## Name - -Shinobu Nunotaba is a student/scientist from *A Certain Scientific Railgun* diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix deleted file mode 100644 index 1b8c93e..0000000 --- a/machines/nunotaba/configuration.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = [ - ./hardware-configuration.nix - ../../modules - ../../users/simon - ]; - - sbruder = { - games = { - enable = true; - performanceIndex = 2; - }; - gui.enable = true; - media-proxy.enable = true; - mullvad.enable = true; - restic.system.enable = true; - unfree.allowSoftware = true; - wireguard.home.enable = true; - }; - - virtualisation.libvirtd = { - enable = true; - qemuPackage = pkgs.qemu_kvm; - }; - - services.tor = { - enable = true; - client.enable = true; - }; - services.privoxy = { - enable = true; - enableTor = true; - }; - - networking.hostName = "nunotaba"; - - system.stateVersion = "20.03"; -} diff --git a/machines/nunotaba/hardware-configuration.nix b/machines/nunotaba/hardware-configuration.nix deleted file mode 100644 index 9587eaa..0000000 --- a/machines/nunotaba/hardware-configuration.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, lib, modulesPath, pkgs, ... }: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; - loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2KB480G7_PHYS749202D6480BGN"; - initrd = { - availableKernelModules = [ "aesni_intel" "ahci" "ehci_pci" "rtsx_pci_sdmmc" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ]; - kernelModules = [ "dm-snapshot" ]; - luks.devices = { - root = { - name = "root"; - device = "/dev/disk/by-uuid/f3a2fa57-581b-4e95-9a45-d61cda9edc54"; - preLVM = true; - allowDiscards = true; - }; - }; - }; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/c3ab2182-18b3-4cc6-a5b3-3fef32222aef"; - fsType = "btrfs"; - options = [ "discard=async" "noatime" "compress=zstd" ]; - }; - - "/boot" = { - device = "/dev/disk/by-uuid/da2e90cc-1e0c-4691-8807-5d2f4858df6e"; - fsType = "ext2"; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/b9ad2d56-fee0-49df-98c1-00d93d991b9f"; } - ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; - - # Most of the time I want to use both screens at the same time and suspend it - # regularily by closing the lid - services.logind.lidSwitchDocked = config.services.logind.lidSwitch; - - hardware.opengl.extraPackages = with pkgs; [ - beignet # OpenCL for old intel GPU - ]; -} diff --git a/machines/nunotaba/secrets.yaml b/machines/nunotaba/secrets.yaml deleted file mode 100644 index c9bc258..0000000 --- a/machines/nunotaba/secrets.yaml +++ /dev/null @@ -1,51 +0,0 @@ -wg-home-private-key: ENC[AES256_GCM,data:u4svQwAMai742deedGbhr2Pk6wGdmztb1L+93ZQl9eZ8qAfOPhDrcmXAVSQ=,iv:ilMwQGV8+9Bk78lq6slLgKtQaWPgdTbwgA6pxgK5gLY=,tag:Vui4xbbvreC6j2UxrR0o3A==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - lastmodified: '2021-04-06T11:11:35Z' - mac: ENC[AES256_GCM,data:mP+I2i2Iam02GnIwnzO+AfQNaPKPyHR7JhVf5zrt2p1MuMBkDH5LZp3BT4YDxetj9u5bevyTuC4x2gZ+H2lcBUNovuXYLPEoNqE+MvwRHitSkDEV6qR5CPaA63AJll9dW6P0+c7Dv0QZTyO2Zs71Hk9hJEnUEmNbqo1xhgATvFw=,iv:hJ/Yaa55/O5XnRie8MKbe+vz4C4qFF8npOLy4E+9jBk=,tag:9ljgygjLx3fcid4XuJcebg==,type:str] - pgp: - - created_at: '2021-04-06T11:11:32Z' - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMAwDgSONkM+d4ARAAwkb7dnfNKpXcCxT+G9lgoS78eIlMQz/y5Ask6ENviXun - reSn7/DQJeFBhtK6XODqDUjYkg0VihviFGl47Fw7HfVZKYpG1KB7bXMiBBPycwAB - b0OmBMAwfH6tdfIye6shcal+4I1qlhCKmWBtNcg0KKd95EMK3sGki5l8cRlsFO/e - IA1f5Xw2/t8tfFdYIXrSqwInGcMIOKLBCO/NH7Fcw0enqZz4L9X5StfdxeHnirnt - QFw05FoH2LgTfDiF2MRbllRIVQD0XwylleL+4EAZGl83vsn95j/1CPuBtAq+Nnen - uKpVTyCMUiaokKHOMlNsv6elqxCHEs9ai9pwFkVZrBAoofjVEzuPoFw+2E9Fpvtk - hsAoSEPFLL9SKHpVTzaC3h272jrImQWitkqlZYzpaWAdDnG/3imRXx1cqX1AgJdz - hE6GHoBkDZ/TmE5DBNqQZ7h1JXvJPecu8EFaGwPKcq/AR3zgH6D1iUfpAPfoMpir - ngTHeZAsfUcaQ1h3KP9d6Atq6Q13C3SJL9DyE2NYl5NVMwLcBx8qSetItzwMpix4 - XqEj9jjpiUNYaY8oM9uzuGSDHlGsFPBEsvpqnDV2a2FqOmDS+faEgH7eXnqdbXgp - xBHH4F6hgUees0gpsum8Uf5yaZilaGkNJjKfpGPgI3W4WyFq10kk4lu4Zbgg3VfS - XgHcM8JkYx9cvsPO/QFbcOhVZeV60kyjHZY+bOufJ6iG9f8MrtsXY5IVx2I/wjCM - j3/YrY7vXK31i8toVf7+sPxipjoMItkppBg2Uo5SJg7hqksfBan/emVVT8zrOcY= - =swUH - -----END PGP MESSAGE----- - fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC - - created_at: '2021-04-06T11:11:32Z' - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMA0PuGXQ/rB1cAQ//T/ieiP/sj93zsDnMZNuahlyONBeY3Z5IbKCCi6iAl05b - 9bKKcKr37nPm/np2pAZjmGftNEpkwjfF047Qg9AcmnwyoIeOiYIGR6ILtnRwtjri - tx5RBDMpmPs/h3xocaqAWfHKxXGT452GKy6taOiHitjJcIWUKX0pFdOucw5u5/AL - mimc4S0W1iLUxXmNJAy/YxQKvBzkXtDx6/ixEm5JnxSG6Xn+q6Go9VPFGBOQLKnt - 1WHSUVu/6gHjtYmnt5VqDKjVY/pjZZrsLfFHAH8RlYPJMp48jQjoXptrZgdtPV7p - +fu+sEgMBal8W4YaI8bHG6iliYvSZoMcpvFsdoIhxThXzyZjMZCEY/h9a8oYqmdk - 6RQZl63LlxsZi5v5Db31pbaiPC30R6rTuCm5n4wTiOKqQ4WG61yd9Sc/R/3vT6ux - hZRywmZUVjVBT+TnZ+Eclcg2xm27Tk+uIRMYq4mjP0XV3oYCA+1o+La6YBpmBgMH - kpFbx3IcxHJT2gRFTg7bg78NYvgb5CYRFGz0sfnhlrwjLgYQFzJT7l2w/2yFDQdo - u+bDwF7cvNyGQiEEJilcuh1Cf/lk/1Ol+9LQftF2bNNzoKn2QzDeTp11bTrhPJnj - HNLwZjNord4fF7pak7bSkjYYKrhW+NpzN1oT7ioQ7V3If99Em4wMssGLRrzvBgLS - UAGk4FkNoLosNdxNDovwHwUK2T0zPWuOZ+wvRPcZQk9fTycdXo8MhiyaLaU09Nsh - mWG2tdK/8KDP1aXupXzT70XQUk2q8QxwRYAJOa3NupXV - =pjuj - -----END PGP MESSAGE----- - fp: 8C5091AEA213FB0642BD46F943EE19743FAC1D5C - unencrypted_suffix: _unencrypted - version: 3.6.0 diff --git a/modules/pubkeys.nix b/modules/pubkeys.nix index cb14a1b..6071805 100644 --- a/modules/pubkeys.nix +++ b/modules/pubkeys.nix @@ -8,7 +8,6 @@ in type = lib.types.attrsOf lib.types.str; description = "Known public keys that can be used in the configuration"; default = { - "simon@nunotaba" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwMo0mYcTU1Y4BKpEUsvKAtcTPq3ylKaw+ZjUxNg9VqU5gDy2TDUfWk2FjM2VYcqQJ9ZaNGKE1S18fRU7ZHrcgtFPMgAuji87yOKojH74cwz9ZRf5ZiluWBmR3dFd7kddqHUKVS8utpiQuTLIyQwpgmUHA81IasWXuB2pHaI6HGntMlJTm1CvpcQvwKsDBqJ2bFjFMk6EDgAZWXyooQgthYAfmc+YfAX5T9fWKiqFnEJ0ryN3/RngJZe65HWV8WZwY1CxgKQhOZuRcPdkTEQlUk9Qu0JbVa2sTgdYDpw/Dz0ma+h4rxOrH63MD6Cf0pFgOwLeZVSmXqKTjXVaH1QkHWRat88J8Q6MM6LlhLx/48VcQshhIssAZ37YoW2W0NxnGSM7YtlwTVe+w7rU//cS5TyIQa4joq2pnIh4uurbNkIULa4Q2t2nEMzlqI9gEE9DK1ctOcuCyFOerNZD0yRZ5Rs8WouDLL1PR6ps4czK2N7h2MXABcELuVwX+sdxwFgf6AJaRvrlw4qIOohpeX48FhzZfcI9Cqvnakm+O42J3qXuUDVc6/NjE9zBku3dNaeseGv9CQxtvyVDq6o9MRDiFror3yEiN0Fwou7CXBfXrbeb7MvahsRxSKkSDY0uA+AXmsm1UwdArjEcEMsS1JeFQCdX1yR/Z5xzj2gx60NcR4w=="; "simon@sayuri" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1kQUoPII8A9/bgPA+OrZGQLPA8MxkdmPSCCsfGMh9qRZfF7BSD8W6VdE/28tLw+39QeUl1+/9VuVvGjZBP1zBAbKIcKx4DjtgxpNXCsfWMjXFtpTGk2dyl71CaY5n72YlADxXYwtEvuwfNixgE2yTCefMbBsfwqYC0GZGiDlFtjxdg+RuUC8jU++C+WFUFct9gj9ieQ0LWjud+Oh0AF0JhyGnou+wVZIIO8mwo7Cc5xiPldXhbc13XiNC3mpNGCLFj+nh1feazk8TeAVDBps6xaDkOd+hDwTBQh8LoimePK7MiShzLvC38Vd/sim5ym/IqY634CjqBDGCMp1KXnqHUTT8CqeifMv10+aRJKUPevVkO3nEE3VoSPt7Ui9ZzLnL4qhZyygoBau+PvD2WCWm+gRwBkvU1uNrYKi4HIGhB/gXcYHKJimqJwLMyqG5Wv1jfuhn3ZZN+uNqTgdAznGgPRU1Q/Mx6nMEDiQip78qdYEc0YGwdb/TldEL6aHRjuNuZPpTW+zakQHiQTRb/0VdZT1bAwyT9yL0Uf40h706Kh/pKiSQ1yq1dlSdl3RlfedbqLqGjspds1iRSrSXyH2MBghPbz/SF7Vt4LW/tXF0rcyV7CU98ZvxJDWeN60OE0vPf/AT5udYyfPO1691y0F8jGKxGYYPg9R/Y5o7J24PbQ=="; "simon@mayushii" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ7qUGZUjiDhQ6Se+aXr9DbgRTG2tx69owqVMkd2bna"; }; @@ -17,7 +16,6 @@ in type = lib.types.listOf lib.types.str; description = "Names of trusted public keys, used to generate sbruder.pubkeys.trustedKeys"; default = [ - "simon@nunotaba" "simon@sayuri" "simon@mayushii" ]; diff --git a/modules/ssh.nix b/modules/ssh.nix index f1b884b..188fd50 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -11,10 +11,6 @@ programs.ssh.knownHosts = { "[git.sbruder.de]:2022".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINV/2NbmkWuOs/RyULTex1MkLaKrrDJFj8piX2CR+ms/"; - nunotaba = { - hostNames = [ "nunotaba" "nunotaba.home.sbruder.de" "nunotaba.vpn.sbruder.de" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvJzN9+aRGjd4hPAOe6ZlDr8V3CXX9stRNSAAv9uC8j"; - }; sayuri = { hostNames = [ "sayuri" "sayuri.home.sbruder.de" "sayuri.vpn.sbruder.de" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIg/622wS8SFlzS29TPW9li3pNdbdHNjlGb4XTyXR0QR"; diff --git a/modules/wireguard/home.nix b/modules/wireguard/home.nix index 2f36e4b..cb17381 100644 --- a/modules/wireguard/home.nix +++ b/modules/wireguard/home.nix @@ -2,10 +2,6 @@ let serverHostName = "vueko"; peers = { - nunotaba = { - address = "10.80.0.4"; - publicKey = "DvR8mUkll4uyYhNcX82caMkbcw0Lykg8zDzm/3PD5jw="; - }; sayuri = { address = "10.80.0.5"; publicKey = "t7hpd2yZupAKHxYerHtXnlPRUjV1aGbrrzjYakKdOwE="; diff --git a/users/simon/modules/sway/kanshi.nix b/users/simon/modules/sway/kanshi.nix index 5fcade1..933a20e 100644 --- a/users/simon/modules/sway/kanshi.nix +++ b/users/simon/modules/sway/kanshi.nix @@ -6,25 +6,6 @@ let else { }; machineConfigs = { - nunotaba = { - standalone.outputs = lib.singleton { - criteria = "eDP-1"; - mode = "1920x1080"; - position = "0,0"; - }; - home.outputs = [ - { - criteria = "eDP-1"; - mode = "1920x1080"; - position = "0,424"; - } - { - criteria = "Dell Inc. DELL U2410 F525M0A104NL"; - mode = "1920x1200"; - position = "1920,0"; - } - ]; - }; mayushii = { standalone.outputs = lib.singleton { criteria = "eDP-1";