diff options
| -rwxr-xr-x | install.sh | 10 | ||||
| -rwxr-xr-x | sway/init.sh | 32 | ||||
| -rwxr-xr-x | vm/alpine/armv7/run.sh | 28 | ||||
| -rwxr-xr-x | vm/alpine/x86_64/run.sh (renamed from vm/alpine/run.sh) | 0 |
4 files changed, 53 insertions, 17 deletions
@@ -37,7 +37,7 @@ symlink $DOTFILES_DIR/bspwm $CONFIG_DIR/bspwm if [ -f /usr/share/applications/chromium.desktop ]; then symlink $DOTFILES_DIR/chromium/chromium $BIN_DIR/chromium cp /usr/share/applications/chromium.desktop $APP_DIR - sed -i "s/^Exec=\\/usr/Exec=$(cd; pwd | sed 's/\//\\\//g')/g" \ + sed -i "s/^Exec=\\/usr/Exec=$(cd $LOCAL_DIR; pwd | sed 's/\//\\\//g')/g" \ $APP_DIR/chromium.desktop fi @@ -52,7 +52,7 @@ symlink $DOTFILES_DIR/cudatext/user.json $CONFIG_DIR/cudatext/settings/user.json if [ -f /usr/share/applications/drawio.desktop ]; then symlink $DOTFILES_DIR/drawio/drawio $BIN_DIR/drawio cp /usr/share/applications/drawio.desktop $APP_DIR - sed -i "s/^Exec=\\S*/Exec=$(cd; pwd | sed 's/\//\\\//g')\\/bin\\/drawio/g" \ + sed -i "s/^Exec=\\S*/Exec=$(cd $LOCAL_DIR; pwd | sed 's/\//\\\//g')\\/bin\\/drawio/g" \ $APP_DIR/drawio.desktop fi @@ -158,13 +158,15 @@ symlink $DOTFILES_DIR/sway/run-sway.sh $BIN_DIR/run-sway symlink $DOTFILES_DIR/tmux $CONFIG_DIR/tmux # vm -mkdir -p $VM_DIR/alpine +mkdir -p $VM_DIR/alpine/armv7 +mkdir -p $VM_DIR/alpine/x86_64 mkdir -p $VM_DIR/archlinux/armv7 mkdir -p $VM_DIR/debian/armv7 mkdir -p $VM_DIR/netbsd mkdir -p $VM_DIR/openbsd mkdir -p $VM_DIR/win11 -symlink $DOTFILES_DIR/vm/alpine/run.sh $VM_DIR/alpine/run.sh +symlink $DOTFILES_DIR/vm/alpine/x86_64/run.sh $VM_DIR/alpine/x86_64/run.sh +symlink $DOTFILES_DIR/vm/alpine/armv7/run.sh $VM_DIR/alpine/armv7/run.sh symlink $DOTFILES_DIR/vm/archlinux/armv7/run.sh $VM_DIR/archlinux/armv7/run.sh symlink $DOTFILES_DIR/vm/debian/armv7/run.sh $VM_DIR/debian/armv7/run.sh symlink $DOTFILES_DIR/vm/netbsd/run.sh $VM_DIR/netbsd/run.sh diff --git a/sway/init.sh b/sway/init.sh index c01f216..95d2063 100755 --- a/sway/init.sh +++ b/sway/init.sh @@ -1,23 +1,29 @@ #!/bin/sh # export GDK_DPI_SCALE=0.95 -gsettings set org.gnome.desktop.interface scaling-factor 1 -gsettings set org.gnome.desktop.interface text-scaling-factor 1 -gsettings set org.gnome.desktop.interface cursor-size 32 +if command -v gsettings > /dev/null; then + gsettings set org.gnome.desktop.interface scaling-factor 1 + gsettings set org.gnome.desktop.interface text-scaling-factor 1 + gsettings set org.gnome.desktop.interface cursor-size 32 +fi export QT_QPA_PLATFORM=wayland -systemctl --user import-environment \ - QT_QPA_PLATFORM \ - SWAYSOCK \ - WAYLAND_DISPLAY \ - XDG_SESSION_TYPE \ - XDG_CURRENT_DESKTOP -dbus-update-activation-environment --systemd --all +export XDG_CURRENT_DESKTOP=sway -systemctl --user restart plasma-kactivitymanagerd.service +if command -v systemctl > /dev/null; then + systemctl --user import-environment \ + QT_QPA_PLATFORM \ + SWAYSOCK \ + WAYLAND_DISPLAY \ + XDG_SESSION_TYPE \ + XDG_CURRENT_DESKTOP + dbus-update-activation-environment --systemd --all -~/.config/sway/swayidle.sh & + systemctl --user restart xdg-desktop-portal + systemctl --user restart xdg-desktop-portal-wlr + systemctl --user restart plasma-kactivitymanagerd +fi +~/.config/sway/swayidle.sh & kanshi & - waybar -c ~/.config/waybar/sway.conf & diff --git a/vm/alpine/armv7/run.sh b/vm/alpine/armv7/run.sh new file mode 100755 index 0000000..8e5f16d --- /dev/null +++ b/vm/alpine/armv7/run.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +cd $(dirname -- "$0") + +[ -f alpine.tar.gz ] || \ + curl -L -o alpine.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.18/releases/armv7/alpine-uboot-3.18.4-armv7.tar.gz + +[ -f vmlinuz-lts ] || \ + tar -x -f alpine.tar.gz --strip-components=2 ./boot/vmlinuz-lts + +[ -f initramfs-lts ] || \ + tar -x -f alpine.tar.gz --strip-components=2 ./boot/initramfs-lts + +[ -f alpine.qcow2 ] || \ + qemu-img create -f qcow2 alpine.qcow2 20G + +exec qemu-system-arm \ + -M virt \ + -m 1G \ + -cpu cortex-a15 \ + -kernel vmlinuz-lts \ + -initrd initramfs-lts \ + -append "console=ttyAMA0" \ + -hda alpine.qcow2 \ + -nographic \ + "$@" diff --git a/vm/alpine/run.sh b/vm/alpine/x86_64/run.sh index 8681b9d..8681b9d 100755 --- a/vm/alpine/run.sh +++ b/vm/alpine/x86_64/run.sh |