diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix index facd4b2..d4a85d2 100644 --- a/boxes/x230t/default.nix +++ b/boxes/x230t/default.nix @@ -10,12 +10,20 @@ ../../modules/media.nix ../../modules/anki.nix ../../modules/power-control.nix + ../../modules/adb.nix ]; environment.systemPackages = with pkgs; [ xscreensaver + thunderbird ]; + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-20]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", MODE:="0666" GROUP="usr", SYMLINK+="input/touchscreen" + ''; + + users.users.usr.extraGroups = [ "input" ]; + services.getty.autologinUser = "usr"; boot.loader = { diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index f6eb3a1..af4f988 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -1,24 +1,50 @@ #!/bin/sh +find_card_pci() { + [ -z $pci_path ] && pci_path=$(find /sys/devices | \ + grep edid | \ + cut -d/ -f1-6 + ) +} + +assert_edid() { + find_card_pci + + out=$(sha256sum ${pci_path}/card0/card0-$1/edid | \ + cut -d' ' -f1) + + [ "$out" = "$2" ] && return 0 || return 1 +} + exists() { xrandr | grep ' connected' | grep -c "${1}" } -if [ ! "$(hostname)" = "mainsail" ]; then - bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9 -fi - -if [ "$(exists "DP-1")" -gt 1 ]; then - printf "two" - bspc monitor DP-1 -s eDP-1 - xrandr --output eDP-1 --off - exit 0 -fi - -if [ "$(hostname)" = "mainsail" ]; then - # this is a tower, so there's only one configuration - printf "mainsail detected\n" - xrandr --output VGA-1 --left-of HDMI-1 - bspc monitor VGA-1 -d 1 3 5 7 9 - bspc monitor HDMI-1 -d 2 4 6 8 0 -fi +case "$(hostname)" in + "mainsail") + echo "mainsail" + xrandr --output VGA-1 --left-of HDMI-1 + bspc monitor VGA-1 -d 1 3 5 7 9 + bspc monitor HDMI-1 -d 2 4 6 8 0 + ;; + "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 + ;; +esac diff --git a/builds/utils/sh/statuswrap b/builds/utils/sh/statuswrap index 2e5a1a5..e75379c 100755 --- a/builds/utils/sh/statuswrap +++ b/builds/utils/sh/statuswrap @@ -7,6 +7,8 @@ geos=$( awk -F'[x+]' '{print $1 "x20+" $3 "+" $4}' ) +pkill statusbar + for i in $geos; do st -c statusbar -p -g "$i" -e statusbar & disown done diff --git a/builds/utils/sh/testing b/builds/utils/sh/testing deleted file mode 100755 index ae73afa..0000000 --- a/builds/utils/sh/testing +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -st & -statusbar diff --git a/builds/utils/sh/wallpaper b/builds/utils/sh/wallpaper deleted file mode 100755 index 2b519eb..0000000 --- a/builds/utils/sh/wallpaper +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -WALLDIR="${HOME}/.local/share/wallpapers" -BASECMD="feh --no-fehbg --bg-fill" - -generate_wall () { - GENWALL=$( \ - ls "$WALLDIR" | \ - grep "." | \ - shuf -n 1 - ) - GENWALL="${WALLDIR}/${GENWALL}" -} -wall () { - generate_wall - while [ "${GENWALL}" = "${1}" ]; do - generate_wall - done -} -displays () { - displays=$(xrandr | grep -c ' connected') -} - -cmd="" -displays -for i in $(seq 1 "$displays"); do - wall "${tmp}" - tmp="${GENWALL}" - cmd="${cmd} ${GENWALL}" -done -eval "${BASECMD}" "${cmd}" -exit 0 diff --git a/flake.lock b/flake.lock index 2ffd502..b9bdb8e 100644 --- a/flake.lock +++ b/flake.lock @@ -91,12 +91,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-YmGlTX2Y5d6aQzqZ1IzVp1CnbyXuHE1Fwwtf9nB40zE=", - "path": "/nix/store/arzg5zcsb349c5rz3kaflqiszdvfbqny-source/builds", + "narHash": "sha256-qcQP65622JfSlKPDPCuTCMbzCWOvKBOA3OOO426ce8I=", + "path": "/nix/store/rpjslsjwr8a8ykn3ncr91yigf9nsjcac-source/builds", "type": "path" }, "original": { - "path": "/nix/store/arzg5zcsb349c5rz3kaflqiszdvfbqny-source/builds", + "path": "/nix/store/rpjslsjwr8a8ykn3ncr91yigf9nsjcac-source/builds", "type": "path" } } diff --git a/home/bspwm/bspwmrc b/home/bspwm/bspwmrc index e37c2dd..c285482 100755 --- a/home/bspwm/bspwmrc +++ b/home/bspwm/bspwmrc @@ -1,8 +1,6 @@ #!/bin/sh # rndusr's bspwmrc -bspc monitor -d 1 2 3 4 5 6 7 8 9 - bspc rule -a st-gpg-menu state=floating bspc rule -a statusbar border=off sticky=on state=floating manage=off bspc rule -a tmenu-prompt border=on sticky=on state=floating @@ -11,10 +9,17 @@ bspc rule -a Zathura state=tiled bspc rule -a generic-st-window state=floating manage=on sticky=on border=on bspc rule -a floating-feh state=floating +set_walls() { + for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do + xwallpaper --output $i --zoom ~/.local/share/pape.jpg + done +} + # post-wm boilerplate -statuswrap -wallpaper disp +statuswrap +set_walls +pkill xscreensaver HOME=".config/xscreensaver" xscreensaver --no-splash & # set up the color scheme diff --git a/home/sxhkd/sxhkdrc b/home/sxhkd/sxhkdrc index 19b1862..6f0222d 100644 --- a/home/sxhkd/sxhkdrc +++ b/home/sxhkd/sxhkdrc @@ -13,7 +13,7 @@ super + r # reinitialize ancillary services super + w - disp && wallpaper && statusbar && keyboard + disp && keyboard # control the national weather service super + {_,shift + }n diff --git a/home/wallpapers/default.nix b/home/wallpapers/default.nix index 4125503..5259db2 100644 --- a/home/wallpapers/default.nix +++ b/home/wallpapers/default.nix @@ -2,9 +2,8 @@ { home.file = { - ".local/share/wallpapers" = { - source = ./src; - recursive = true; + ".local/share/pape.jpg" = { + source = ./pape.jpg; }; }; } diff --git a/home/wallpapers/src/pape.jpg b/home/wallpapers/pape.jpg similarity index 100% rename from home/wallpapers/src/pape.jpg rename to home/wallpapers/pape.jpg diff --git a/home/wallpapers/src/163_2lvsn7f.jpeg b/home/wallpapers/src/163_2lvsn7f.jpeg deleted file mode 100644 index 5729eaa..0000000 Binary files a/home/wallpapers/src/163_2lvsn7f.jpeg and /dev/null differ diff --git a/home/wallpapers/src/36_he4bhx9.jpeg b/home/wallpapers/src/36_he4bhx9.jpeg deleted file mode 100644 index cf2a33f..0000000 Binary files a/home/wallpapers/src/36_he4bhx9.jpeg and /dev/null differ diff --git a/home/wallpapers/src/default.nix b/home/wallpapers/src/default.nix deleted file mode 100644 index 106d796..0000000 --- a/home/wallpapers/src/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, config, pkgs, home, ... }: - -{ - home.file = { - ".local/share/wallpapers" = { - source = ./wallpapers; - recursive = true; - }; - }; -} diff --git a/home/wallpapers/src/forest-steps.jpg b/home/wallpapers/src/forest-steps.jpg deleted file mode 100644 index c5c777c..0000000 Binary files a/home/wallpapers/src/forest-steps.jpg and /dev/null differ diff --git a/home/wallpapers/src/frenchpolynesia_02.jpg b/home/wallpapers/src/frenchpolynesia_02.jpg deleted file mode 100644 index dbadabe..0000000 Binary files a/home/wallpapers/src/frenchpolynesia_02.jpg and /dev/null differ diff --git a/home/wallpapers/src/frenchpolynesia_03.jpg b/home/wallpapers/src/frenchpolynesia_03.jpg deleted file mode 100644 index 9c578ba..0000000 Binary files a/home/wallpapers/src/frenchpolynesia_03.jpg and /dev/null differ diff --git a/home/wallpapers/src/frenchpolynesia_07.jpg b/home/wallpapers/src/frenchpolynesia_07.jpg deleted file mode 100644 index 1ee7daa..0000000 Binary files a/home/wallpapers/src/frenchpolynesia_07.jpg and /dev/null differ diff --git a/home/wallpapers/src/frenchpolynesia_08.jpg b/home/wallpapers/src/frenchpolynesia_08.jpg deleted file mode 100644 index 6a5a3ba..0000000 Binary files a/home/wallpapers/src/frenchpolynesia_08.jpg and /dev/null differ diff --git a/home/wallpapers/src/minamiise_02.jpg b/home/wallpapers/src/minamiise_02.jpg deleted file mode 100644 index a839534..0000000 Binary files a/home/wallpapers/src/minamiise_02.jpg and /dev/null differ diff --git a/home/wallpapers/src/sea-tower.jpg b/home/wallpapers/src/sea-tower.jpg deleted file mode 100644 index b5d8a36..0000000 Binary files a/home/wallpapers/src/sea-tower.jpg and /dev/null differ diff --git a/home/wallpapers/src/tree-night-sky.jpg b/home/wallpapers/src/tree-night-sky.jpg deleted file mode 100644 index 5c03809..0000000 Binary files a/home/wallpapers/src/tree-night-sky.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-3kdd23.jpg b/home/wallpapers/src/wallhaven-3kdd23.jpg deleted file mode 100644 index aa74676..0000000 Binary files a/home/wallpapers/src/wallhaven-3kdd23.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-4gjkyq.jpg b/home/wallpapers/src/wallhaven-4gjkyq.jpg deleted file mode 100644 index d3c8c8b..0000000 Binary files a/home/wallpapers/src/wallhaven-4gjkyq.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-dp8rgg.jpg b/home/wallpapers/src/wallhaven-dp8rgg.jpg deleted file mode 100644 index f83079f..0000000 Binary files a/home/wallpapers/src/wallhaven-dp8rgg.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-dp8v3m.png b/home/wallpapers/src/wallhaven-dp8v3m.png deleted file mode 100644 index 2bf8bda..0000000 Binary files a/home/wallpapers/src/wallhaven-dp8v3m.png and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-j3e1vw.jpg b/home/wallpapers/src/wallhaven-j3e1vw.jpg deleted file mode 100644 index ef8e2fb..0000000 Binary files a/home/wallpapers/src/wallhaven-j3e1vw.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-j3eyjw.jpg b/home/wallpapers/src/wallhaven-j3eyjw.jpg deleted file mode 100644 index 5049029..0000000 Binary files a/home/wallpapers/src/wallhaven-j3eyjw.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-k78epq.jpg b/home/wallpapers/src/wallhaven-k78epq.jpg deleted file mode 100644 index ad77b9f..0000000 Binary files a/home/wallpapers/src/wallhaven-k78epq.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-l3ygjq.jpg b/home/wallpapers/src/wallhaven-l3ygjq.jpg deleted file mode 100644 index 2c9dd42..0000000 Binary files a/home/wallpapers/src/wallhaven-l3ygjq.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-pkowym.jpg b/home/wallpapers/src/wallhaven-pkowym.jpg deleted file mode 100644 index 198f804..0000000 Binary files a/home/wallpapers/src/wallhaven-pkowym.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-rdqqjm.jpg b/home/wallpapers/src/wallhaven-rdqqjm.jpg deleted file mode 100644 index 547e8b4..0000000 Binary files a/home/wallpapers/src/wallhaven-rdqqjm.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-wq535x.jpg b/home/wallpapers/src/wallhaven-wq535x.jpg deleted file mode 100644 index 9d9ca90..0000000 Binary files a/home/wallpapers/src/wallhaven-wq535x.jpg and /dev/null differ diff --git a/home/wallpapers/src/wallhaven-yj8kw7.jpg b/home/wallpapers/src/wallhaven-yj8kw7.jpg deleted file mode 100644 index 51952bd..0000000 Binary files a/home/wallpapers/src/wallhaven-yj8kw7.jpg and /dev/null differ diff --git a/home/wallpapers/src/waters.jpg b/home/wallpapers/src/waters.jpg deleted file mode 100644 index 9342c4d..0000000 Binary files a/home/wallpapers/src/waters.jpg and /dev/null differ diff --git a/home/x11-progs.nix b/home/x11-progs.nix index 74b7f82..82f792b 100644 --- a/home/x11-progs.nix +++ b/home/x11-progs.nix @@ -6,7 +6,8 @@ xcape xscreensaver mpv - feh + sxiv + xwallpaper xbrightness xdotool ]; diff --git a/modules/adb.nix b/modules/adb.nix new file mode 100644 index 0000000..9680ecc --- /dev/null +++ b/modules/adb.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ...}: + +{ + programs.adb.enable = true; + users.users.usr.extraGroups = [ "adbusers" ]; +}