diff --git a/dot_config/gtkrc b/dot_config/gtkrc index 976842d..1a88baa 100644 --- a/dot_config/gtkrc +++ b/dot_config/gtkrc @@ -1,2 +1,2 @@ -# created by KDE Plasma, Sun Mar 3 17:10:44 2024 +# created by KDE Plasma, Thu Mar 14 12:18:50 2024 # diff --git a/dot_config/gtkrc-2.0 b/dot_config/gtkrc-2.0 index 0b62e71..c24e3b9 100644 --- a/dot_config/gtkrc-2.0 +++ b/dot_config/gtkrc-2.0 @@ -1,4 +1,4 @@ -# created by KDE Plasma, Sun Mar 3 17:10:44 2024 +# created by KDE Plasma, Thu Mar 14 12:18:50 2024 # gtk-alternative-button-order = 1 diff --git a/dot_config/kwinoutputconfig.json b/dot_config/kwinoutputconfig.json index b81cf75..875df75 100644 --- a/dot_config/kwinoutputconfig.json +++ b/dot_config/kwinoutputconfig.json @@ -10,7 +10,7 @@ "iccProfilePath": "", "mode": { "height": 1440, - "refreshRate": 120063, + "refreshRate": 143995, "width": 2560 }, "overscan": 0, @@ -19,7 +19,7 @@ "sdrBrightness": 200, "sdrGamutWideness": 0, "transform": "Normal", - "vrrPolicy": "Never", + "vrrPolicy": "Automatic", "wideColorGamut": false }, { @@ -77,7 +77,7 @@ "outputIndex": 0, "position": { "x": 1440, - "y": 1080 + "y": 1120 }, "priority": 0 }, @@ -86,7 +86,7 @@ "outputIndex": 1, "position": { "x": 1440, - "y": 0 + "y": 40 }, "priority": 1 }, diff --git a/dot_config/private_gtk-4.0/.keep b/dot_config/private_gtk-4.0/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/private_kglobalshortcutsrc b/dot_config/private_kglobalshortcutsrc index 4b39029..ead7486 100644 --- a/dot_config/private_kglobalshortcutsrc +++ b/dot_config/private_kglobalshortcutsrc @@ -255,5 +255,5 @@ toggle do not disturb=none,,Toggle do not disturb _launch=Meta+Return [services][org.kde.spectacle.desktop] -RectangularRegionScreenShot=none +RectangularRegionScreenShot=Meta+Shift+S _launch=Print diff --git a/dot_config/private_plasma-org.kde.plasma.desktop-appletsrc b/dot_config/private_plasma-org.kde.plasma.desktop-appletsrc index 4e0f3cc..4af7315 100644 --- a/dot_config/private_plasma-org.kde.plasma.desktop-appletsrc +++ b/dot_config/private_plasma-org.kde.plasma.desktop-appletsrc @@ -55,6 +55,10 @@ plugin=org.kde.plasma.volume [Containments][10][Applets][17][Configuration][General] migrated=true +[Containments][10][Applets][18] +immutability=1 +plugin=org.kde.kscreen + [Containments][10][Applets][20] immutability=1 plugin=org.kde.plasma.networkmanagement @@ -81,8 +85,8 @@ plugin=org.kde.plasma.mediacontroller PreloadWeight=26 [Containments][10][General] -extraItems=org.kde.plasma.battery,org.kde.plasma.brightness,org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.keyboardlayout,org.kde.plasma.volume,org.kde.plasma.networkmanagement -knownItems=org.kde.plasma.battery,org.kde.plasma.brightness,org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.keyboardlayout,org.kde.plasma.volume,org.kde.plasma.networkmanagement +extraItems=org.kde.plasma.battery,org.kde.plasma.brightness,org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.keyboardlayout,org.kde.plasma.volume,org.kde.plasma.networkmanagement,org.kde.kscreen +knownItems=org.kde.plasma.battery,org.kde.plasma.brightness,org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.keyboardlayout,org.kde.plasma.volume,org.kde.plasma.networkmanagement,org.kde.kscreen [Containments][2] ItemGeometries-1920x1080= @@ -187,4 +191,4 @@ AppletOrder=5;6;7;8;9;19;27 [ScreenMapping] itemsOnDisabledScreens= -screenMapping=desktop:/Fortnite.desktop,0,78ba6e6d-5dc7-4f18-a39b-c2af6d31bd8a +screenMapping=desktop:/Old Firefox Data,0,78ba6e6d-5dc7-4f18-a39b-c2af6d31bd8a,desktop:/Fortnite.desktop,0,78ba6e6d-5dc7-4f18-a39b-c2af6d31bd8a diff --git a/dot_oh-my-zsh/cache/dot_zsh-update b/dot_oh-my-zsh/cache/dot_zsh-update index bddfd7f..97cf6cd 100644 --- a/dot_oh-my-zsh/cache/dot_zsh-update +++ b/dot_oh-my-zsh/cache/dot_zsh-update @@ -1 +1,7 @@ -LAST_EPOCH=19783 +LAST_EPOCH=19796 +EXIT_STATUS=1 +ERROR='error: The following untracked working tree files would be overwritten by merge: + lib/async_prompt.zsh +Please move or remove them before you merge. +Aborting +There was an error updating. Try again later?' diff --git a/dot_oh-my-zsh/dot_git/FETCH_HEAD b/dot_oh-my-zsh/dot_git/FETCH_HEAD index d48b247..7a42d2c 100644 --- a/dot_oh-my-zsh/dot_git/FETCH_HEAD +++ b/dot_oh-my-zsh/dot_git/FETCH_HEAD @@ -1 +1 @@ -9730915910c6cc7640f8af6063ffb93becf0414a branch 'master' of https://github.com/ohmyzsh/ohmyzsh +6780b19329501b66bc87274928f0a65cc7e5f473 branch 'master' of https://github.com/ohmyzsh/ohmyzsh diff --git a/dot_oh-my-zsh/dot_git/ORIG_HEAD b/dot_oh-my-zsh/dot_git/ORIG_HEAD index 8a714d7..1a76d34 100644 --- a/dot_oh-my-zsh/dot_git/ORIG_HEAD +++ b/dot_oh-my-zsh/dot_git/ORIG_HEAD @@ -1 +1 @@ -872b5cd4086a5547dbf788dda4e96ab3868cf59b +9730915910c6cc7640f8af6063ffb93becf0414a diff --git a/dot_oh-my-zsh/dot_git/index b/dot_oh-my-zsh/dot_git/index index 4c6a89c..54e3181 100644 Binary files a/dot_oh-my-zsh/dot_git/index and b/dot_oh-my-zsh/dot_git/index differ diff --git a/dot_oh-my-zsh/dot_git/logs/HEAD b/dot_oh-my-zsh/dot_git/logs/HEAD index 89dac4e..a4756bc 100644 --- a/dot_oh-my-zsh/dot_git/logs/HEAD +++ b/dot_oh-my-zsh/dot_git/logs/HEAD @@ -50,3 +50,7 @@ b6bb133f230847ed0b3f9f4e25f2ceb874ca6c91 48ccc7b36de8efb2bd7beb9bd6e0a6f6fe03b95 872b5cd4086a5547dbf788dda4e96ab3868cf59b 872b5cd4086a5547dbf788dda4e96ab3868cf59b Philipp 1709283654 +0100 checkout: moving from master to master 872b5cd4086a5547dbf788dda4e96ab3868cf59b 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1709283655 +0100 pull --quiet --rebase origin master: Fast-forward 9730915910c6cc7640f8af6063ffb93becf0414a 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1709283655 +0100 checkout: moving from master to master +9730915910c6cc7640f8af6063ffb93becf0414a 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1710415044 +0100 checkout: moving from master to master +9730915910c6cc7640f8af6063ffb93becf0414a 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1710415044 +0100 checkout: moving from master to master +9730915910c6cc7640f8af6063ffb93becf0414a 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1710415044 +0100 checkout: moving from master to master +9730915910c6cc7640f8af6063ffb93becf0414a 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1710415045 +0100 checkout: moving from master to master diff --git a/dot_oh-my-zsh/dot_git/logs/refs/remotes/origin/master b/dot_oh-my-zsh/dot_git/logs/refs/remotes/origin/master index 6c86221..a87e107 100644 --- a/dot_oh-my-zsh/dot_git/logs/refs/remotes/origin/master +++ b/dot_oh-my-zsh/dot_git/logs/refs/remotes/origin/master @@ -16,3 +16,4 @@ b6bb133f230847ed0b3f9f4e25f2ceb874ca6c91 48ccc7b36de8efb2bd7beb9bd6e0a6f6fe03b95 8be4789bbbef06fe5eed581dc8c58df51e3cd9fd 80c114cb3a64044ea50b623f96a35bc022db5e8d Philipp 1706568347 +0100 pull --quiet --rebase origin master: fast-forward 80c114cb3a64044ea50b623f96a35bc022db5e8d 872b5cd4086a5547dbf788dda4e96ab3868cf59b Philipp 1708188628 +0100 pull --quiet --rebase origin master: fast-forward 872b5cd4086a5547dbf788dda4e96ab3868cf59b 9730915910c6cc7640f8af6063ffb93becf0414a Philipp 1709283655 +0100 pull --quiet --rebase origin master: fast-forward +9730915910c6cc7640f8af6063ffb93becf0414a 6780b19329501b66bc87274928f0a65cc7e5f473 Philipp 1710415044 +0100 pull --quiet --rebase origin master: fast-forward diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.idx b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.idx new file mode 100644 index 0000000..8bddfc0 Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.idx differ diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.pack b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.pack new file mode 100644 index 0000000..ce70cbb Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.pack differ diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.rev b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.rev new file mode 100644 index 0000000..b0b8c52 Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9897b4dae03898c1e962b8217609bdef762ad078.rev differ diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.idx b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.idx new file mode 100644 index 0000000..04c5fe9 Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.idx differ diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.pack b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.pack new file mode 100644 index 0000000..20395a7 Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.pack differ diff --git a/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.rev b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.rev new file mode 100644 index 0000000..600668d Binary files /dev/null and b/dot_oh-my-zsh/dot_git/objects/pack/readonly_pack-9e546791eb6b23f000024b37e97a1d753c79d642.rev differ diff --git a/dot_oh-my-zsh/dot_git/refs/remotes/origin/master b/dot_oh-my-zsh/dot_git/refs/remotes/origin/master index 1a76d34..587d858 100644 --- a/dot_oh-my-zsh/dot_git/refs/remotes/origin/master +++ b/dot_oh-my-zsh/dot_git/refs/remotes/origin/master @@ -1 +1 @@ -9730915910c6cc7640f8af6063ffb93becf0414a +6780b19329501b66bc87274928f0a65cc7e5f473 diff --git a/dot_oh-my-zsh/lib/async_prompt.zsh b/dot_oh-my-zsh/lib/async_prompt.zsh new file mode 100644 index 0000000..384e49d --- /dev/null +++ b/dot_oh-my-zsh/lib/async_prompt.zsh @@ -0,0 +1,146 @@ +# The async code is taken from +# https://github.com/zsh-users/zsh-autosuggestions/blob/master/src/async.zsh +# https://github.com/woefe/git-prompt.zsh/blob/master/git-prompt.zsh + +zmodload zsh/system + +# For now, async prompt function handlers are set up like so: +# First, define the async function handler and register the handler +# with _omz_register_handler: +# +# function _git_prompt_status_async { +# # Do some expensive operation that outputs to stdout +# } +# _omz_register_handler _git_prompt_status_async +# +# Then add a stub prompt function in `$PROMPT` or similar prompt variables, +# which will show the output of "$_OMZ_ASYNC_OUTPUT[handler_name]": +# +# function git_prompt_status { +# echo -n $_OMZ_ASYNC_OUTPUT[_git_prompt_status_async] +# } +# +# RPROMPT='$(git_prompt_status)' +# +# This API is subject to change and optimization. Rely on it at your own risk. + +function _omz_register_handler { + setopt localoptions noksharrays + typeset -ga _omz_async_functions + # we want to do nothing if there's no $1 function or we already set it up + if [[ -z "$1" ]] || (( ! ${+functions[$1]} )) \ + || (( ${_omz_async_functions[(Ie)$1]} )); then + return + fi + _omz_async_functions+=("$1") + # let's add the hook to async_request if it's not there yet + if (( ! ${precmd_functions[(Ie)_omz_async_request]} )) \ + && (( ${+functions[_omz_async_request]})); then + autoload -Uz add-zsh-hook + add-zsh-hook precmd _omz_async_request + fi +} + +# Set up async handlers and callbacks +function _omz_async_request { + local -i ret=$? + typeset -gA _OMZ_ASYNC_FDS _OMZ_ASYNC_PIDS _OMZ_ASYNC_OUTPUT + + # executor runs a subshell for all async requests based on key + local handler + for handler in ${_omz_async_functions}; do + (( ${+functions[$handler]} )) || continue + + local fd=${_OMZ_ASYNC_FDS[$handler]:--1} + local pid=${_OMZ_ASYNC_PIDS[$handler]:--1} + + # If we've got a pending request, cancel it + if (( fd != -1 && pid != -1 )) && { true <&$fd } 2>/dev/null; then + # Close the file descriptor and remove the handler + exec {fd}<&- + zle -F $fd + + # Zsh will make a new process group for the child process only if job + # control is enabled (MONITOR option) + if [[ -o MONITOR ]]; then + # Send the signal to the process group to kill any processes that may + # have been forked by the async function handler + kill -TERM -$pid 2>/dev/null + else + # Kill just the child process since it wasn't placed in a new process + # group. If the async function handler forked any child processes they may + # be orphaned and left behind. + kill -TERM $pid 2>/dev/null + fi + fi + + # Define global variables to store the file descriptor, PID and output + _OMZ_ASYNC_FDS[$handler]=-1 + _OMZ_ASYNC_PIDS[$handler]=-1 + + # Fork a process to fetch the git status and open a pipe to read from it + exec {fd}< <( + # Tell parent process our PID + builtin echo ${sysparams[pid]} + # Store handler name for callback + builtin echo $handler + # Set exit code for the handler if used + (exit $ret) + # Run the async function handler + $handler + ) + + # Save FD for handler + _OMZ_ASYNC_FDS[$handler]=$fd + + # There's a weird bug here where ^C stops working unless we force a fork + # See https://github.com/zsh-users/zsh-autosuggestions/issues/364 + command true + + # Save the PID from the handler child process + read pid <&$fd + _OMZ_ASYNC_PIDS[$handler]=$pid + + # When the fd is readable, call the response handler + zle -F "$fd" _omz_async_callback + done +} + +# Called when new data is ready to be read from the pipe +function _omz_async_callback() { + emulate -L zsh + + local fd=$1 # First arg will be fd ready for reading + local err=$2 # Second arg will be passed in case of error + + if [[ -z "$err" || "$err" == "hup" ]]; then + # Get handler name from first line + local handler + read handler <&$fd + + # Store old output which is supposed to be already printed + local old_output="${_OMZ_ASYNC_OUTPUT[$handler]}" + + # Read output from fd + _OMZ_ASYNC_OUTPUT[$handler]="$(cat <&$fd)" + + # Repaint prompt if output has changed + if [[ "$old_output" != "${_OMZ_ASYNC_OUTPUT[$handler]}" ]]; then + zle reset-prompt + zle -R + fi + + # Close the fd + exec {fd}<&- + fi + + # Always remove the handler + zle -F "$fd" + + # Unset global FD variable to prevent closing user created FDs in the precmd hook + _OMZ_ASYNC_FDS[$handler]=-1 + _OMZ_ASYNC_PIDS[$handler]=-1 +} + +autoload -Uz add-zsh-hook +add-zsh-hook precmd _omz_async_request