From 5daa6f85af0db7bd71a68bdae74c859e39a2bb92 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 7 Dec 2023 09:11:42 +0000 Subject: [PATCH] Use autorandr for monitor management --- bin/switch-to-laptop-screen | 10 ----- bin/switch-to-monitor | 9 ----- system/nixos/home-manager/modules/i3.nix | 50 ++++++++++++++++-------- 3 files changed, 33 insertions(+), 36 deletions(-) delete mode 100755 bin/switch-to-laptop-screen delete mode 100755 bin/switch-to-monitor diff --git a/bin/switch-to-laptop-screen b/bin/switch-to-laptop-screen deleted file mode 100755 index bb91cf7..0000000 --- a/bin/switch-to-laptop-screen +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -ueo pipefail - -MONITOR_ID="${MONITOR_ID:-HDMI-1}" -MONITOR_MODE="${MONITOR_MODE:-1920x1080}" - -xrandr \ - --output eDP-1 --mode "${MONITOR_MODE}" \ - --output "${MONITOR_ID}" --off diff --git a/bin/switch-to-monitor b/bin/switch-to-monitor deleted file mode 100755 index dea81a6..0000000 --- a/bin/switch-to-monitor +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -ueo pipefail - -MONITOR_ID="${MONITOR_ID:-HDMI-1}" - -xrandr \ - --output "${MONITOR_ID}" --mode 2560x1440 \ - --output eDP-1 --off diff --git a/system/nixos/home-manager/modules/i3.nix b/system/nixos/home-manager/modules/i3.nix index 7757cac..a9ab386 100644 --- a/system/nixos/home-manager/modules/i3.nix +++ b/system/nixos/home-manager/modules/i3.nix @@ -3,27 +3,43 @@ let modifier = "Mod4"; in -{ - home.file.".background-image".source = ../../../../config/wallpaper/wallpaper.jpg; + { + home.file.".background-image".source = ../../../../config/wallpaper/wallpaper.jpg; - services.autorandr.enable = true; + services.autorandr.enable = true; - programs.autorandr = { - enable = true; + programs.autorandr = { + enable = true; - profiles = { - default = { - # config = { - # "eDP-1" = { - # dpi = 96; - # enable = true; - # mode = "1920x1080"; - # primary = true; - # rate = "60"; - # }; - # }; + profiles = { + laptop = { + config.eDP-1 = { + enable = true; + mode = "1920x1080"; + primary = true; + rate = "59.95"; + }; + + config.HDMI-1.enable = false; + + fingerprint.HDMI-1 = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049"; + fingerprint.eDP-1 = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb"; + }; + + desktop = { + config.eDP-1.enable = false; + + config.HDMI-1 = { + enable = true; + mode = "2560x1440"; + primary = true; + rate = "59.95"; + }; + + fingerprint.HDMI-1 = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049"; + fingerprint.eDP-1 = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb"; + }; }; - }; }; xsession.windowManager.i3 = {