diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix index d4a85d2..e2a89c8 100644 --- a/boxes/x230t/default.nix +++ b/boxes/x230t/default.nix @@ -16,8 +16,14 @@ environment.systemPackages = with pkgs; [ xscreensaver thunderbird + hue-cli + bluetuith ]; + hardware.bluetooth = { + enable = true; + }; + services.udev.extraRules = '' ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-20]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", MODE:="0666" GROUP="usr", SYMLINK+="input/touchscreen" ''; diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index af4f988..32411e0 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -29,22 +29,34 @@ case "$(hostname)" in ;; "x230t") echo "x230t" - if - assert_edid "VGA-1" "35737dc483d2c3b1b20ea2343ce13c6c42d115febdc9634f8437e1b9f7fd3f5c" && - assert_edid "HDMI-A-1" "01887cbd23d74201e489a6334656f7db73a7b7f732a738a9f1ee2d53389f7817"; - then - echo "docked" - xrandr --output LVDS-1 --primary --mode 1366x768 --pos 1194x1080 --rotate normal \ - --output VGA-1 --mode 1920x1080 --pos 0x0 --rotate normal \ - --output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate normal \ - --output DP-1 --off \ - --output HDMI-2 --off \ - --output DP-2 --off - bspc monitor LVDS-1 -d 1 4 7 - bspc monitor VGA-1 -d 2 5 8 - bspc monitor HDMI-1 -d 3 6 9 - else - bspc monitor LVDS-1 -d 1 2 3 4 5 6 7 8 9 - fi + case "$1" in + "dockedtwo") + # assume we're connected to the two external displays + xrandr --output VGA-1 --primary --mode 1920x1080 --rotate normal \ + --output HDMI-1 --mode 1920x1080 --rotate normal --right-of VGA-1 \ + --output LVDS-1 --off + bspc monitor VGA-1 -d 1 3 5 7 9 + bspc monitor HDMI-1 -d 2 4 6 8 + ;; + *) + if + assert_edid "VGA-1" "35737dc483d2c3b1b20ea2343ce13c6c42d115febdc9634f8437e1b9f7fd3f5c" && + assert_edid "HDMI-A-1" "01887cbd23d74201e489a6334656f7db73a7b7f732a738a9f1ee2d53389f7817"; + then + echo "docked" + xrandr --output LVDS-1 --primary --mode 1366x768 --pos 1194x1080 --rotate normal \ + --output VGA-1 --mode 1920x1080 --pos 0x0 --rotate normal \ + --output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate normal \ + --output DP-1 --off \ + --output HDMI-2 --off \ + --output DP-2 --off + bspc monitor LVDS-1 -d 1 4 7 + bspc monitor VGA-1 -d 2 5 8 + bspc monitor HDMI-1 -d 3 6 9 + else + bspc monitor LVDS-1 -d 1 2 3 4 5 6 7 8 9 + fi + ;; + esac ;; esac diff --git a/flake.lock b/flake.lock index ca92b72..572223e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1705534402, - "narHash": "sha256-mOWT45HLd8dm8FJNmrgngotE5NRJ+2arz65m1Kk0LBA=", + "lastModified": 1705709716, + "narHash": "sha256-YJdWSN3ra0FsAQT5PXe7uXxMeAXxTR+SY/wVOO1c6Bs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6a928ce99e4ccb09e59c1f58052bd65027249c8a", + "rev": "d7ad3362283fced58410547650be31e37f9d0f41", "type": "gitlab" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705331948, - "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", + "lastModified": 1705641746, + "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", "type": "github" }, "original": { @@ -209,12 +209,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-laeQplEc8BPopbQGvBMcjkf3eP8WTjQsHGTOlmQ2eK4=", - "path": "/nix/store/yyh8xblrdvii3cdw9rzyvf8fpyra3ias-source/builds", + "narHash": "sha256-iemuV19UU8TriqixcvwdRUTa8lIrxc3Krwt4bHpUUWE=", + "path": "/nix/store/vsn2v6zr402x5cf1w340ifbp2xb07jcg-source/builds", "type": "path" }, "original": { - "path": "/nix/store/yyh8xblrdvii3cdw9rzyvf8fpyra3ias-source/builds", + "path": "/nix/store/vsn2v6zr402x5cf1w340ifbp2xb07jcg-source/builds", "type": "path" } }, diff --git a/modules/x11.nix b/modules/x11.nix index 237fe24..fc4b9cf 100644 --- a/modules/x11.nix +++ b/modules/x11.nix @@ -2,7 +2,6 @@ { imports = [ - ./polybar.nix ./gnupg.nix ./fonts.nix ./pulse.nix