diff --git a/328p1aa/home/.config/sway/config.d/display.d/328p1aa b/328p1aa/home/.config/sway/config.d/display.d/328p1aa index f93ad65..8c1a699 100644 --- a/328p1aa/home/.config/sway/config.d/display.d/328p1aa +++ b/328p1aa/home/.config/sway/config.d/display.d/328p1aa @@ -24,7 +24,7 @@ exec_always 'sleep 1;eww open --screen "CR270CU" home' set { $primary_display DP-2 - $overview_display DP-3 + $overview_display DP-2 } workspace { diff --git a/328p1aa/home/.config/sway/config.d/window_rules.d/328p1aa b/328p1aa/home/.config/sway/config.d/window_rules.d/328p1aa index bc2b8c5..31f4632 100644 --- a/328p1aa/home/.config/sway/config.d/window_rules.d/328p1aa +++ b/328p1aa/home/.config/sway/config.d/window_rules.d/328p1aa @@ -9,7 +9,7 @@ sticky enable resize set width 400 resize set height 400 - move absolute position 4200 1010 + move absolute position 4900 1860 } for_window [app_id="nm-connection-editor$"] { @@ -17,7 +17,7 @@ sticky enable resize set width 400 resize set height 400 - move absolute position 4220 1010 + move absolute position 4820 1860 } for_window [app_id="blueman-manager$"] { @@ -25,7 +25,7 @@ sticky enable resize set width 400 resize set height 400 - move absolute position 4230 1010 + move absolute position 4840 1860 } for_window [app_id="nextcloud$"] { @@ -33,7 +33,7 @@ sticky enable resize set width 600 resize set height 500 - move absolute position 4230 1010 + move absolute position 5000 1860 } for_window [app_id="scrcpy"] { diff --git a/a2337/home/.config/sway/assets/wallpaper/eDP-1/0.jpg b/a2337/home/.config/sway/assets/wallpaper/eDP-1/0.jpg index 5b295d7..a5254b6 100644 Binary files a/a2337/home/.config/sway/assets/wallpaper/eDP-1/0.jpg and b/a2337/home/.config/sway/assets/wallpaper/eDP-1/0.jpg differ diff --git a/a2337/home/.config/sway/assets/wallpaper/eDP-1/2.jpg b/a2337/home/.config/sway/assets/wallpaper/eDP-1/2.jpg index 90af69c..dcd3377 100644 Binary files a/a2337/home/.config/sway/assets/wallpaper/eDP-1/2.jpg and b/a2337/home/.config/sway/assets/wallpaper/eDP-1/2.jpg differ diff --git a/a2337/home/.config/sway/assets/wallpaper/eDP-1/3.jpg b/a2337/home/.config/sway/assets/wallpaper/eDP-1/3.jpg index f654cbd..2dd6d2d 100644 Binary files a/a2337/home/.config/sway/assets/wallpaper/eDP-1/3.jpg and b/a2337/home/.config/sway/assets/wallpaper/eDP-1/3.jpg differ diff --git a/de/home/.config/gtk-3.0/settings.ini b/de/home/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..957e9db --- /dev/null +++ b/de/home/.config/gtk-3.0/settings.ini @@ -0,0 +1,17 @@ +[Settings] +gtk-theme-name=Adwaita-dark +gtk-icon-theme-name=Adwaita +gtk-font-name=Cantarell 11 +gtk-cursor-theme-name=Adwaita +gtk-cursor-theme-size=24 +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=0 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=0 diff --git a/de/include b/de/include index a46432a..ff19475 100644 --- a/de/include +++ b/de/include @@ -48,3 +48,4 @@ .local/bin/software-release-monitor .config/software-release-monitor/config.json .config/qt6ct +.config/gtk-3.0/settings.ini diff --git a/default/home/Scripts/fix-swap-part.sh b/default/home/Scripts/fix-swap-part.sh new file mode 100755 index 0000000..cad3536 --- /dev/null +++ b/default/home/Scripts/fix-swap-part.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +echo "this is not yet done!" +echo "Currently it does not add swap to /etc/fstab or /etc/crypttab" +exit 1 + +read -p '[?] keyfile path [/etc/crypttab.d/swap_key]: ' keyfile_dest +keyfile_dest=${keyfile_dest:-/etc/crypttab.d/swap_key} +read -p '[?] swap partition name [swap_crypt]: ' part_name +part_name=${part_name:-swap_crypt} +read -p '[?] partition password: ' part_pass +while [[ -z "${part_pass}" ]]; do + printf '[!] empty password\n' + read -p '[?] partition password: ' part_pass +done + +#printf '\n' +#lsblk -o NAME,SIZE,FSTYPE +lsblk -o PATH,SIZE,FSTYPE +read -p '[?] encrypted swap device:' swap_blk_dev +while [[ ! "$(file ${swap_blk_dev})" == *'block'* ]]; do + printf '[!] bad encrypted swap device\n' + read -p '[?] encrypted swap device: ' swap_blk_dev +done + +printf '[!] ALL DATA AT THE SELECTED KEYFILE PATH WILL BE OVERWRITTEN\n' +printf '[!] ALL DATA ON THE SELECTED DEVICE WILL BE DELETED\n' +printf '[!] keyfile path: %s\n' "${keyfile_dest}" +printf '[!] encrypted swap device: %s\n' "${swap_blk_dev}" +printf '[!] decrypted partition name: %s\n' "${part_name}" +read -p '[?] Proceed? [y/N] ' proceed_confirm +proceed_confirm=${proceed_confirm:-n} +case "${proceed_confirm}" in + [Nn][Oo]|[Nn]) + printf '[!] Exiting without making changes\n' + ;; + *) + printf '[!] Here we go!\n' + ;; +esac + +exit + +printf '[-] Writing keyfile...\n' +mkdir -p "$(dirname ${keyfile_dest})" +openssl genrsa -out "${keyfile_dest}" 4096 + +printf '[-] Setting keyfile permissions...\n' +chmod -v 0400 "${keyfile_dest}" +chown root:root "${keyfile_dest}" + +printf '[-] Formatting encrypted swap block device...\n' +#printf '[!] When prompted, set the device\'s password\n' +printf '%s' "${part_pass}" | cryptsetup luksFormat "${swap_blk_dev}" - + +printf '[-] Adding keyfile to encrypted device header\n' +#printf '[!] When prompted, set the device\'s password\n' +printf '%s' "${part_pass}" | cryptsetup luksAddKey "${swap_blk_dev}" "${keyfile_dest}" - + +printf '[-] Opening encrypted partition using keyfile\n' +cryptsetup luksOpen "${swap_blk_dev}" "${part_name}" --key-file "${keyfile_dest}" + +printf '[-] Creating swap inside encrypted partition\n' +mkswap "/dev/mapper/${part_name}" diff --git a/default/include b/default/include index 27b73ed..00fe11c 100644 --- a/default/include +++ b/default/include @@ -11,3 +11,4 @@ Scripts/create-podman-container-arm.sh Scripts/iso_updater.sh .local/bin/rdict .config/fastfetch/config.jsonc +Scripts/fix-swap-part.sh