From 392687498c5d8562c7b07f38c29366744f82e6ad Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Fri, 14 May 2021 00:37:10 +0200 Subject: [PATCH] Remove unused (server) configurations --- defaults/nextcloud/README.adoc | 4 -- defaults/nextcloud/default.nix | 23 ------ defaults/tt-rss/default.nix | 10 --- defaults/webserver/default.nix | 5 -- docs/hardware/apu.adoc | 5 -- docs/hardware/asrock.md | 4 -- docs/hardware/nuc.md | 4 -- docs/network.adoc | 72 ------------------- docs/setup.adoc | 4 -- hardware/apu.nix | 28 -------- hardware/apu1.nix | 30 -------- hardware/asrock.nix | 20 ------ hardware/dell-precision-3530.nix | 20 ------ hardware/nuc.nix | 20 ------ ...0k-override-eeprom-regulatory-domain.patch | 40 ----------- hardware/wle-regulatory-domain/default.nix | 15 ---- hardware/wle200nx.nix | 5 -- hardware/wle600vx.nix | 9 --- hardware/wle900vx.nix | 8 --- meta/users.nix | 27 ------- 20 files changed, 353 deletions(-) delete mode 100644 defaults/nextcloud/README.adoc delete mode 100644 defaults/nextcloud/default.nix delete mode 100644 defaults/tt-rss/default.nix delete mode 100644 defaults/webserver/default.nix delete mode 100644 docs/hardware/apu.adoc delete mode 100644 docs/hardware/asrock.md delete mode 100644 docs/hardware/nuc.md delete mode 100644 docs/network.adoc delete mode 100644 docs/setup.adoc delete mode 100644 hardware/apu.nix delete mode 100644 hardware/apu1.nix delete mode 100644 hardware/asrock.nix delete mode 100644 hardware/dell-precision-3530.nix delete mode 100644 hardware/nuc.nix delete mode 100644 hardware/wle-regulatory-domain/ath10k-override-eeprom-regulatory-domain.patch delete mode 100644 hardware/wle-regulatory-domain/default.nix delete mode 100644 hardware/wle200nx.nix delete mode 100644 hardware/wle600vx.nix delete mode 100644 hardware/wle900vx.nix diff --git a/defaults/nextcloud/README.adoc b/defaults/nextcloud/README.adoc deleted file mode 100644 index 0d36706..0000000 --- a/defaults/nextcloud/README.adoc +++ /dev/null @@ -1,4 +0,0 @@ -== Nextcloud Role - -This role manages the nextcloud installation. - diff --git a/defaults/nextcloud/default.nix b/defaults/nextcloud/default.nix deleted file mode 100644 index 04b74c8..0000000 --- a/defaults/nextcloud/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# Default configuration for hosts -{ config, lib, pkgs, ... }: - -{ - services.nextcloud = { - enable = true; - https = true; - webfinger = true; - maxUploadSize = "1G"; - - config = { - adminpassFile = "/secrets/nextcloud-admin"; # TODO - adminuser = "root"; - dbtype = "pgsql"; - dbhost = "/run/postgresql"; - }; - }; - - systemd.services."nextcloud-setup" = { - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - }; -} diff --git a/defaults/tt-rss/default.nix b/defaults/tt-rss/default.nix deleted file mode 100644 index 1ea5420..0000000 --- a/defaults/tt-rss/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services.tt-rss = { - enable = true; - sessionCookieLifetime = 0; - - database = { type = "pgsql"; }; - }; -} diff --git a/defaults/webserver/default.nix b/defaults/webserver/default.nix deleted file mode 100644 index 6dfc267..0000000 --- a/defaults/webserver/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services.nginx = { logError = "stderr warn"; }; -} diff --git a/docs/hardware/apu.adoc b/docs/hardware/apu.adoc deleted file mode 100644 index 8c90370..0000000 --- a/docs/hardware/apu.adoc +++ /dev/null @@ -1,5 +0,0 @@ - - -## Setup - -To boot the nixos installer with the console port, add `console=ttyS0,115200n8` to the kernel command line in grub. diff --git a/docs/hardware/asrock.md b/docs/hardware/asrock.md deleted file mode 100644 index c74b73a..0000000 --- a/docs/hardware/asrock.md +++ /dev/null @@ -1,4 +0,0 @@ - - -F2: Boot into BIOS -F11: Select boot device diff --git a/docs/hardware/nuc.md b/docs/hardware/nuc.md deleted file mode 100644 index a681789..0000000 --- a/docs/hardware/nuc.md +++ /dev/null @@ -1,4 +0,0 @@ - -## Boot - -- [Boot Keybindings](https://www.intel.com/content/www/us/en/support/articles/000005672/boards-and-kits/desktop-boards.html) diff --git a/docs/network.adoc b/docs/network.adoc deleted file mode 100644 index 6d0276f..0000000 --- a/docs/network.adoc +++ /dev/null @@ -1,72 +0,0 @@ -== Network - -This document provides an overview over the qo.is network structure. - -=== Physical View - -[plantuml, network, svg] ----- -skinparam style strictuml -left to right direction - -package "plessur.net.qo.is" { - - entity mediaconvchur [ - Media - Converter - (Passive) - ] - - node calanda - node montalin - - cloud plessurnet [ - LAN Plessur - ] - - mediaconvchur - "enp4" calanda - calanda "br0 (enp2, wlp1, wlp5)" --- plessurnet - calanda "enp4" -- "eno1" montalin -} - -package "jona.net.qo.is" { - node bachtel - - cloud jonanet [ - LAN Jona - ] - - bachtel "enp0-4" -- jonanet -} - -cloud internet[ -@ -] - -internet .. mediaconvchur: INIT7 Fiber -internet ~~ "wwp0s19" bachtel: Swisscom LTE ----- - - - - -=== DNS - - -All Services are published under the *qo.is* domain name. Following services are available: - -[horizontal] -qo.is.:: Primery Domain - Redirect to docs.qo.is and some .well-known ressources - -docs:: Documentation Website for qo.is services etc. -www:: redirect to docs.qo.is - -dns:: Authoritative DNS Services -primary.dns::: Master Authoritive DNS Server -secondary.dns::: Slave Authoritive DNS Server -cloud:: Nextcloud -feedreader:: RSS-Reader -id.qo.is:: SSO - -mx:: SMTP (External) -mail:: SMTP (Internal) and IMAP diff --git a/docs/setup.adoc b/docs/setup.adoc deleted file mode 100644 index d30928a..0000000 --- a/docs/setup.adoc +++ /dev/null @@ -1,4 +0,0 @@ -== Setup - -cryptsetup luksFormat --cipher -s ... - diff --git a/hardware/apu.nix b/hardware/apu.nix deleted file mode 100644 index bc78636..0000000 --- a/hardware/apu.nix +++ /dev/null @@ -1,28 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - -{ - imports = [ ]; - - boot.loader.grub.extraConfig = - "\n serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1\n terminal_input serial\n terminal_output serial\n "; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "ehci_pci" - "usbhid" - "usb_storage" - "sd_mod" - "sdhci_pci" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "virtio" "tun" ]; - boot.extraModulePackages = [ ]; - boot.kernelParams = [ "console=ttyS0,115200n8" ]; - - # CPU Configuration - hardware.cpu.amd.updateMicrocode = true; - nix.maxJobs = lib.mkDefault 4; -} diff --git a/hardware/apu1.nix b/hardware/apu1.nix deleted file mode 100644 index ae4de21..0000000 --- a/hardware/apu1.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - -{ - imports = [ ]; - - boot.loader.grub.extraConfig = - "\n serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1\n terminal_input serial\n terminal_output serial\n "; - boot.initrd.availableKernelModules = [ - "ahci" - "ohci_pci" - "xhci_pci" - "ahci" - "ehci_pci" - "usbhid" - "usb_storage" - "sd_mod" - "sdhci_pci" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "virtio" "tun" ]; - boot.extraModulePackages = [ ]; - boot.kernelParams = [ "console=ttyS0,115200n8" ]; - - hardware.cpu.amd.updateMicrocode = true; - - nix.maxJobs = lib.mkDefault 2; -} diff --git a/hardware/asrock.nix b/hardware/asrock.nix deleted file mode 100644 index 29d3cf1..0000000 --- a/hardware/asrock.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - "xhci_pci" - "ahci" - "virtio-pci" - "igb" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - hardware.cpu.amd.updateMicrocode = true; - nix.maxJobs = lib.mkDefault 24; -} diff --git a/hardware/dell-precision-3530.nix b/hardware/dell-precision-3530.nix deleted file mode 100644 index 197ea67..0000000 --- a/hardware/dell-precision-3530.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: { - - imports = [ ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "usbhid" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - boot.kernelModules = [ "kvm-intel" ]; - - # CPU Configuration - hardware.cpu.amd.updateMicrocode = true; - nix.maxJobs = lib.mkDefault 12; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; -} diff --git a/hardware/nuc.nix b/hardware/nuc.nix deleted file mode 100644 index 8472a64..0000000 --- a/hardware/nuc.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - -{ - imports = [ ]; - - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "e1000e" "virtio-pci" ]; - boot.initrd.kernelModules = [ ]; - # boot.kernelModules = [ "kvm-intel" "virtio" "tun" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - # boot.kernelParams = [ "console=ttyS0,115200n8" ]; - - hardware.cpu.intel.updateMicrocode = true; - powerManagement.cpuFreqGovernor = "ondemand"; - nix.maxJobs = lib.mkDefault 8; -} diff --git a/hardware/wle-regulatory-domain/ath10k-override-eeprom-regulatory-domain.patch b/hardware/wle-regulatory-domain/ath10k-override-eeprom-regulatory-domain.patch deleted file mode 100644 index 1b1f775..0000000 --- a/hardware/wle-regulatory-domain/ath10k-override-eeprom-regulatory-domain.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --unified --recursive --text archlinux-linux/drivers/net/wireless/ath/regd.c archlinux-linux-patched/drivers/net/wireless/ath/regd.c ---- a/drivers/net/wireless/ath/regd.c 2019-08-29 18:31:52.749909030 +0200 -+++ b/drivers/net/wireless/ath/regd.c 2019-08-29 18:33:33.318773763 +0200 -@@ -345,6 +345,8 @@ - struct ieee80211_channel *ch; - unsigned int i; - -+ return; -+ - for (band = 0; band < NUM_NL80211_BANDS; band++) { - if (!wiphy->bands[band]) - continue; -@@ -378,6 +380,8 @@ - { - struct ieee80211_supported_band *sband; - -+ return; -+ - sband = wiphy->bands[NL80211_BAND_2GHZ]; - if (!sband) - return; -@@ -407,6 +411,8 @@ - struct ieee80211_channel *ch; - unsigned int i; - -+ return; -+ - if (!wiphy->bands[NL80211_BAND_5GHZ]) - return; - -@@ -639,6 +645,9 @@ - const struct ieee80211_regdomain *regd; - - wiphy->reg_notifier = reg_notifier; -+ -+ return 0; -+ - wiphy->regulatory_flags |= REGULATORY_STRICT_REG | - REGULATORY_CUSTOM_REG; - diff --git a/hardware/wle-regulatory-domain/default.nix b/hardware/wle-regulatory-domain/default.nix deleted file mode 100644 index 3e1993d..0000000 --- a/hardware/wle-regulatory-domain/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: { - boot.kernelPatches = [{ - name = "ath10k-override-eeprom-regulatory-domain"; - patch = ./ath10k-override-eeprom-regulatory-domain.patch; - extraConfig = '' - EXPERT y - CFG80211_CERTIFICATION_ONUS y - ATH_REG_DYNAMIC_USER_REG_HINTS y - ATH_REG_DYNAMIC_USER_CERT_TESTING y - ATH_REG_DYNAMIC_USER_CERT_TESTING y - ATH9K_DFS_CERTIFIED y - ATH10K_DFS_CERTIFIED y - ''; - }]; -} diff --git a/hardware/wle200nx.nix b/hardware/wle200nx.nix deleted file mode 100644 index d15d429..0000000 --- a/hardware/wle200nx.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: { - services.hostapd.extraConfig = '' - ht_capab=[HT40-][HT40+][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40] - ''; -} diff --git a/hardware/wle600vx.nix b/hardware/wle600vx.nix deleted file mode 100644 index 7e8a629..0000000 --- a/hardware/wle600vx.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Note: You can either use wel600vx.nix or wle900vx.nix -{ config, lib, pkgs, ... }: { - imports = [ ./wle-regulatory-domain ]; - - services.hostapd5ghz.extraConfig = '' - ht_capab=[LDPC][HT40][SMPS-STATIC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40] - fragm_threshold=-1 - ''; -} diff --git a/hardware/wle900vx.nix b/hardware/wle900vx.nix deleted file mode 100644 index a7aa38b..0000000 --- a/hardware/wle900vx.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: { - imports = [ ./wle-regulatory-domain ]; - - services.hostapd5ghz.extraConfig = '' - ht_capab=[LDPC][HT40+][SHORT-GI-20][SHORT-GI-40][TX-STBC][DSSS_CCK-40] - vht_capab=[SHORT-GI-80][MAX-MPDU-11454][RXLDPC][TX-STBC-2BY1][MAX-A-MPDU-LEN-EXP3][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN] - ''; -} diff --git a/meta/users.nix b/meta/users.nix index ace620c..110b061 100644 --- a/meta/users.nix +++ b/meta/users.nix @@ -1,8 +1,6 @@ { groups = { fhauser.gid = 1000; - #TODO - #das-g.gid = 1001; empty0.gid = 1003; }; @@ -20,31 +18,6 @@ ]; }; - #TODO - #das-g = { - # uid = 1001; - # isNormalUser = true; - # description = "Raphael Das Gupta"; - # group = "das-g"; - # extraGroups = [ "wheel" ]; - # hashedPassword = - # "$6$rounds=37000$omA92cfwup$Ri9FXHbeOUIIDKf83D6UNa5NWGac.G9A3voJmrivwkVtaDGVMGLIa5qdgkaDeCKoMkl8YRjJ7smEyrMwTnuRD0"; - # openssh.authorizedKeys.keys = [ - # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDRWDaUzbDyCNee/K8iCcXtoLrR0fZoGpXAV4f/CjB8kKb42lWKWXc67Juy0RnRVCZQc21ooApuQPJZ08Cawj9Okgz0j3vYdMnDBY1Ox9Ik12hzbpdLDHhOrIj3BOJuAKfFy5OM9Z2ZLwdvjXFk+1RQK1Qadd3PwtGjxLAgp5eBHj8TgUP8DXKGQQElphjfVLua4ufqoTldT1mrmDn/+GDgNY5HUTQb+YZ6AwjcemG+eAdG30Al1JRkOogke83hIXBVNCD9ObPtRv/KiAZv3TV8bgP2mzeeG2aDDb9qz8HXKvBlbN2ouz0cWTA5D5+Ua+wkOggEfhfPKBauF9sbQ8bRuknWm8VnuVXkikzdYZVGKdzvoHRdOfoTCL4JHzpGW6H3jVqdQuGTv5r28y/jxbDY95w6KmxLS+2u8SHVBh6hVAxf5i3P8aIHkOTEN//SyS/fa1uXHSQt0sVya2+4pTsCQfwWjE3TrQg6W6bmguVMjaICze5wWwckap+57jKbK9sPCuLFfYPwOvQ3nfb6wwNBhvNxmD9xGfk8/UzXsoq6OgPvF7GE5UWA04GHCnF4H0tEAQBK0vsjKxqC2lM8nK9msbqkSxadIFYqiG1+DAZyju3uZgkkInev8dh02yNsVJKYoCm60PWaMTLeVsrYZuvNDWXsXm7+nD02wWI0lxnkVw== das-g@x1carbon" - # ]; - #}; - - rzimmermann = { - uid = 1002; - isNormalUser = true; - description = "Raphael Zimmermann"; - group = "rzimmermann"; - extraGroups = [ "wheel" ]; - hashedPassword = "$6$rounds=20000$TYZ8CojfBLwejcwn$smEJe6/anL9NGf.Ytfny1OMGtHISiSiNVALIDgHz7yg.zQow1HACeVERYmUCHiNVALIDGaT8t2NxobUsHbWLg1"; - openssh.authorizedKeys.keys = [ - ]; - }; - empty0 = { uid = 1003; isNormalUser = true;