From 32c0d93f45ddd1463b9241f599b91685aab41523 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 21 Jan 2024 17:42:05 +0000 Subject: [PATCH] Updating for Plasma --- .config/gtk-2.0/gtkrc-2.0 | 14 +++++----- .config/gtk-3.0/settings.ini | 24 ++++++++++------- .config/mimeapps.list | 52 +++++++++++++++++++++--------------- .config/shell/aliasrc | 10 +++---- .config/shell/profile | 8 +++--- .config/x11/xprofile | 34 +++++++++++------------ .config/zsh/.zshrc | 2 +- .local/bin/installzip | 8 +++--- .local/bin/setbg | 24 ++++++++++++++--- .local/bin/setup/setupssh | 18 ++++++------- .local/bin/splitbg | 29 ++++++++++++++++++++ 11 files changed, 142 insertions(+), 81 deletions(-) create mode 100755 .local/bin/splitbg diff --git a/.config/gtk-2.0/gtkrc-2.0 b/.config/gtk-2.0/gtkrc-2.0 index da4d02e..26db64b 100644 --- a/.config/gtk-2.0/gtkrc-2.0 +++ b/.config/gtk-2.0/gtkrc-2.0 @@ -1,15 +1,17 @@ +gtk-enable-animations=1 +gtk-primary-button-warps-slider=0 # DO NOT EDIT! This file will be overwritten by LXAppearance. # Any customization should be done in ~/.gtkrc-2.0.mine instead. include "~/.gtkrc-2.0.mine" gtk-theme-name="Arc-Gruvbox" -gtk-icon-theme-name="Adwaita" -gtk-font-name="Sans 10" -gtk-cursor-theme-name="Adwaita" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_TEXT +gtk-icon-theme-name="breeze" +gtk-font-name="Noto Sans, 10" +gtk-cursor-theme-name="breeze_cursors" +gtk-cursor-theme-size=24 +gtk-toolbar-style=3 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 +gtk-button-images=1 gtk-menu-images=1 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 371c307..f5d4b02 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,16 +1,22 @@ [Settings] -gtk-theme-name=Arc-Gruvbox -gtk-icon-theme-name=Adwaita -gtk-font-name=Sans 10 -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_TEXT -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=1 +gtk-application-prefer-dark-theme=true +gtk-button-images=true +gtk-cursor-theme-name=breeze_cursors +gtk-cursor-theme-size=24 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 +gtk-font-name=Noto Sans, 10 +gtk-icon-theme-name=breeze +gtk-menu-images=true +gtk-modules=colorreload-gtk-module +gtk-primary-button-warps-slider=false +gtk-theme-name=Arc-Gruvbox +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=3 gtk-xft-antialias=1 +gtk-xft-dpi=122880 gtk-xft-hinting=1 gtk-xft-hintstyle=hintfull gtk-xft-rgba=rgb -gtk-cursor-theme-name=Adwaita diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 1c847fd..efcd2a6 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,25 +1,33 @@ -[Default Applications] -text/x-shellscript=text.desktop; -x-scheme-handler/mailto=userapp-Thunderbird-VUAL90.desktop -text/plain=text.desktop; -application/postscript=pdf.desktop; -application/pdf=pdf.desktop; -image/png=img.desktop; -image/jpeg=img.desktop; -image/gif=img.desktop; -application/rss+xml=rss.desktop -video/x-matroska=video.desktop -x-scheme-handler/lbry=lbry.desktop -inode/directory=file.desktop -text/html=firefox.desktop -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/about=firefox.desktop -x-scheme-handler/unknown=firefox.desktop -message/rfc822=userapp-Thunderbird-VUAL90.desktop - [Added Associations] -x-scheme-handler/mailto=userapp-Thunderbird-VUAL90.desktop; +inode/directory=org.kde.dolphin.desktop; message/rfc822=userapp-Thunderbird-VUAL90.desktop; +x-scheme-handler/geo=openstreetmap-geo-handler.desktop; +x-scheme-handler/http=firefox.desktop; +x-scheme-handler/https=firefox.desktop; +x-scheme-handler/mailto=org.mozilla.Thunderbird.desktop;userapp-Thunderbird-VUAL90.desktop; x-scheme-handler/sms=org.gnome.Shell.Extensions.ZorinConnect.desktop; -x-scheme-handler/tel=org.gnome.Shell.Extensions.ZorinConnect.desktop; +x-scheme-handler/tel=Zoom.desktop;org.gnome.Shell.Extensions.ZorinConnect.desktop; +x-scheme-handler/etcher=balena-etcher.desktop; + +[Default Applications] +application/pdf=pdf.desktop; +application/postscript=pdf.desktop; +application/rss+xml=rss.desktop +image/gif=img.desktop; +image/jpeg=img.desktop; +image/png=img.desktop; +inode/directory=org.kde.dolphin.desktop; +message/rfc822=userapp-Thunderbird-VUAL90.desktop +text/html=firefox.desktop +text/plain=text.desktop; +text/x-shellscript=text.desktop; +video/x-matroska=video.desktop +x-scheme-handler/about=firefox.desktop +x-scheme-handler/geo=openstreetmap-geo-handler.desktop; +x-scheme-handler/http=firefox.desktop; +x-scheme-handler/https=firefox.desktop; +x-scheme-handler/lbry=lbry.desktop +x-scheme-handler/mailto=org.mozilla.Thunderbird.desktop; +x-scheme-handler/tel=Zoom.desktop; +x-scheme-handler/unknown=firefox.desktop +x-scheme-handler/etcher=balena-etcher.desktop diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 314611b..9b7dcd1 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -7,9 +7,9 @@ # Use $XINITRC variable if file exists. [ -f "$XINITRC" ] && alias startx="startx $XINITRC" -# doas not required for some system commands +# sudo not required for some system commands for x in mount umount sv pacman updatedb su ; do - alias $x="doas $x" + alias $x="sudo $x" done # Verbosity and settings that you pretty much just always are going to want. @@ -35,11 +35,11 @@ alias \ alias \ ka="killall" \ YT="youtube-viewer" \ - sdn="doas shutdown -h now" \ + sdn="sudo shutdown -h now" \ e="$EDITOR" \ v="$EDITOR" \ cl="clear" \ - p="doas pacman" \ + p="sudo pacman" \ z="zathura" \ ll="ls -l" \ la="ls -al" \ @@ -61,8 +61,6 @@ alias \ enr="trans en:ro -j -- " \ enri="trans en:ro -i" -which doas >/dev/null && alias sudo=doas - # Clone from labs function clone_from_labs() { git clone "git@labs.scarif.space:chris/$1" "${@:2}" diff --git a/.config/shell/profile b/.config/shell/profile index d19c7a3..e7f526e 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -9,7 +9,7 @@ unsetopt PROMPT_SP # Default programs export EDITOR="nvim" -export TERMINAL="st" +export TERMINAL="alacritty" export BROWSER="firefox" export LOCATION="guildford" @@ -70,7 +70,7 @@ export ANDROID_HOME="$ANDROID_SDK_ROOT" export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$ANDROID_HOME/emulator:$XDG_DATA_HOME/cargo/bin" # Get pretty colours for ls -. /usr/share/LS_COLORS/dircolors.sh +#. /usr/share/LS_COLORS/dircolors.sh # This is the list for lf icons: export LF_ICONS="di=📁:\ @@ -153,7 +153,7 @@ ex=🎯:\ [ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 & -[ "$XDG_CURRENT_DESKTOP" = "KDE" ] || [ "$XDG_CURRENT_DESKTOP" = "GNOME" ] || export QT_QPA_PLATFORMTHEME="qt5ct" +#[ "$XDG_CURRENT_DESKTOP" = "KDE" ] || [ "$XDG_CURRENT_DESKTOP" = "GNOME" ] || export QT_QPA_PLATFORMTHEME="qt5ct" -[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" +#[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" diff --git a/.config/x11/xprofile b/.config/x11/xprofile index a79be1e..18ccdcc 100644 --- a/.config/x11/xprofile +++ b/.config/x11/xprofile @@ -5,26 +5,26 @@ grep Zorin /etc/lsb-release >/dev/null && exit -xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources # Use Xresources colors/settings on startup +# xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources # Use Xresources colors/settings on startup -if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI" ]; then - DPI="$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI")" - echo "Xft.dpi: $DPI" | xrdb -merge - xrandr --dpi "$DPI" -fi +# if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI" ]; then +# DPI="$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI")" +# echo "Xft.dpi: $DPI" | xrdb -merge +# xrandr --dpi "$DPI" +# fi -eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) -export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) -dbus-update-activation-environment --systemd DISPLAY -export SSH_AUTH_SOCK -setxkbmap gb -setxkbmap -option caps:escape_shifted_capslock +# eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) +# export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) +# dbus-update-activation-environment --systemd DISPLAY +# export SSH_AUTH_SOCK +# setxkbmap gb +# setxkbmap -option caps:escape_shifted_capslock #source /etc/X11/xinit/xinitrc.d/50-systemd-user.h -setbg "$HOME/.local/share/wallpapers/" & # set the background -xcompmgr & # xcompmgr for transparency -dunst & # dunst for notifications -xset r rate 300 50 & # Speed xrate up -unclutter & # Remove mouse when idle +setbg "$HOME/.local/share/wallpapers/" # & # set the background +# xcompmgr & # xcompmgr for transparency +# dunst & # dunst for notifications +# xset r rate 300 50 & # Speed xrate up +# unclutter & # Remove mouse when idle diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index aa2baad..031f0ba 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -120,7 +120,7 @@ bindkey '^[[P' delete-char bindkey '^[[A' history-search-backward bindkey '^[[B' history-search-forward -setxkbmap gb +# setxkbmap gb # Edit line in vim with ctrl-e: autoload edit-commandd-line; zle -N edit-command-line diff --git a/.local/bin/installzip b/.local/bin/installzip index 3d4f49b..61dc713 100755 --- a/.local/bin/installzip +++ b/.local/bin/installzip @@ -24,10 +24,10 @@ done if [ -n $exe_name ]; then basename="${exe_name%.*}" dest="/opt/$basename" - [ -d $dest ] && doas rm -rf "$dest" - doas mv -f "$dir" "$dest" - doas chmod 755 "$dest" + [ -d $dest ] && sudo rm -rf "$dest" + sudo mv -f "$dir" "$dest" + sudo chmod 755 "$dest" exe=$(echo "$basename" | tr '[:upper:]' '[:lower:]') - doas ln -fs "$dest/$exe_name" "/usr/bin/$exe" + sudo ln -fs "$dest/$exe_name" "/usr/bin/$exe" fi diff --git a/.local/bin/setbg b/.local/bin/setbg index d1e6c9a..40c8149 100755 --- a/.local/bin/setbg +++ b/.local/bin/setbg @@ -19,8 +19,26 @@ esac [ -z "$trueloc" ] && trueloc="$(readlink -f "$bgloc")" # If pywal is installed, use it. -command -v wal >/dev/null 2>&1 && - wal -i "$trueloc" -n -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && - dwmc xrdb +# command -v wal >/dev/null 2>&1 && +# wal -i "$trueloc" -n -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 && +# dwmc xrdb xwallpaper --no-randr --zoom "$bgloc" + +parent_dir=$(dirname "$trueloc") +filename=$(basename "$trueloc") +filename_without_extension=${filename%.*} +split_dir="${parent_dir}_split" +left_image="${split_dir}/${filename_without_extension}_left.jpg" +right_image="${split_dir}/${filename_without_extension}_right.jpg" + +# Check if left and right images exist +if [ -e "$left_image" ] && [ -e "$right_image" ]; then + kwriteconfig5 --file "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" \ + --group 'Containments' --group '127' --group 'Wallpaper' --group 'org.kde.image' \ + --group 'General' --key 'Image' "$left_image" + + kwriteconfig5 --file "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" \ + --group 'Containments' --group '94' --group 'Wallpaper' --group 'org.kde.image' \ + --group 'General' --key 'Image' "$right_image" +fi diff --git a/.local/bin/setup/setupssh b/.local/bin/setup/setupssh index c55d1c5..e39f089 100755 --- a/.local/bin/setup/setupssh +++ b/.local/bin/setup/setupssh @@ -5,7 +5,7 @@ echo "Setting up SSH" # Extract the login details from enpass LABS=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort show "Scarif: Labs" 2>&1) LABSUN=$(echo "$LABS" | grep -Po "(?<=login: )\w+") -LABSPW=$(echo "$LABS" | grep -Po "(?<=pass : ).+(?=\")") +LABSPW=$(echo "$LABS" | grep -Po "(?<=password: ).+(?=\")") SSHPATH="$HOME/.ssh/id_ed25519" # The path to the SSH key file TITLE="$USER@$(cat /etc/hostname)" # The title for the SSH key @@ -62,14 +62,14 @@ curl -X POST \ HTTP_REPLACE="s/https:\/\/labs\.scarif\.space\//git@labs.scarif.space:/" -for dir in $(ls "$HOME/.local/src"); do - dir="$HOME/.local/src/$dir" - if [ -d $dir ]; then - cd "$dir" - SSH_URL=$(git remote get-url origin | sed "$HTTP_REPLACE") - git remote set-url origin "$SSH_URL" - fi -done +# for dir in $(ls "$HOME/.local/src"); do +# dir="$HOME/.local/src/$dir" +# if [ -d $dir ]; then +# cd "$dir" +# SSH_URL=$(git remote get-url origin | sed "$HTTP_REPLACE") +# git remote set-url origin "$SSH_URL" +# fi +# done DOTFILES_SSH_URL=$(git --git-dir "$HOME/.config/dotfiles/.git" --work-tree="$HOME" remote get-url origin | sed "$HTTP_REPLACE") git --git-dir "$HOME/.config/dotfiles/.git" --work-tree="$HOME" remote set-url origin "$DOTFILES_SSH_URL" diff --git a/.local/bin/splitbg b/.local/bin/splitbg new file mode 100755 index 0000000..cf27478 --- /dev/null +++ b/.local/bin/splitbg @@ -0,0 +1,29 @@ +#!/bin/bash + +input_dir="$1" # Replace with your input directory path +output_dir="$2" # Replace with your output directory path + +# Ensure the output directory exists or create it +mkdir -p "$output_dir" + +# Loop through all JPEG files in the input directory +for file in "$input_dir"/*.jpg; do + if [ -e "$file" ]; then + filename=$(basename "$file") + filename_without_extension="${filename%.*}" + output_file1="$output_dir/${filename_without_extension}_left.jpg" + output_file2="$output_dir/${filename_without_extension}_right.jpg" + + # Get the width of the image + width=$(identify -format "%w" "$file") + + # Use ImageMagick to split the image in half + convert "$file" -crop "50%x100%+0+0" "$output_file1" + convert "$file" -crop "50%x100%+$((width / 2))+0" "$output_file2" + + echo "Split $filename into $output_file1 and $output_file2" + fi +done + +echo "Splitting completed." +