From 75ea723caea05056810dad9160bc93e571c77985 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 14 Sep 2023 18:48:40 +0200 Subject: machines: Remove tyree and brawndo The former no longer exists and the latter has a new hardware and it's self-managed by the owner now (which is always the best IMHO). With both machines gone, we no longer need the "managed" profile and the BFQ module that was used for the old hardware of Brawndo was no longer used anywhere else. Same with the T100HA module, since Tyree was an ASUS T100HA and apart from the module being probably very much outdated we don't have another such hardware in Vuizvui. Signed-off-by: aszlig --- machines/aszlig/managed/brawndo.nix | 54 ---------------------------- machines/aszlig/managed/tyree.nix | 72 ------------------------------------- machines/default.nix | 4 --- 3 files changed, 130 deletions(-) delete mode 100644 machines/aszlig/managed/brawndo.nix delete mode 100644 machines/aszlig/managed/tyree.nix (limited to 'machines') diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix deleted file mode 100644 index 6960a0b6..00000000 --- a/machines/aszlig/managed/brawndo.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, pkgs, unfreePkgs, unfreeAndNonDistributablePkgs, lib, ... }: - -let - mainDisk = "ata-WDC_WD5000LPVX-22V0TT0_WD-WXG1E2559AYH"; - rootUUID = "dbbd5a35-3ac0-4d5a-837d-914457de14a4"; - -in { - boot = { - initrd.availableKernelModules = [ - "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" - "rtsx_pci_sdmmc" - ]; - kernelModules = [ "kvm-intel" "wl" ]; - kernelPackages = pkgs.linuxPackages_latest; - extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/${rootUUID}"; - fsType = "btrfs"; - options = [ "compress=zstd" "space_cache" "noatime" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/534F-980B"; - fsType = "vfat"; - }; - - hardware.enableAllFirmware = true; - hardware.cpu.intel.updateMicrocode = true; - - networking.hostName = "brawndo"; - - nix.settings.max-jobs = 4; - - nixpkgs.config.allowUnfree = true; # XXX: More granularity! - - environment.systemPackages = with pkgs; [ - vuizvui.aszlig.axbo chromium firefox gpodder opentyrian unfreePkgs.steam - python3 unfreeAndNonDistributablePkgs.vscode-with-extensions - ]; - - i18n.defaultLocale = "en_US.UTF-8"; - - services = { - deluge.enable = true; - printing.drivers = [ pkgs.cups-bjnp pkgs.cnijfilter2 ]; - }; - - swapDevices = lib.singleton { label = "swap"; }; - - vuizvui.user.aszlig.profiles.managed.enable = true; - vuizvui.user.aszlig.profiles.managed.mainUser = "dwenola"; -} diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix deleted file mode 100644 index 65ed91f7..00000000 --- a/machines/aszlig/managed/tyree.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ pkgs, lib, ... }: - -{ - boot.initrd.availableKernelModules = [ "usbhid" ]; - boot.kernelModules = [ "kvm-intel" ]; - - boot.initrd.luks.devices = { - "00-vault" = { - device = "/dev/disk/by-uuid/e4eb3d30-7fa5-4af4-86fb-80b47518cc25"; - }; - tyree-swap = { - device = "/dev/disk/by-uuid/d96e29b4-0b9a-442d-af27-805f69ffffb3"; - keyFile = "/dev/mapper/00-vault"; - }; - tyree-root = { - device = "/dev/disk/by-uuid/21e9a86e-c8dc-4d8f-ba75-d03552dc32f7"; - keyFile = "/dev/mapper/00-vault"; - }; - }; - - boot.initrd.postDeviceCommands = lib.mkAfter '' - cryptsetup luksClose /dev/mapper/00-vault - ''; - - environment.systemPackages = with pkgs; [ - aqbanking darktable digikam firefox gwenhywfar gphoto2 kgpg kmymoney krita - mosh python3Packages.weboob rawtherapee wget - ]; - - fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D"; - fileSystems."/boot".fsType = "vfat"; - - fileSystems."/".label = "tyree-root"; - fileSystems."/".fsType = "btrfs"; - fileSystems."/".options = [ - "compress=zstd" - "discard" - "noatime" - "space_cache" - "ssd" - ]; - - swapDevices = lib.singleton { - label = "tyree-swap"; - }; - - i18n.defaultLocale = "de_DE.UTF-8"; - - networking.hostName = "tyree"; - networking.useNetworkd = true; - networking.useDHCP = false; - networking.interfaces.wlan0.useDHCP = true; - - hardware.cpu.intel.updateMicrocode = true; - - nix.settings.max-jobs = 4; - - # English within the shell, German otherwise (like in KDE). - programs.bash.interactiveShellInit = lib.mkBefore '' - export LANG=en_US.UTF-8 - ''; - - services.journald.extraConfig = "SystemMaxUse=100M"; - - services.xserver.xkbOptions = "eurosign:e,caps:none"; - services.xserver.wacom.enable = true; - - vuizvui.user.aszlig.profiles.managed.enable = true; - vuizvui.user.aszlig.profiles.managed.mainUser = "bla"; - - vuizvui.hardware.t100ha.enable = true; -} diff --git a/machines/default.nix b/machines/default.nix index e6018b82..fe4e82f0 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -5,10 +5,6 @@ with import ../lib; dnyarri = callMachine ./aszlig/dnyarri.nix {}; meshuggah = callMachine ./aszlig/meshuggah.nix {}; slylandro = callMachine ./aszlig/slylandro.nix {}; - managed = { - brawndo = callMachine ./aszlig/managed/brawndo.nix {}; - tyree = callMachine ./aszlig/managed/tyree.nix {}; - }; }; devhell = { eir = callMachine devhell/eir.nix {}; -- cgit 1.4.1