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 --- modules/hardware/t100ha/brcmfmac43340-sdio.txt | Bin 3239 -> 0 bytes modules/hardware/t100ha/default.nix | 97 ------------------ modules/module-list.nix | 2 - .../system/kernel/bfq/bfq-by-default-4.15.patch | 13 --- .../system/kernel/bfq/bfq-by-default-4.18.patch | 13 --- modules/system/kernel/bfq/bfq-by-default-5.4.patch | 13 --- modules/system/kernel/bfq/bfq-by-default.patch | 13 --- modules/system/kernel/bfq/default.nix | 36 ------- modules/user/aszlig/profiles/managed.nix | 110 --------------------- 9 files changed, 297 deletions(-) delete mode 100644 modules/hardware/t100ha/brcmfmac43340-sdio.txt delete mode 100644 modules/hardware/t100ha/default.nix delete mode 100644 modules/system/kernel/bfq/bfq-by-default-4.15.patch delete mode 100644 modules/system/kernel/bfq/bfq-by-default-4.18.patch delete mode 100644 modules/system/kernel/bfq/bfq-by-default-5.4.patch delete mode 100644 modules/system/kernel/bfq/bfq-by-default.patch delete mode 100644 modules/system/kernel/bfq/default.nix delete mode 100644 modules/user/aszlig/profiles/managed.nix (limited to 'modules') diff --git a/modules/hardware/t100ha/brcmfmac43340-sdio.txt b/modules/hardware/t100ha/brcmfmac43340-sdio.txt deleted file mode 100644 index db22fef6..00000000 Binary files a/modules/hardware/t100ha/brcmfmac43340-sdio.txt and /dev/null differ diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix deleted file mode 100644 index 0d615624..00000000 --- a/modules/hardware/t100ha/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - cfg = config.vuizvui.hardware.t100ha; - desc = "hardware support for the ASUS T100HA convertible"; - -in { - options.vuizvui.hardware.t100ha.enable = lib.mkEnableOption desc; - - config = lib.mkIf cfg.enable { - hardware.firmware = lib.singleton (pkgs.runCommandLocal "t100ha-firmware" { - params = ./brcmfmac43340-sdio.txt; - fwpkg = pkgs.firmwareLinuxNonfree; - install = "install -vD -m 0644"; - } '' - for fw in brcm/brcmfmac43340-sdio intel/fw_sst_22a8; do - $install "$fwpkg/lib/firmware/$fw.bin" "$out/lib/firmware/$fw.bin" - done - $install "$params" "$out/lib/firmware/brcm/brcmfmac43340-sdio.txt" - ''); - - boot.kernelPackages = let - t100haKernel = pkgs.linux_4_19.override { - # Missing device drivers: - # - # 808622B8 -> Intel(R) Imaging Signal Processor 2401 - # 808622D8 -> Intel(R) Integrated Sensor Solution - # HIMX2051 -> Camera Sensor Unicam hm2051 - # IMPJ0003 -> Impinj RFID Device (MonzaX 8K) - # OVTI5670 -> Camera Sensor ov5670 - # - extraConfig = '' - # CPU - MATOM y - - # MMC - MMC y - MMC_BLOCK y - MMC_SDHCI y - MMC_SDHCI_ACPI y - - # PMIC - INTEL_PMC_IPC y - INTEL_SOC_PMIC y - MFD_AXP20X y - MFD_AXP20X_I2C y - - # Backlight - PWM y - PWM_SYSFS y - PWM_CRC y - GPIO_CRYSTAL_COVE y - - # GPU - AGP n - DRM y - DRM_I915 m - - # Thermal - INT3406_THERMAL m - INT340X_THERMAL m - - # GPIO - PINCTRL_CHERRYVIEW y - - # I2C - I2C_DESIGNWARE_BAYTRAIL y - I2C_DESIGNWARE_PLATFORM y - - # HID - INTEL_HID_EVENT y - - # MEI - INTEL_MEI y - INTEL_MEI_TXE y - ''; - }; - in pkgs.linuxPackagesFor t100haKernel; - - # By default the console is rotated by 90 degrees to the right. - boot.kernelParams = [ "fbcon=rotate:3" ]; - services.xserver.deviceSection = '' - Option "monitor-DSI1" "Monitor[0]" - ''; - services.xserver.monitorSection = '' - Option "Rotate" "left" - ''; - services.xserver.videoDriver = "intel"; - - # The touch screen needs to be rotated as well: - services.xserver.inputClassSections = lib.singleton '' - Identifier "touchscreen" - MatchProduct "SIS0457" - Option "TransformationMatrix" "0 -1 1 1 0 0 0 0 1" - ''; - }; -} diff --git a/modules/module-list.nix b/modules/module-list.nix index ebbdb288..6ecc185c 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -5,7 +5,6 @@ ./core/lazy-packages.nix ./hardware/gamecontroller.nix ./hardware/rtl8192cu - ./hardware/t100ha ./hardware/thinkpad.nix ./hardware/tuxedo-pulse1502 ./profiles/tvl.nix @@ -18,7 +17,6 @@ ./services/guix.nix ./services/upower-minimal.nix ./system/iso.nix - ./system/kernel/bfq ./system/kernel/rckernel.nix ./system/kernel/zswap.nix ./user/aszlig/profiles/base.nix diff --git a/modules/system/kernel/bfq/bfq-by-default-4.15.patch b/modules/system/kernel/bfq/bfq-by-default-4.15.patch deleted file mode 100644 index 8a4666ca..00000000 --- a/modules/system/kernel/bfq/bfq-by-default-4.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/block/elevator.c b/block/elevator.c -index 7bda083d5968..8dddfaf725fc 100644 ---- a/block/elevator.c -+++ b/block/elevator.c -@@ -246,7 +246,7 @@ int elevator_init(struct request_queue *q, char *name) - */ - if (q->mq_ops) { - if (q->nr_hw_queues == 1) -- e = elevator_get(q, "mq-deadline", false); -+ e = elevator_get(q, "bfq", false); - if (!e) - return 0; - } else diff --git a/modules/system/kernel/bfq/bfq-by-default-4.18.patch b/modules/system/kernel/bfq/bfq-by-default-4.18.patch deleted file mode 100644 index 5ece12cb..00000000 --- a/modules/system/kernel/bfq/bfq-by-default-4.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/block/elevator.c b/block/elevator.c -index fa828b5bfd4b..cdd582a18e50 100644 ---- a/block/elevator.c -+++ b/block/elevator.c -@@ -994,7 +994,7 @@ int elevator_init_mq(struct request_queue *q) - if (unlikely(q->elevator)) - goto out_unlock; - -- e = elevator_get(q, "mq-deadline", false); -+ e = elevator_get(q, "bfq", false); - if (!e) - goto out_unlock; - diff --git a/modules/system/kernel/bfq/bfq-by-default-5.4.patch b/modules/system/kernel/bfq/bfq-by-default-5.4.patch deleted file mode 100644 index 7f06ec41..00000000 --- a/modules/system/kernel/bfq/bfq-by-default-5.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/block/elevator.c b/block/elevator.c -index 4eab3d70e880..7ea8f9d34e86 100644 ---- a/block/elevator.c -+++ b/block/elevator.c -@@ -631,7 +631,7 @@ static struct elevator_type *elevator_get_default(struct request_queue *q) - if (q->nr_hw_queues != 1) - return NULL; - -- return elevator_get(q, "mq-deadline", false); -+ return elevator_get(q, "bfq", false); - } - - /* diff --git a/modules/system/kernel/bfq/bfq-by-default.patch b/modules/system/kernel/bfq/bfq-by-default.patch deleted file mode 100644 index c6ee0492..00000000 --- a/modules/system/kernel/bfq/bfq-by-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/block/elevator.c b/block/elevator.c -index dac99fbfc273..fbcdba53a3aa 100644 ---- a/block/elevator.c -+++ b/block/elevator.c -@@ -229,7 +229,7 @@ int elevator_init(struct request_queue *q, char *name) - */ - if (q->mq_ops) { - if (q->nr_hw_queues == 1) -- e = elevator_get("mq-deadline", false); -+ e = elevator_get("bfq", false); - if (!e) - return 0; - } else diff --git a/modules/system/kernel/bfq/default.nix b/modules/system/kernel/bfq/default.nix deleted file mode 100644 index a4b593ee..00000000 --- a/modules/system/kernel/bfq/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, ... }: - -let - inherit (config.boot.kernelPackages.kernel) version; - inherit (lib) optionalString versionAtLeast versionOlder; -in { - options.vuizvui.system.kernel.bfq = { - enable = lib.mkEnableOption "Enable the BFQ scheduler by default"; - }; - - config = lib.mkIf config.vuizvui.system.kernel.bfq.enable { - boot.kernelPatches = lib.singleton { - name = "bfq"; - patch = - if versionAtLeast version "5.4" then ./bfq-by-default-5.4.patch - else if versionAtLeast version "4.18" then ./bfq-by-default-4.18.patch - else if versionAtLeast version "4.15" then ./bfq-by-default-4.15.patch - else ./bfq-by-default.patch; - extraConfig = '' - SCSI_MQ_DEFAULT? y - DM_MQ_DEFAULT? y - IOSCHED_BFQ y - BFQ_GROUP_IOSCHED y - ''; - }; - - vuizvui.requiresTests = lib.singleton ["vuizvui" "system" "kernel" "bfq"]; - - assertions = lib.singleton { - assertion = versionAtLeast version "4.12"; - - message = "The BFQ scheduler in conjunction with blk-mq requires " - + "at least kernel 4.12."; - }; - }; -} diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix deleted file mode 100644 index dbabcec8..00000000 --- a/modules/user/aszlig/profiles/managed.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ pkgs, unfreePkgs, unfreeAndNonDistributablePkgs, config, lib, ... }: - -let - inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.vuizvui.user.aszlig.profiles.managed; - inherit (cfg) mainUser; - -in { - options.vuizvui.user.aszlig.profiles.managed = { - enable = mkEnableOption "common profile for aszlig's managed machines"; - - mainUser = mkOption { - example = "foobar"; - description = '' - Main user account of the managed system. - ''; - }; - }; - - config = mkIf cfg.enable { - vuizvui.system.kernel.bfq.enable = true; - - boot.tmp.cleanOnBoot = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - environment.systemPackages = [ - pkgs.file - pkgs.gajim - pkgs.gimp - pkgs.git - pkgs.htop - pkgs.inkscape - (unfreeAndNonDistributablePkgs.plasma5Packages.ark.override { - unfreeEnableUnrar = true; - inherit (unfreePkgs) unrar; - }) - pkgs.plasma5Packages.gwenview - pkgs.plasma5Packages.kaddressbook - pkgs.plasma5Packages.kate - pkgs.plasma5Packages.kdepim-addons - pkgs.plasma5Packages.kleopatra - pkgs.plasma5Packages.kmail - pkgs.plasma5Packages.kontact - pkgs.plasma5Packages.korganizer - pkgs.plasma5Packages.okular - pkgs.libreoffice - pkgs.mpv - pkgs.skanlite - pkgs.thunderbird - pkgs.vuizvui.aszlig.vim - pkgs.wine - pkgs.youtube-dl - unfreeAndNonDistributablePkgs.skypeforlinux - ]; - - console.useXkbConfig = true; - - # Printing for the most common printers among the managed machines. - services.printing.enable = true; - services.printing.drivers = [ - pkgs.gutenprint - unfreeAndNonDistributablePkgs.hplipWithPlugin - ]; - - # For MTP and other stuff. - services.gvfs.enable = true; - - # Plasma desktop with German keyboard layout. - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = lib.mkOverride 900 "eurosign:e"; - services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasma"; - services.xserver.desktopManager.plasma5.enable = true; - - # And also most common scanners are also HP ones. - hardware.sane.enable = true; - hardware.sane.extraBackends = [ - unfreeAndNonDistributablePkgs.hplipWithPlugin - ]; - - hardware.opengl.driSupport32Bit = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; - sound.enable = true; - - networking.firewall.enable = false; - networking.networkmanager.enable = true; - - nix.readOnlyStore = true; - nix.settings.sandbox = true; - nix.settings.auto-optimise-store = true; - - nixpkgs.config.pulseaudio = true; - - programs.bash.enableCompletion = true; - - time.timeZone = "Europe/Berlin"; - - users.users.${mainUser} = { - isNormalUser = true; - uid = 1000; - extraGroups = [ "networkmanager" "scanner" "video" "wheel" ]; - }; - - vuizvui.enableGlobalNixpkgsConfig = true; - vuizvui.system.kernel.zswap.enable = true; - }; -} -- cgit 1.4.1