diff --git a/.gitignore b/.gitignore index 37e7e69..8fcf119 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ **/fishd.tmp* -vscode/argv.json diff --git a/backup.sh b/backup.sh index 96934f9..b95d473 100755 --- a/backup.sh +++ b/backup.sh @@ -58,10 +58,6 @@ cp -r $HOME/.config/i3/ . # sway rm -rf $GIT_DIR/sway cp -r $HOME/.config/sway/ . -outputs=$(swaymsg -t get_outputs) -width=$(echo $outputs | jq -r .[0].modes.[0].width) -height=$(echo $outputs | jq -r .[0].modes.[0].height) -sed -i "s/set \$lockwall \"swaylock -i ~\/\.config\/sway\/backgrounds\/${width}x${height}\.png\"/set \$lockwall \"swaylock -i ~\/\.config\/sway\/backgrounds\/widthxheight\.png\"/g" $GIT_DIR/sway/config # greetd (for sway) if [ -d /etc/greetd ]; then diff --git a/distro-specific-scripts/fedora-sway.sh b/distro-specific-scripts/fedora-sway.sh index b1c97f4..3e74962 100755 --- a/distro-specific-scripts/fedora-sway.sh +++ b/distro-specific-scripts/fedora-sway.sh @@ -40,5 +40,3 @@ xhost +SI:localuser:root #sudo cp $GIT_DIR/greetd/config.toml /etc/greetd/config.toml #sudo systemctl disable lightdm.service #sudo systemctl enable greetd.service - -sudo sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config \ No newline at end of file diff --git a/restore.sh b/restore.sh index 20001d6..d5ebd54 100755 --- a/restore.sh +++ b/restore.sh @@ -42,10 +42,6 @@ cp -r $GIT_DIR/i3 $HOME/.config/ # sway rm -rf $HOME/.config/sway cp -r $GIT_DIR/sway $HOME/.config/ -outputs=$(swaymsg -t get_outputs) -width=$(echo $outputs | jq -r .[0].modes.[0].width) -height=$(echo $outputs | jq -r .[0].modes.[0].height) -sed -i "s/set \$lockwall \"swaylock -i ~\/\.config\/sway\/backgrounds\/widthxheight\.png\"/set \$lockwall \"swaylock -i ~\/\.config\/sway\/backgrounds\/${width}x${height}\.png\"/g" $HOME/.config/sway/config # greetd (for sway) if [ -d /etc/greetd ]; then @@ -111,9 +107,6 @@ for dir in $(find . -mindepth 1 -maxdepth 1 -type d -name "*.*"); do done done -# WezTerm -wezterm shell-completion --shell fish > ~/.config/fish/completions/wezterm.fish - # VS code mkdir -p $HOME/.config/Code/User/ mkdir -p $HOME/.vscode/ diff --git a/sway/automation.sh b/sway/automation.sh deleted file mode 100644 index a3a5916..0000000 --- a/sway/automation.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -# config file still must be done by hand to take into account rotation and stuff, but this makes the backgrounds images themselves -# TODO: add config generation - -generate() { - magick background.png -resize ${1}x${2}! background-${1}x${2}.png - magick composite -gravity center logo.png background-${1}x${2}.png result-${1}x${2}.png - cp result-${1}x${2}.png ~/.config/sway/backgrounds/${1}x${2}.png - rm background-* - rm result-* -} - -outputs=$(swaymsg -t get_outputs) - -i=0 -while [ "$(echo $outputs | jq -r .[$i])" != "null" ]; do - width=$(echo $outputs | jq -r .[$i].modes.[0].width) - height=$(echo $outputs | jq -r .[$i].modes.[0].height) - generate $width $height - generate $height $width - ((i++)) -done - - - - - - - - - - - - diff --git a/sway/backgrounds/1080x1920.png b/sway/backgrounds/1080x1920.png deleted file mode 100755 index 5ab3c93..0000000 Binary files a/sway/backgrounds/1080x1920.png and /dev/null differ diff --git a/sway/backgrounds/1440x2560.png b/sway/backgrounds/1440x2560.png deleted file mode 100755 index 813a256..0000000 Binary files a/sway/backgrounds/1440x2560.png and /dev/null differ diff --git a/sway/backgrounds/1920x1080.png b/sway/backgrounds/1920x1080.png deleted file mode 100755 index 9b6b787..0000000 Binary files a/sway/backgrounds/1920x1080.png and /dev/null differ diff --git a/sway/backgrounds/2560x1440.png b/sway/backgrounds/2560x1440.png deleted file mode 100755 index b14ca57..0000000 Binary files a/sway/backgrounds/2560x1440.png and /dev/null differ diff --git a/sway/config b/sway/config index 1856dc5..1501225 100644 --- a/sway/config +++ b/sway/config @@ -25,7 +25,7 @@ for_window [window_role="pop-up"] floating enable for_window [window_role="task_dialog"] floating enable # shutdown / restart / suspend... -set $lockwall "swaylock -i ~/.config/sway/backgrounds/widthxheight.png" +set $lockwall "swaylock -i ~/.config/sway/backgrounds/2560x1440.png" set $mode_system System (l) lock, (e) logout, (r) reboot, (s) shutdown mode "$mode_system" { diff --git a/sway/config.d/outputs b/sway/config.d/outputs index d2e9c48..dd6e647 100644 --- a/sway/config.d/outputs +++ b/sway/config.d/outputs @@ -1,7 +1,7 @@ output "Acer Technologies EK271U E 14160766B3W01" mode 2560x1440@100hz adaptive_sync on output "Hewlett Packard HP ZR22w CN41250H24" transform 270 -output "AU Optronics 0x463D" mode 1920x1080@60hz output "Acer Technologies EK271U E 14160766B3W01" bg ~/.config/sway/backgrounds/2560x1440.png fill output "Hewlett Packard HP ZR22w CN41250H24" bg ~/.config/sway/backgrounds/1080x1920.png fill -output "AU Optronics 0x463D" bg ~/.config/sway/backgrounds/1920x1080.png fill + +bindsym Mod4+o output "Acer Technologies EK271U E 14160766B3W01" toggle diff --git a/vscode/settings.json b/vscode/settings.json index d01038c..7cee49e 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -108,6 +108,7 @@ //"warning", //"info" ], + "files.autoSave": "afterDelay", "files.autoSaveDelay": 300, "editor.fontFamily": "'Fira Code Nerd', 'Droid Sans Mono', 'monospace', monospace", "editor.fontLigatures": true,