From fbd485cd86c7e9984819357398f912a2d5510845 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Sep 2023 12:56:39 +0200 Subject: tv: emigrate --- tv/1systems/alnus/config.nix | 87 ------------------------ tv/1systems/alnus/lib | 1 - tv/1systems/au/config.nix | 23 ------- tv/1systems/au/disks.nix | 19 ------ tv/1systems/au/lib | 1 - tv/1systems/bu/config.nix | 35 ---------- tv/1systems/bu/disks.nix | 19 ------ tv/1systems/bu/lib | 1 - tv/1systems/lib | 1 - tv/1systems/mu/config.nix | 127 ---------------------------------- tv/1systems/mu/lib | 1 - tv/1systems/nomic/config.nix | 62 ----------------- tv/1systems/nomic/lib | 1 - tv/1systems/querel/config.nix | 86 ----------------------- tv/1systems/querel/lib | 1 - tv/1systems/ru/config.nix | 37 ---------- tv/1systems/xu/config.nix | 154 ------------------------------------------ tv/1systems/xu/lib | 1 - tv/1systems/zu/config.nix | 51 -------------- 19 files changed, 708 deletions(-) delete mode 100644 tv/1systems/alnus/config.nix delete mode 120000 tv/1systems/alnus/lib delete mode 100644 tv/1systems/au/config.nix delete mode 100644 tv/1systems/au/disks.nix delete mode 120000 tv/1systems/au/lib delete mode 100644 tv/1systems/bu/config.nix delete mode 100644 tv/1systems/bu/disks.nix delete mode 120000 tv/1systems/bu/lib delete mode 120000 tv/1systems/lib delete mode 100644 tv/1systems/mu/config.nix delete mode 120000 tv/1systems/mu/lib delete mode 100644 tv/1systems/nomic/config.nix delete mode 120000 tv/1systems/nomic/lib delete mode 100644 tv/1systems/querel/config.nix delete mode 120000 tv/1systems/querel/lib delete mode 100644 tv/1systems/ru/config.nix delete mode 100644 tv/1systems/xu/config.nix delete mode 120000 tv/1systems/xu/lib delete mode 100644 tv/1systems/zu/config.nix (limited to 'tv/1systems') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix deleted file mode 100644 index 90501d56..00000000 --- a/tv/1systems/alnus/config.nix +++ /dev/null @@ -1,87 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - - - ]; - - boot = { - initrd = { - availableKernelModules = [ "ahci" ]; - luks.devices.luksroot.device = "/dev/sda2"; - }; - }; - - environment.systemPackages = [ - pkgs.firefox - pkgs.networkmanagerapplet - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - ]; - - fileSystems = { - "/boot" = { - device = "/dev/sda1"; - }; - "/" = { - device = "/dev/mapper/main-root"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - }; - "/home" = { - device = "/dev/mapper/main-home"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - }; - }; - - hardware = { - opengl.driSupport32Bit = true; - pulseaudio.enable = true; - }; - - i18n.defaultLocale = "de_DE.UTF-8"; - - krebs.build = { - host = config.krebs.hosts.alnus; - user = mkForce config.krebs.users.dv; - }; - - networking.networkmanager.enable = true; - - services.earlyoom.enable = true; - services.earlyoom.freeMemThreshold = 5; - systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ - "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs - ]; - - services.xserver = { - enable = true; - layout = "de"; - xkbOptions = "eurosign:e"; - - libinput.enable = false; - synaptics = { - enable = true; - twoFingerScroll = true; - }; - }; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "dv"; - - system.stateVersion = "22.05"; - - users.users.dv = { - inherit (config.krebs.users.dv) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/alnus/lib b/tv/1systems/alnus/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/alnus/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/au/config.nix b/tv/1systems/au/config.nix deleted file mode 100644 index 2521059b..00000000 --- a/tv/1systems/au/config.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, ... }: { - imports = [ - ./disks.nix - - - - - - ]; - - krebs.build.host = config.krebs.hosts.au; - - networking.wireless.enable = true; - networking.useDHCP = false; - networking.interfaces.enp0s25.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - networking.interfaces.wwp0s29u1u4i6.useDHCP = true; - - system.stateVersion = "20.03"; - - tv.hw.screens.primary.width = 1920; - tv.hw.screens.primary.height = 1080; -} diff --git a/tv/1systems/au/disks.nix b/tv/1systems/au/disks.nix deleted file mode 100644 index 434de174..00000000 --- a/tv/1systems/au/disks.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - boot.initrd.luks.devices.main.device = "/dev/sda2"; - fileSystems."/" = { - device = "/dev/main/root"; - options = ["defaults" "noatime" "commit=60"]; - }; - fileSystems."/boot" = { - device = "/dev/sda1"; - options = ["defaults" "noatime"]; - }; - fileSystems."/bku" = { - device = "/dev/main/bku"; - options = ["defaults" "noatime"]; - }; - fileSystems."/home" = { - device = "/dev/main/home"; - options = ["defaults" "noatime" "commit=60"]; - }; -} diff --git a/tv/1systems/au/lib b/tv/1systems/au/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/au/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/bu/config.nix b/tv/1systems/bu/config.nix deleted file mode 100644 index a3959cd8..00000000 --- a/tv/1systems/bu/config.nix +++ /dev/null @@ -1,35 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - ./disks.nix - - - - - - - - ]; - - krebs.build.host = config.krebs.hosts.bu; - - networking.wireless.enable = true; - networking.useDHCP = false; - networking.interfaces.enp0s25.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - networking.interfaces.wwp0s29u1u4i6.useDHCP = true; - networking.wireless.interfaces = [ - "wlp3s0" - ]; - - programs.gnupg.agent.enable = true; - programs.gnupg.agent.pinentryFlavor = "gtk2"; - - services.earlyoom.enable = true; - services.earlyoom.freeMemThreshold = 5; - systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ - "--prefer '(^|/)chromium$'" - ]; - - system.stateVersion = "21.11"; -} diff --git a/tv/1systems/bu/disks.nix b/tv/1systems/bu/disks.nix deleted file mode 100644 index deabefa7..00000000 --- a/tv/1systems/bu/disks.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - boot.initrd.luks.devices.buda2.device = "/dev/sda2"; - fileSystems."/" = { - device = "buda2/root"; - fsType = "zfs"; - }; - fileSystems."/bku" = { - device = "buda2/bku"; - fsType = "zfs"; - }; - fileSystems."/home" = { - device = "buda2/home"; - fsType = "zfs"; - }; - fileSystems."/boot" = { - device = "/dev/sda1"; - fsType = "vfat"; - }; -} diff --git a/tv/1systems/bu/lib b/tv/1systems/bu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/bu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/lib b/tv/1systems/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix deleted file mode 100644 index 00cdf84c..00000000 --- a/tv/1systems/mu/config.nix +++ /dev/null @@ -1,127 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - - - - ]; - - krebs.build.host = config.krebs.hosts.mu; - krebs.build.user = mkForce config.krebs.users.vv; - - tv.x0vncserver.enable = true; - - boot.initrd.luks.devices.muca.device = "/dev/sda2"; - boot.initrd.availableKernelModules = [ "ahci" ]; - boot.kernelModules = [ "fbcon" "kvm-intel" ]; - boot.kernelParams = [ "fsck.repair=yes" ]; - boot.extraModulePackages = [ ]; - - fileSystems = { - "/" = { - device = "/dev/mapper/muvga-root"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/home" = { - device = "/dev/mapper/muvga-home"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/boot" = { - device = "/dev/sda1"; - fsType = "vfat"; - }; - }; - - nixpkgs.config.allowUnfree = true; - hardware.opengl.driSupport32Bit = true; - - hardware.pulseaudio.enable = true; - - hardware.enableRedistributableFirmware = true; - - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; - - networking.networkmanager.enable = true; - - # XXX reload to work around occasional "Failed to load firmware chunk!" - # TODO only do this if firmware is actually broken(?) - system.activationScripts.reload-iwlwifi = /* sh */ '' - ${pkgs.kmod}/bin/modprobe -vr iwlwifi - ${pkgs.kmod}/bin/modprobe -v iwlwifi - ''; - - environment.systemPackages = [ - pkgs.chromium - pkgs.firefox - pkgs.gimp - pkgs.iptables - pkgs.libreoffice - pkgs.plasma-pa - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - pkgs.skypeforlinux - pkgs.slock - pkgs.tinc_pre - pkgs.vim - pkgs.xsane - - #pkgs.foomatic_filters - #pkgs.gutenprint - #pkgs.cups_pdf_filter - #pkgs.ghostscript - ]; - - - i18n.defaultLocale = "de_DE.UTF-8"; - - programs.ssh.startAgent = false; - - krebs.setuid = { - slock = { - filename = "${pkgs.slock}/bin/slock"; - mode = "4111"; - }; - }; - - security.pam.loginLimits = [ - # for jack - { domain = "@audio"; item = "memlock"; type = "-"; value = "unlimited"; } - { domain = "@audio"; item = "rtprio"; type = "-"; value = "99"; } - ]; - - fonts.fonts = [ - pkgs.xorg.fontschumachermisc - ]; - - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; - - # TODO this is host specific - services.xserver.libinput.enable = false; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; - - services.xserver.desktopManager.plasma5.enable = true; - - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "vv"; - - users.users.vv = { - inherit (config.krebs.users.vv) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/mu/lib b/tv/1systems/mu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/mu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix deleted file mode 100644 index 5bc25fd3..00000000 --- a/tv/1systems/nomic/config.nix +++ /dev/null @@ -1,62 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.nomic; - - imports = [ - - - - - - - - - - ]; - - boot.initrd.luks.devices.luks1.device = "/dev/sda2"; - - # Don't use UEFI because current disk was partitioned/formatted for AO753. - # TODO remove following bool.loader section after repartitioning/reformatting - boot.loader = { - grub = { - device = "/dev/sda"; - splashImage = null; - }; - systemd-boot.enable = mkForce false; - }; - - fileSystems."/" = - { device = "/dev/mapper/nomic1-root"; - fsType = "btrfs"; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/mapper/nomic1-home"; - fsType = "btrfs"; - }; - - environment.systemPackages = with pkgs; [ - (writeDashBin "play" '' - set -euf - mpv() { exec ${mpv}/bin/mpv "$@"; } - case $1 in - deepmix) mpv http://deepmix.ru/deepmix128.pls;; - groovesalad) mpv http://somafm.com/play/groovesalad;; - ntslive) mpv http://listen2.ntslive.co.uk/listen.pls;; - *) - echo "$0: bad argument: $*" >&2 - exit 23 - esac - '') - gnupg - tmux - ]; - - networking.wireless.enable = true; -} diff --git a/tv/1systems/nomic/lib b/tv/1systems/nomic/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/nomic/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix deleted file mode 100644 index 7ba7d162..00000000 --- a/tv/1systems/querel/config.nix +++ /dev/null @@ -1,86 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - ]; - - krebs.build.host = config.krebs.hosts.querel; - krebs.build.user = mkForce config.krebs.users.itak; - - boot.initrd.availableKernelModules = [ "ahci" ]; - boot.initrd.luks.devices.querel-luks1 = { - allowDiscards = true; - device = "/dev/sda2"; - }; - boot.kernelModules = [ "kvm-intel" ]; - boot.loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = true; - }; - - environment.systemPackages = [ - pkgs.firefox - pkgs.gimp - pkgs.kate - pkgs.libreoffice - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - pkgs.sxiv - pkgs.texlive.combined.scheme-full - pkgs.vim - pkgs.xsane - pkgs.zathura - ]; - - fileSystems = { - "/" = { - device = "/dev/mapper/querel-root"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/home" = { - device = "/dev/mapper/querel-home"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - hardware.enableRedistributableFirmware = true; - hardware.pulseaudio.enable = true; - - i18n.defaultLocale = "de_DE.UTF-8"; - - networking.networkmanager.enable = true; - - programs.ssh.startAgent = false; - - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; - - services.xserver.libinput.enable = false; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; - - services.xserver.desktopManager.plasma5.enable = true; - - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "itak"; - - users.users.itak = { - inherit (config.krebs.users.itak) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/querel/lib b/tv/1systems/querel/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/querel/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/ru/config.nix b/tv/1systems/ru/config.nix deleted file mode 100644 index 0fc62167..00000000 --- a/tv/1systems/ru/config.nix +++ /dev/null @@ -1,37 +0,0 @@ -with import ./lib; -{ config, ... }: { - imports = [ - ../.. - ../../2configs/hw/winmax2.nix - ../../2configs/retiolum.nix - ../../2configs/wiregrill.nix - ]; - - boot.initrd.luks.devices.main.device = "/dev/nvme0n1p2"; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/mapper/ruvg0-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - fileSystems."/boot" = { - device = "/dev/nvme0n1p1"; - fsType = "vfat"; - }; - fileSystems."/home" = { - device = "/dev/mapper/ruvg0-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - fileSystems."/bku" = { - device = "/dev/mapper/ruvg0-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - - krebs.build.host = config.krebs.hosts.ru; - - system.stateVersion = "22.11"; -} diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix deleted file mode 100644 index 83e17e1b..00000000 --- a/tv/1systems/xu/config.nix +++ /dev/null @@ -1,154 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.xu; - - imports = [ - - ../../2configs/autotether.nix - - - - - - - - - - - - - - - - { - environment.systemPackages = with pkgs; [ - - - # root - cryptsetup - - # tv - bc - bind # dig - brain - cac-api - dic - file - gnupg1compat - haskellPackages.hledger - jq - mkpasswd - netcat - netcup - nmap - p7zip - (pkgs.pass.withExtensions (ext: [ - ext.pass-otp - ])) - q - qrencode - texlive.combined.scheme-full - tmux - - #ack - #apache-httpd - #ascii - #emacs - #es - #esniper - #gcc - #gptfdisk - #graphviz - #haskellPackages.cabal2nix - #haskellPackages.ghc - #haskellPackages.shake - #hdparm - #i7z - #iftop - #imagemagick - #inotifyTools - #iodine - #iotop - #lshw - #lsof - #minicom - #mtools - #ncmpc - #nethogs - #nix-prefetch-scripts #cvs bug - #openssl - #openswan - #parted - #perl - #powertop - #ppp - #proot - #pythonPackages.arandr - #pythonPackages.youtube-dl - #racket - #rxvt_unicode-with-plugins - #scrot - #sec - #silver-searcher - #sloccount - #smartmontools - #socat - #sshpass - #strongswan - #sysdig - #sysstat - #tcpdump - #tlsdate - #unetbootin - #utillinuxCurses - #xdotool - #xkill - #xl2tpd - #xsel - - unison - ]; - } - ]; - - boot.initrd.luks.devices.xuca.device = "/dev/sda2"; - - fileSystems = { - "/" = { - device = "/dev/mapper/xuvga-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/bku" = { - device = "/dev/mapper/xuvga-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/home" = { - device = "/dev/mapper/xuvga-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - environment.systemPackages = with pkgs; [ - ethtool - tinc_pre - iptables - #jack2 - - gptfdisk - ]; - - networking.wireless.enable = true; - - #services.bitlbee.enable = true; - #services.tor.client.enable = true; - #services.tor.enable = true; - - # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "15.09"; -} diff --git a/tv/1systems/xu/lib b/tv/1systems/xu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/xu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix deleted file mode 100644 index 169fa6bd..00000000 --- a/tv/1systems/zu/config.nix +++ /dev/null @@ -1,51 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.zu; - - imports = [ - - - - - - - - - - - ]; - - boot.initrd.luks.devices.zuca.device = "/dev/sda2"; - - fileSystems = { - "/" = { - device = "/dev/mapper/zuvga-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/bku" = { - device = "/dev/mapper/zuvga-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/home" = { - device = "/dev/mapper/zuvga-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - networking.wireless.enable = true; - - services.printing.enable = true; - - #services.bitlbee.enable = true; - #services.tor.client.enable = true; - #services.tor.enable = true; - - # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "15.09"; -} -- cgit v1.2.3