diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 832ee02..affa611 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -7,8 +7,9 @@ window: y: 8 font: - family: "MesloLGS NF" size: 12 + normal: + family: "MesloLGS NF" key_bindings: - { key: N, mods: Control|Shift, action: SpawnNewInstance } diff --git a/.config/bpytop/bpytop.conf b/.config/bpytop/bpytop.conf index dba38ef..fabc9e0 100644 --- a/.config/bpytop/bpytop.conf +++ b/.config/bpytop/bpytop.conf @@ -40,7 +40,7 @@ proc_colors=True proc_gradient=True #* If process cpu usage should be of the core it's running on or usage of the total available cpu power. -proc_per_core=False +proc_per_core=True #* Show process memory as bytes instead of percent proc_mem_bytes=True diff --git a/.config/rofi/launchers/text/powermenu b/.config/rofi/launchers/text/powermenu index ce5f7d3..c14cd8a 100755 --- a/.config/rofi/launchers/text/powermenu +++ b/.config/rofi/launchers/text/powermenu @@ -13,7 +13,7 @@ set -e set -u # All supported choices -all=(shutdown reboot suspend hibernate logout lockscreen reboot-windows reboot-uefi) +all=(shutdown reboot suspend hibernate lockscreen logout reboot-windows reboot-uefi) # By default, show all (i.e., just copy the array) show=("${all[@]}") @@ -42,7 +42,7 @@ icons[shutdown]="\uf011" icons[cancel]="\u00d7" declare -A actions -actions[lockscreen]="dm-tool lock" +actions[lockscreen]="dm-tool switch-to-greeter" actions[logout]="pkill awesome" actions[suspend]="systemctl suspend" actions[hibernate]="systemctl hibernate" diff --git a/.config/zsh/.p10k.zsh b/.config/zsh/.p10k.zsh index 2b0eff8..2ed5d05 100644 --- a/.config/zsh/.p10k.zsh +++ b/.config/zsh/.p10k.zsh @@ -55,13 +55,13 @@ anaconda # conda environment (https://conda.io/) pyenv # python environment (https://github.com/pyenv/pyenv) goenv # go environment (https://github.com/syndbg/goenv) - nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) + # nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) - nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) - node_version # node.js version + # nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) + # node_version # node.js version go_version # go version (https://golang.org) rust_version # rustc version (https://www.rust-lang.org) - dotnet_version # .NET version (https://dotnet.microsoft.com) + dotnet_version # .NET version (https://dotnet.microsoft.com) php_version # php version (https://www.php.net/) laravel_version # laravel php framework version (https://laravel.com/) java_version # java version (https://www.java.com/) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 21c2dec..cc598a2 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,76 +1,17 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -# Path to your oh-my-zsh installation. export ZSH="$HOME/.config/zsh/.oh-my-zsh" - -# 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="powerlevel10k/powerlevel10k" -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. HYPHEN_INSENSITIVE="true" -# Enable Autocorrect setopt correct -# 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 +zstyle ':omz:update' mode reminder +zstyle ':omz:update' frequency 14 -# Uncomment the following line to change how often to auto-update (in days). -zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# 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" - -# 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" - -# 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=( colored-man-pages colorize @@ -86,14 +27,16 @@ plugins=( z docker git + npm + nvm python archlinux battery ) source $ZSH/oh-my-zsh.sh +source /usr/share/nvm/init-nvm.sh -# User configuration HISTFILE=$HOME/.config/zsh/.histfile HISTSIZE=10000 @@ -101,7 +44,6 @@ HISTSIZE=10000 # export LANG=en_US.UTF-8 # export ARCHFLAGS="-arch x86_64" -# For a full list of active aliases, run `alias`. alias la='ls -la --human-readable' alias neo='neofetch' alias fetch='neofetch' @@ -110,5 +52,4 @@ alias ssh='TERM=xterm-256color ssh' alias proton-call-ge='proton-call -c /usr/share/steam/compatibilitytools.d/proton-ge-custom -r' alias sync-timezone='timedatectl set-timezone "$(curl --fail https://ipapi.co/timezone)" && timedatectl' -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv index 630a858..ef83ea3 100644 --- a/etc/zsh/zshenv +++ b/etc/zsh/zshenv @@ -1,11 +1,13 @@ -export PATH=$HOME/.local/bin:/usr/local/bin:$PATH:/home/nick/.spicetify export EDITOR=nano +export PATH=$HOME/.local/bin:/usr/local/bin:$PATH:/home/nick/.spicetify:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools + export XDG_DATA_HOME=$HOME/.local/share export XDG_CONFIG_HOME=$HOME/.config export XDG_STATE_HOME=$HOME/.local/state export XDG_CACHE_HOME=$HOME/.cache +export ANDROID_HOME="/home/nick/.android/sdk" export ZDOTDIR=$HOME/.config/zsh export CARGO_HOME="$XDG_DATA_HOME"/cargo export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv @@ -15,7 +17,8 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export IPYTHONDIR="$XDG_CONFIG_HOME"/ipython export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export _Z_DATA="$XDG_DATA_HOME/z" +export NVM_DIR="$XDG_DATA_HOME/nvm" alias nvidia-settings='nvidia-settings --config="$XDG_CONFIG_HOME"/nvidia/settings' alias wget='wget --hsts-file="$XDG_DATA_HOME/wget-hsts"' -alias yarn='yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config' \ No newline at end of file +alias yarn='yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config'