From 3528196ee70812110e197f8bf4e9ae8ccd363057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 12 Apr 2024 22:13:34 +0300 Subject: [PATCH] autorandr: rm fwminex --- hosts/fwminex/configuration.nix | 73 +++------------------------------ hosts/fwminex/randr.nix | 5 --- 2 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 hosts/fwminex/randr.nix diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index a9cb72d..eb81b2b 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -3,9 +3,11 @@ config, myData, ... -}: let - randr = import ./randr.nix; -in { +}: { + imports = [ + ../../modules/profiles/autorandr + ]; + boot = { initrd.availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"]; kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; @@ -121,71 +123,6 @@ in { }; }; - services = { - autorandr = { - profiles = { - default = { - fingerprint = {inherit (randr) eDP-1;}; - config = { - DP-1.enable = false; - DP-2.enable = false; - DP-3.enable = false; - DP-4.enable = false; - eDP-1 = { - enable = true; - primary = true; - mode = "1920x1200"; - crtc = 0; - position = "0x0"; - rate = "59.88"; - }; - }; - }; - - home1 = { - fingerprint = {inherit (randr) eDP-1 DP-4;}; - config = { - eDP-1.enable = false; - DP-1.enable = false; - DP-2.enable = false; - DP-4 = { - enable = true; - mode = "2560x1440"; - position = "0x0"; - primary = true; - crtc = 0; - rate = "59.95"; - }; - }; - }; - - dualhome = { - fingerprint = {inherit (randr) eDP-1 DP-3 DP-4;}; - config = { - eDP-1.enable = false; - DP-1.enable = false; - DP-2.enable = false; - DP-3 = { - enable = true; - mode = "2560x1440"; - position = "0x0"; - crtc = 1; - rate = "59.95"; - }; - DP-4 = { - enable = true; - mode = "2560x1440"; - position = "2560x0"; - primary = true; - crtc = 0; - rate = "59.95"; - }; - }; - }; - }; - }; - }; - virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["motiejus"]; diff --git a/hosts/fwminex/randr.nix b/hosts/fwminex/randr.nix deleted file mode 100644 index ee85493..0000000 --- a/hosts/fwminex/randr.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - DP-3 = "00ffffffffffff0010ac8b4157343231151d0103803c2278eab6e5a9534ca3250a5054a54b00714f8180a940d1c00101010101010101565e00a0a0a029503020350055502100001a000000ff004343315a4d53320a2020202020000000fc0044454c4c20533237313944430a000000fd00304b1e7820000a20202020202001a3020327f149101f0413121103020123097f078301000067030c0010000040681a00000101304be6a073006aa0a029500820350055502100001a023a801871382d40582c450055502100001e7e3900a080381f4030203a0055502100001a011d007251d01e206e28550055502100001e00000000000000000000000000000000aa"; - DP-4 = "00ffffffffffff0010ac31424c38334114200104b53c22783eee95a3544c99260f5054a54b00714f8180a9c0a940d1c0010101010101565e00a0a0a029503020350055502100001a000000ff004a4450444448330a2020202020000000fc0044454c4c20553237323244450a000000fd00314c1e5a19010a2020202020200146020319f14c90040302011112131f20212223097f0783010000023a801871382d40582c450055502100001e7e3900a080381f4030203a0055502100001a011d007251d01e206e28550055502100001ebf1600a08038134030203a0055502100001a00000000000000000000000000000000000000000000000000000000000006"; - eDP-1 = "00ffffffffffff0009e55f0900000000171d0104a51c137803de50a3544c99260f505400000001010101010101010101010101010101115cd01881e02d50302036001dbe1000001aa749d01881e02d50302036001dbe1000001a000000fe00424f452043510a202020202020000000fe004e4531333546424d2d4e34310a00fb"; -}