about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--machines/aszlig/managed/brawndo.nix54
-rw-r--r--machines/aszlig/managed/tyree.nix72
-rw-r--r--machines/default.nix4
-rw-r--r--modules/hardware/t100ha/brcmfmac43340-sdio.txtbin3239 -> 0 bytes
-rw-r--r--modules/hardware/t100ha/default.nix97
-rw-r--r--modules/module-list.nix2
-rw-r--r--modules/system/kernel/bfq/bfq-by-default-4.15.patch13
-rw-r--r--modules/system/kernel/bfq/bfq-by-default-4.18.patch13
-rw-r--r--modules/system/kernel/bfq/bfq-by-default-5.4.patch13
-rw-r--r--modules/system/kernel/bfq/bfq-by-default.patch13
-rw-r--r--modules/system/kernel/bfq/default.nix36
-rw-r--r--modules/user/aszlig/profiles/managed.nix110
-rw-r--r--tests/default.nix3
-rw-r--r--tests/system/kernel/bfq.nix15
14 files changed, 0 insertions, 445 deletions
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 {};
diff --git a/modules/hardware/t100ha/brcmfmac43340-sdio.txt b/modules/hardware/t100ha/brcmfmac43340-sdio.txt
deleted file mode 100644
index db22fef6..00000000
--- a/modules/hardware/t100ha/brcmfmac43340-sdio.txt
+++ /dev/null
Binary files differdiff --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;
-  };
-}
diff --git a/tests/default.nix b/tests/default.nix
index e7f54e76..af0e8b43 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -20,7 +20,4 @@ in {
     gnupg = callTest ./programs/gnupg;
   };
   sandbox = callTest ./sandbox.nix;
-  system = {
-    kernel.bfq = callTest ./system/kernel/bfq.nix;
-  };
 }
diff --git a/tests/system/kernel/bfq.nix b/tests/system/kernel/bfq.nix
deleted file mode 100644
index 8aab8925..00000000
--- a/tests/system/kernel/bfq.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  name = "bfq-kernel";
-
-  machine = { pkgs, ... }: {
-    boot.kernelPackages = pkgs.linuxPackages_latest;
-    vuizvui.system.kernel.bfq.enable = true;
-    virtualisation.qemu.diskInterface = "scsi";
-  };
-
-  testScript = ''
-    # fmt: off
-    machine.execute('tail /sys/block/*/queue/scheduler >&2')
-    machine.succeed('grep -HF "[bfq]" /sys/block/sda/queue/scheduler')
-  '';
-}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-01 12:33:13 +0000