Compare commits

...

2 Commits

Author SHA1 Message Date
randomuser 465bac892c marge remote and local + some changes 2024-01-20 08:56:36 -06:00
randomuser a7a7e090d7 selectively disable one display 2024-01-20 08:30:31 -06:00
4 changed files with 47 additions and 30 deletions

View File

@ -16,8 +16,14 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xscreensaver xscreensaver
thunderbird thunderbird
hue-cli
bluetuith
]; ];
hardware.bluetooth = {
enable = true;
};
services.udev.extraRules = '' services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-20]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", MODE:="0666" GROUP="usr", SYMLINK+="input/touchscreen" ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-20]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", MODE:="0666" GROUP="usr", SYMLINK+="input/touchscreen"
''; '';

View File

@ -29,22 +29,34 @@ case "$(hostname)" in
;; ;;
"x230t") "x230t")
echo "x230t" echo "x230t"
if case "$1" in
assert_edid "VGA-1" "35737dc483d2c3b1b20ea2343ce13c6c42d115febdc9634f8437e1b9f7fd3f5c" && "dockedtwo")
assert_edid "HDMI-A-1" "01887cbd23d74201e489a6334656f7db73a7b7f732a738a9f1ee2d53389f7817"; # assume we're connected to the two external displays
then xrandr --output VGA-1 --primary --mode 1920x1080 --rotate normal \
echo "docked" --output HDMI-1 --mode 1920x1080 --rotate normal --right-of VGA-1 \
xrandr --output LVDS-1 --primary --mode 1366x768 --pos 1194x1080 --rotate normal \ --output LVDS-1 --off
--output VGA-1 --mode 1920x1080 --pos 0x0 --rotate normal \ bspc monitor VGA-1 -d 1 3 5 7 9
--output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate normal \ bspc monitor HDMI-1 -d 2 4 6 8
--output DP-1 --off \ ;;
--output HDMI-2 --off \ *)
--output DP-2 --off if
bspc monitor LVDS-1 -d 1 4 7 assert_edid "VGA-1" "35737dc483d2c3b1b20ea2343ce13c6c42d115febdc9634f8437e1b9f7fd3f5c" &&
bspc monitor VGA-1 -d 2 5 8 assert_edid "HDMI-A-1" "01887cbd23d74201e489a6334656f7db73a7b7f732a738a9f1ee2d53389f7817";
bspc monitor HDMI-1 -d 3 6 9 then
else echo "docked"
bspc monitor LVDS-1 -d 1 2 3 4 5 6 7 8 9 xrandr --output LVDS-1 --primary --mode 1366x768 --pos 1194x1080 --rotate normal \
fi --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 esac

View File

@ -25,11 +25,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1705534402, "lastModified": 1705709716,
"narHash": "sha256-mOWT45HLd8dm8FJNmrgngotE5NRJ+2arz65m1Kk0LBA=", "narHash": "sha256-YJdWSN3ra0FsAQT5PXe7uXxMeAXxTR+SY/wVOO1c6Bs=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "6a928ce99e4ccb09e59c1f58052bd65027249c8a", "rev": "d7ad3362283fced58410547650be31e37f9d0f41",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705476964, "lastModified": 1705659542,
"narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "85c3b600f660abd86e94cbcd1c46733943197a07", "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705331948, "lastModified": 1705641746,
"narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,12 +209,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-wGl3ZnqjhpAEpTkzgjWxgsbmGX9c7TPCM4I0okuOYFE=", "narHash": "sha256-5xUIhLgUWLJ08JmAOugcD2ut0pNNDzoBOJmcoHA5yAg=",
"path": "/nix/store/2fjha7mwjnlsmd4s3y7a3lfk3lq3w87z-source/builds", "path": "/nix/store/dz347nzxk63b999sm3cb7k450f90xzlq-source/builds",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/2fjha7mwjnlsmd4s3y7a3lfk3lq3w87z-source/builds", "path": "/nix/store/dz347nzxk63b999sm3cb7k450f90xzlq-source/builds",
"type": "path" "type": "path"
} }
}, },

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./polybar.nix
./gnupg.nix ./gnupg.nix
./fonts.nix ./fonts.nix
./pulse.nix ./pulse.nix