Merge branch 'master' of https://git.beepboop.systems/rndusr/dot_testing
This commit is contained in:
commit
fd3f89ce28
|
@ -13,7 +13,6 @@
|
||||||
, figlet
|
, figlet
|
||||||
, curl
|
, curl
|
||||||
, ytfzf
|
, ytfzf
|
||||||
, herbe
|
|
||||||
, xrandr
|
, xrandr
|
||||||
, xrectsel
|
, xrectsel
|
||||||
, ffcast
|
, ffcast
|
||||||
|
@ -21,7 +20,6 @@
|
||||||
, xkbset
|
, xkbset
|
||||||
, rbw
|
, rbw
|
||||||
, xclip
|
, xclip
|
||||||
, libsForQt5
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||||
src = ./utils;
|
src = ./utils;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ bash feh xrandr jq curl fzy ytfzf sshuttle svkbd scrcpy xkbset rbw xclip ffcast libsForQt5.kolourpaint ];
|
buildInputs = [ bash feh xrandr jq curl fzy ytfzf sshuttle svkbd scrcpy rbw xclip ffcast xkbset ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
@ -39,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
for i in $(ls $src/sh); do
|
for i in $(ls $src/sh); do
|
||||||
cp $src/sh/$i $out/bin
|
cp $src/sh/$i $out/bin
|
||||||
ln -sf $out/bin/tmenu_run $out/bin/regenerate
|
ln -sf $out/bin/tmenu_run $out/bin/regenerate
|
||||||
wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ytfzf herbe sshuttle svkbd scrcpy libsForQt5.kolourpaint xrectsel ffcast ]}
|
wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy xkbset ytfzf sshuttle svkbd scrcpy xrectsel ffcast ]}
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
[ "$1" = "-h" ] && echo "use DISP_ACCESS_IP to control sshfs conn ip" && exit 0
|
||||||
|
|
||||||
set_walls() {
|
set_walls() {
|
||||||
for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do
|
for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do
|
||||||
xwallpaper --output $i --zoom ~/.local/share/pape.jpg
|
xwallpaper --output $i --zoom ~/.local/share/pape.jpg
|
||||||
|
@ -62,6 +64,9 @@ case "$(hostname)" in
|
||||||
bspc monitor DP-1-1 -d 1 3 5 7
|
bspc monitor DP-1-1 -d 1 3 5 7
|
||||||
bspc monitor DP-1-2 -d 2 4 6 8
|
bspc monitor DP-1-2 -d 2 4 6 8
|
||||||
;;
|
;;
|
||||||
|
"solo")
|
||||||
|
bspc monitor DP-0 -d 1 2 3 4 5 6 7 8 9
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
xrandr \
|
xrandr \
|
||||||
--output DP-0 --off \
|
--output DP-0 --off \
|
||||||
|
@ -74,27 +79,34 @@ case "$(hostname)" in
|
||||||
xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1
|
xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1
|
||||||
|
|
||||||
# setup synchronization
|
# setup synchronization
|
||||||
|
# check if we have another IP defined
|
||||||
|
if [ ! -z "$DISP_ACCESS_IP" ]; then
|
||||||
|
target="$DISP_ACCESS_IP"
|
||||||
|
else
|
||||||
|
target=x230t
|
||||||
|
fi
|
||||||
|
|
||||||
pkill sshfs
|
pkill sshfs
|
||||||
rm $HOME/doc # this is safe, as doc is a dir if it mattered,
|
rm $HOME/doc # this is safe, as doc is a dir if it mattered,
|
||||||
# but it's just a link, so it's a regular file.
|
# but it's just a link, so it's a regular file.
|
||||||
# in conclusion, good either way
|
# in conclusion, good either way
|
||||||
mkdir -p $HOME/.cache/mount_point
|
mkdir -p $HOME/.cache/mount_point
|
||||||
sshfs usr@x230t:/home/usr/doc $HOME/.cache/mount_point
|
sshfs "usr@$target:/home/usr/doc" $HOME/.cache/mount_point -o ConnectTimeout=1
|
||||||
ln -sf $HOME/.cache/mount_point $HOME/doc
|
ln -sf $HOME/.cache/mount_point $HOME/doc
|
||||||
|
|
||||||
rm $HOME/.thunderbird # see previous comment
|
rm $HOME/.thunderbird # see previous comment
|
||||||
mkdir -p $HOME/.cache/mount_point3
|
mkdir -p $HOME/.cache/mount_point3
|
||||||
sshfs usr@x230t:/home/usr/.thunderbird $HOME/.cache/mount_point3
|
sshfs "usr@$target:/home/usr/.thunderbird" $HOME/.cache/mount_point3 -o ConnectTimeout=1
|
||||||
ln -sf $HOME/.cache/mount_point3 $HOME/.thunderbird
|
ln -sf $HOME/.cache/mount_point3 $HOME/.thunderbird
|
||||||
|
|
||||||
rm $HOME/Mail
|
rm $HOME/Mail
|
||||||
mkdir -p $HOME/.cache/mount_point4
|
mkdir -p $HOME/.cache/mount_point4
|
||||||
sshfs usr@x230t:/home/usr/Mail $HOME/.cache/mount_point4
|
sshfs "usr@$target:/home/usr/Mail" $HOME/.cache/mount_point4 -o ConnectTimeout=1
|
||||||
ln -sf $HOME/.cache/mount_point4 $HOME/Mail
|
ln -sf $HOME/.cache/mount_point4 $HOME/Mail
|
||||||
|
|
||||||
rm $HOME/vdir
|
rm $HOME/vdir
|
||||||
mkdir -p $HOME/.cache/mount_point5
|
mkdir -p $HOME/.cache/mount_point5
|
||||||
sshfs usr@x230t:/home/usr/vdir $HOME/.cache/mount_point5
|
sshfs "usr@$target:/home/usr/vdir" $HOME/.cache/mount_point5 -o ConnectTimeout=1
|
||||||
ln -sf $HOME/.cache/mount_point5 $HOME/vdir
|
ln -sf $HOME/.cache/mount_point5 $HOME/vdir
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue