diff options
| -rw-r--r-- | alacritty/.config/alacritty/alacritty.toml | 1 | ||||
| -rw-r--r-- | bash/.bash_aliases | 31 | ||||
| -rwxr-xr-x | bash/.bashrc | 28 | ||||
| -rw-r--r-- | fastfetch/.config/fastfetch/config.jsonc | 8 | ||||
| -rw-r--r-- | fish/.config/fish/config.fish | 54 | ||||
| -rw-r--r-- | fish/.config/fish/fish_variables | 33 | ||||
| -rw-r--r-- | fish/.config/fish/functions/fish_prompt.fish | 31 | ||||
| -rw-r--r-- | picom/.config/picom/picom.conf | 92 | ||||
| -rw-r--r-- | polybar/.config/polybar/config.ini | 2 | ||||
| -rw-r--r-- | qutebrowser/.config/qutebrowser/config.py | 4 | ||||
| -rw-r--r-- | xorg/.config/env | 1 |
11 files changed, 238 insertions, 47 deletions
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index ba8a42c..26b7f5b 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -1,3 +1,4 @@ +shell = "/usr/bin/fish" import = [ "~/.config/alacritty/catppuccin-mocha.toml" # "~/.cache/wal/colors-alacritty.toml" diff --git a/bash/.bash_aliases b/bash/.bash_aliases new file mode 100644 index 0000000..397ab73 --- /dev/null +++ b/bash/.bash_aliases @@ -0,0 +1,31 @@ +alias ..="cd ../" +alias ...="cd ../../" +alias ls="ls --color=auto" +alias ll="eza -la --time-style '+%a, %Y-%m-%d %H:%M' --hyperlink" +alias lr="eza -la --time-style '+%a, %Y-%m-%d %H:%M' --total-size --hyperlink" + +alias stw="stow -v --target=$HOME" + +alias clip="xclip -selection clipboard" +alias diff="diff --color=auto" +alias grep="grep --color=auto" +alias hss="hugo server --noHTTPCache" +alias ip="ip --color=auto" +alias lf="lfub" +alias lgit="lazygit" +alias mail="thunderbird" +alias mus="ncmpcpp" +alias su="su -" +alias vim="nvim" +alias vi="nvim" + +alias yp="pwd | clip" +alias ytdl="yt-dlp" +alias zeit="tty-clock -C 1 -f %d.%m.%Y -sc" +alias kwbx="killall CiscoCollabHost" +alias showoff="fastfetch" +alias wisdom="fortune -os | cowsay -f tux" +alias xmap="xmodmap ~/.Xmodmap" + +# disabled for fish compatibility :( +# alias emacs=":(){:|:&};:" diff --git a/bash/.bashrc b/bash/.bashrc index eef00e3..c6abc8e 100755 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -25,36 +25,12 @@ source_if_present "$HOME/.config/less/termcap" bind '"\t":menu-complete' # Set aliases -alias ..="cd ../" -alias ...="cd ../../" -alias ls="ls --color=auto" -alias ll="ls -lah --color=auto" - -alias stw="stow -v --target=$HOME" - -alias clip="xclip -selection clipboard" -alias diff="diff --color=auto" -alias grep="grep --color=auto" -alias hss="hugo server --noHTTPCache" -alias ip="ip --color=auto" -alias lf="lfub" -alias lgit="lazygit" -alias mail="thunderbird" -alias mus="ncmpcpp" -alias su="su -" -alias vim="nvim" -alias emacs=":(){:|:&};:" -alias yp="pwd | clip" -alias ytdl="yt-dlp" -alias zeit="tty-clock -C 1 -f %d.%m.%Y -sc" -alias kwbx="killall CiscoCollabHost" -alias showoff="fastfetch" -alias wisdom="fortune -os | cowsay -f tux" +source_if_present "$HOME/.bash_aliases" # Automatically remove these directories, if some pesky program created them again. rmdir $HOME/Desktop $HOME/Documents $HOME/Downloads $HOME/Images $HOME/Music $HOME/Templates $HOME/Video 2> /dev/null -export PS1='[\001\e[0;36m\002\j\001\e[0m\002] [ \001\e[0;34m\002\u\001\e[0m\002@\001\e[0;34m\002\h\001\e[0m\002 ] \001\e[0;35m\002\W\001\e[0m\002 \$ ' +# export PS1='[\001\e[0;36m\002\j\001\e[0m\002] [ \001\e[0;34m\002\u\001\e[0m\002@\001\e[0;34m\002\h\001\e[0m\002 ] \001\e[0;35m\002\W\001\e[0m\002 \$ ' # Enable wal colors, if terminal emulator is 'st' if [[ "$terminal" = "st" ]]; then diff --git a/fastfetch/.config/fastfetch/config.jsonc b/fastfetch/.config/fastfetch/config.jsonc index 18d3324..bc72ca9 100644 --- a/fastfetch/.config/fastfetch/config.jsonc +++ b/fastfetch/.config/fastfetch/config.jsonc @@ -1,11 +1,15 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "display": { - "keyWidth": 11, + "key": { + "width": 11, + }, "percent": { "type": false, }, - "binaryPrefix": "si", + "size": { + "binaryPrefix": "si", + }, "color": { "keys" : "light_blue", "output" : "white", diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish new file mode 100644 index 0000000..2c990fa --- /dev/null +++ b/fish/.config/fish/config.fish @@ -0,0 +1,54 @@ +if status is-interactive + # Commands to run in interactive sessions can go here + source ~/.bash_aliases + source ~/.config/env + + function su + command su --shell=/usr/bin/fish $argv + end + + function sudo --description "Replacement for Bash 'sudo !!' command to run last command using sudo." + if test "$argv" = !! + echo sudo $history[1] + eval command sudo $history[1] + else + command sudo $argv + end + end + + function fish_prompt --description 'Write out the prompt' + set -l normal (set_color normal) + set -q fish_color_status + or set -g fish_color_status red + + # Color the prompt differently when we're root + set -l color_cwd $fish_color_cwd + set -l suffix '$' + if functions -q fish_is_root_user; and fish_is_root_user + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + end + set suffix '#' + end + + echo -n -s '< '(prompt_login)' > ' (set_color $color_cwd) (basename (prompt_pwd)) $normal (fish_vcs_prompt) $normal " "$suffix " " + end + + function fish_right_prompt + set -l last_pipestatus $pipestatus + set -lx __fish_last_status $status # Export for __fish_print_pipestatus. + # Write pipestatus + # If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it. + set -l bold_flag --bold + set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation + if test $__fish_prompt_status_generation = $status_generation + set bold_flag + end + set __fish_prompt_status_generation $status_generation + set -l status_color (set_color $fish_color_status) + set -l statusb_color (set_color $bold_flag $fish_color_status) + set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) + + echo $prompt_status + end +end diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables new file mode 100644 index 0000000..7e78b79 --- /dev/null +++ b/fish/.config/fish/fish_variables @@ -0,0 +1,33 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3400 +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:blue +SETUVAR fish_color_comment:yellow +SETUVAR fish_color_cwd:magenta +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:blue +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:blue +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_features:qmark\x2dnoglob +SETUVAR fish_greeting:\x1d +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..9c4f6a7 --- /dev/null +++ b/fish/.config/fish/functions/fish_prompt.fish @@ -0,0 +1,31 @@ +function fish_prompt --description 'Write out the prompt' + set -l last_pipestatus $pipestatus + set -lx __fish_last_status $status # Export for __fish_print_pipestatus. + set -l normal (set_color normal) + set -q fish_color_status + or set -g fish_color_status red + + # Color the prompt differently when we're root + set -l color_cwd $fish_color_cwd + set -l suffix '>' + if functions -q fish_is_root_user; and fish_is_root_user + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + end + set suffix '#' + end + + # Write pipestatus + # If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it. + set -l bold_flag --bold + set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation + if test $__fish_prompt_status_generation = $status_generation + set bold_flag + end + set __fish_prompt_status_generation $status_generation + set -l status_color (set_color $fish_color_status) + set -l statusb_color (set_color $bold_flag $fish_color_status) + set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) + + echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " " +end diff --git a/picom/.config/picom/picom.conf b/picom/.config/picom/picom.conf index adc522d..f58f70b 100644 --- a/picom/.config/picom/picom.conf +++ b/picom/.config/picom/picom.conf @@ -1,13 +1,9 @@ -shadow = true; -shadow-radius = 20 -shadow-opacity = 0.5 -shadow-offset-x = -20; -shadow-offset-y = -20; -shadow-exclude = "x = 0 && y = 0 && override_redirect = true"; +# Config needs at least picom rev 3d3f360 -fading = true -fade-in-step = 0.05; -fade-out-step = 0.05; +shadow = false; +shadow-radius = 15 +shadow-color = "#0c0c0c" +shadow-exclude = "x = 0 && y = 0 && override_redirect = true"; corner-radius = 0 @@ -19,8 +15,6 @@ vsync = true # "grayscale.glsl:class_g = 'st' && !_NET_WM_STATE@:32a" # ] -active-opacity: 1.95 -inactive-opacity: 1.95 mark-wmwin-focused = false mark-ovredir-focused = false @@ -31,12 +25,78 @@ detect-client-leader = true use-damage = true -animations = false -animation-for-open-window = "zoom" +animations = true +animations = ( + { + triggers = ["close", "hide"]; + opacity = { + curve = "linear"; + duration = 0.1; + start = "window-raw-opacity-before"; + end = 0; + }; + shadow-opacity = "opacity"; + }, + { + triggers = ["open", "show"]; + opacity = { + curve = "cubic-bezier(0,1,1,1)"; + duration = 0.3; + start = 0; + end = "window-raw-opacity"; + }; + shadow-opacity = "opacity"; + offset-x = "(1 - scale-x) / 2 * window-width"; + offset-y = "(1 - scale-y) / 2 * window-height"; + scale-x = { + curve = "cubic-bezier(0,1.3,1,1)"; + duration = 0.3; + start = 0.6; + end = 1; + }; + scale-y = "scale-x"; + shadow-scale-x = "scale-x"; + shadow-scale-y = "scale-y"; + shadow-offset-x = "offset-x"; + shadow-offset-y = "offset-y"; + }, + { + triggers = ["geometry"] + scale-x = { + curve = "cubic-bezier(0,0,0,1.28)"; + duration = 0.22; + start = "window-width-before / window-width"; + end = 1; + } + scale-y = { + curve = "cubic-bezier(0,0,0,1.28)"; + duration = 0.22; + start = "window-height-before / window-height"; + end = 1; + } + offset-x = { + curve = "cubic-bezier(0,0,0,1.28)"; + duration = 0.22; + start = "window-x-before - window-x"; + end = 0; + } + offset-y = { + curve = "cubic-bezier(0,0,0,1.28)"; + duration = 0.22; + start = "window-y-before - window-y"; + end = 0; + } + + shadow-scale-x = "scale-x"; + shadow-scale-y = "scale-y"; + shadow-offset-x = "offset-x"; + shadow-offset-y = "offset-y"; + } +); wintypes: { - tooltip = { fade = true; shadow = true; focus = true; full-shadow = false; }; - dock = { shadow = false; } - dnd = { shadow = false; } + tooltip = { focus = true; }; + normal = { shadow = false; } + splash = { shadow = false; } }; diff --git a/polybar/.config/polybar/config.ini b/polybar/.config/polybar/config.ini index 0c99cdc..87ef1e5 100644 --- a/polybar/.config/polybar/config.ini +++ b/polybar/.config/polybar/config.ini @@ -209,7 +209,7 @@ type = internal/date interval = 1 date = %a, %Y-%m-%d %H:%M -date-alt = %a, %Y-%m-%d %H:%M:%S (%z %Z) +date-alt = W%V %A, %Y-%m-%d %H:%M:%S (UTC%z / %Z) format-prefix = " " format-prefix-foreground = ${colors.primary} diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index 29d761e..7a7a084 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -12,8 +12,8 @@ c: ConfigContainer = c # noqa: F821 pylint: disable=E0602,C0103 config.load_autoconfig(False) -config.bind("<Ctrl-J>", "tab-next") -config.bind("<Ctrl-K>", "tab-prev") +config.bind("<Shift-J>", "tab-prev") +config.bind("<Shift-K>", "tab-next") from utils import * import subprocess diff --git a/xorg/.config/env b/xorg/.config/env index 0fc237d..ad54b69 100644 --- a/xorg/.config/env +++ b/xorg/.config/env @@ -68,4 +68,5 @@ export GDK_SCALE="1" export LESSHISTFILE="-" export ZDOTDIR="$HOME/.config/zsh" export WGETRC="$HOME/.config/wget/wgetrc" +export GOPATH="$HOME/.cache/go" |