diff --git a/.config/shell/profile b/.config/shell/profile index 10576778..c91388cb 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -11,9 +11,9 @@ export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}" unsetopt PROMPT_SP # Default programs: -export EDITOR="nvim" -export TERMINAL="st" -export BROWSER="brave" +export EDITOR="micro" +export TERMINAL="kitty" +export BROWSER="librewolf" # ~/ Clean-up: export XDG_CONFIG_HOME="$HOME/.config" diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 2debc017..fe115370 100755 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -13,5 +13,7 @@ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then else . "$HOME/.xprofile" fi - -ssh-agent dwm +picom & +export $TERMINAL = kitty +export $EDITOR = micro +dwm >>/home/gabriwarx/dwm.log diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 22a166e7..fd749471 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,77 +1,104 @@ -# Luke's config for the Zoomer Shell +source ~/.config/zsh/zsh-snap/znap.zsh +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH +# Path to your oh-my-zsh installation. +export ZSH="/home/gabriwarx/.oh-my-zsh" -# Enable colors and change prompt: -autoload -U colors && colors # Load colors -PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " -setopt autocd # Automatically cd into typed directory. -stty stop undef # Disable ctrl-s to freeze terminal. -setopt interactive_comments +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="fox" -# History in cache directory: -HISTSIZE=10000000 -SAVEHIST=10000000 -HISTFILE=~/.cache/zsh/history +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) -# Load aliases and shortcuts if existent. -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc" -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" -# Basic auto/tab complete: -autoload -U compinit -zstyle ':completion:*' menu select -zmodload zsh/complist -compinit -_comp_options+=(globdots) # Include hidden files. +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" -# vi mode -bindkey -v -export KEYTIMEOUT=1 +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time -# Use vim keys in tab complete menu: -bindkey -M menuselect 'h' vi-backward-char -bindkey -M menuselect 'k' vi-up-line-or-history -bindkey -M menuselect 'l' vi-forward-char -bindkey -M menuselect 'j' vi-down-line-or-history -bindkey -v '^?' backward-delete-char +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 -# Change cursor shape for different vi modes. -function zle-keymap-select () { - case $KEYMAP in - vicmd) echo -ne '\e[1 q';; # block - viins|main) echo -ne '\e[5 q';; # beam - esac -} -zle -N zle-keymap-select -zle-line-init() { - zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere) - echo -ne "\e[5 q" -} -zle -N zle-line-init -echo -ne '\e[5 q' # Use beam shape cursor on startup. -preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" -# Use lf to switch directories and bind it to ctrl-o -lfcd () { - tmp="$(mktemp)" - lf -last-dir-path="$tmp" "$@" - if [ -f "$tmp" ]; then - dir="$(cat "$tmp")" - rm -f "$tmp" >/dev/null - [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir" - fi -} -bindkey -s '^o' 'lfcd\n' +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" -bindkey -s '^a' 'bc -lq\n' +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" -bindkey -s '^f' 'cd "$(dirname "$(fzf)")"\n' +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" -bindkey '^[[P' delete-char +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" -# Edit line in vim with ctrl-e: -autoload edit-command-line; zle -N edit-command-line -bindkey '^e' edit-command-line +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" -# Load syntax highlighting; should be last. -source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" +znap source marlonrichert/zsh-autocomplete + +cal -3 diff --git a/.local/bin/opout b/.local/bin/opout index faf65753..7f452df0 100755 --- a/.local/bin/opout +++ b/.local/bin/opout @@ -4,7 +4,7 @@ # usually the pdf of a compiled document. I find this useful especially # running from vim. -basename="${1%.*}" +basename="$(echo "${*}" | sed 's/\.[^\/.]*$//')" case "${*}" in *.tex|*.m[dse]|*.[rR]md|*.mom|*.[0-9]) setsid -f xdg-open "$basename".pdf >/dev/null 2>&1 ;; diff --git a/.local/bin/statusbar/sb-battery b/.local/bin/statusbar/sb-battery index 93cbe088..220e6c20 100755 --- a/.local/bin/statusbar/sb-battery +++ b/.local/bin/statusbar/sb-battery @@ -6,7 +6,7 @@ case $BLOCK_BUTTON in 3) notify-send "🔋 Battery module" "🔋: discharging 🛑: not charging -♻: stagnant charge +♻️: stagnant charge 🔌: charging ⚡: charged ❗: battery very low! diff --git a/.local/bin/statusbar/sb-memory b/.local/bin/statusbar/sb-memory index 01d3daf9..e3bae50c 100755 --- a/.local/bin/statusbar/sb-memory +++ b/.local/bin/statusbar/sb-memory @@ -6,7 +6,8 @@ case $BLOCK_BUTTON in 3) notify-send "🧠 Memory module" "\- Shows Memory Used/Total. - Click to show memory hogs. - Middle click to open htop." ;; - 6) "$TERMINAL" -e "$EDITOR" "$0" ;; + 6) "$TERMINAL" "$EDITOR" "$0" ;; esac free --mebi | sed -n '2{p;q}' | awk '{printf ("🧠%2.2fGiB/%2.2fGiB\n", ( $3 / 1024), ($2 / 1024))}' +' diff --git a/.local/bin/statusbar/sb-price b/.local/bin/statusbar/sb-price index 42c84c11..93be4383 100755 --- a/.local/bin/statusbar/sb-price +++ b/.local/bin/statusbar/sb-price @@ -3,6 +3,7 @@ # Usage: # price # price bat "Basic Attention Token" 🦁 + # When the name of the currency is multi-word, put it in quotes. [ -z "$3" ] && exit 1 @@ -26,7 +27,7 @@ updateprice() { temp="$(mktemp)" updateprice "$1" case $BLOCK_BUTTON in - 1) setsid "$TERMINAL" -e less -Srf "$chartfile" ;; + 1) setsid "kitty" -e less -Srf "$chartfile" ;; 2) notify-send -u low "$3 Updating..." "Updating $2 price..." updateprice "$1" && notify-send "$3 Update complete." "$2 price is now \$$(cat "$pricefile")" ;; @@ -48,3 +49,4 @@ case "$currency" in esac printf "$3$symb%0.2f$after" "$(cat "$pricefile")" +)" diff --git a/.local/share/bg b/.local/share/bg deleted file mode 120000 index b41641dc..00000000 --- a/.local/share/bg +++ /dev/null @@ -1 +0,0 @@ -thiemeyer_road_to_samarkand.jpg \ No newline at end of file diff --git a/.local/share/bg b/.local/share/bg new file mode 100644 index 00000000..c806d0d1 --- /dev/null +++ b/.local/share/bg @@ -0,0 +1 @@ +wallpaper.pngd_to_samarkand.jpg \ No newline at end of file diff --git a/.local/share/thiemeyer_road_to_samarkand.jpg b/.local/share/thiemeyer_road_to_samarkand.jpg deleted file mode 100644 index 6a30adb2..00000000 Binary files a/.local/share/thiemeyer_road_to_samarkand.jpg and /dev/null differ