diff --git a/.bashrc b/.bashrc index f06afed..34d9b95 100644 --- a/.bashrc +++ b/.bashrc @@ -30,6 +30,7 @@ colors() { echo; echo done } +title(){} [ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 19bcc71..4d49783 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -5,6 +5,7 @@ window: x: 5 y: 7 opacity: 1.0 + dynamic_title: true #font: colors: # Default colors diff --git a/.config/i3/config b/.config/i3/config index d6edce4..630db6d 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -17,9 +17,11 @@ set $red #F92672 set $blue #66D9EF set $green #A6E22E set $orange #FD971F -set $YELLOW #E6DB74 +set $yellow #E6DB74 set $purple #AE81FF +set $allblack #000000 + # power options set $shutdown shutdown -h now set $reboot reboot @@ -42,11 +44,11 @@ bar { #statusline #F9FAF9 #separator #454947 # border bg text - #focused_workspace '#66D9EF' '#66D9EF' '$black' + focused_workspace $allblack $blue $allblack #active_workspace #FFFFFF $black #FFFFFF #inactive_workspace #FFFFFF $black #FFFFFF #binding_mode #16a085 #2C2C2C #F9FAF9 - #urgent_workspace #F92672 $black #F92672 + urgent_workspace $red $black $red } } diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b2f98c2..f87a384 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,6 +4,9 @@ require("keybinds") vim.o.termguicolors = true vim.cmd('colorscheme monokai') -- set colorscheme vim.o.syntax = 'on' +vim.cmd('set title') +vim.opt.titlestring = [[%f %h%m%r%w ]] +-- vim.opt.titlestring = [[%f %h%m%r%w %{v:progname} (%{tabpagenr()} of %{tabpagenr('$')})]] vim.o.errorbells = false vim.o.smartcase = true vim.o.showmode = true diff --git a/.config/shell/alias.sh b/.config/shell/alias.sh new file mode 100644 index 0000000..25938e2 --- /dev/null +++ b/.config/shell/alias.sh @@ -0,0 +1,51 @@ + +alias ls='ls -hN --group-directories-first --color=auto' # make output more readable and show directories first +alias ll='ls -l' +alias la='ls --almost-all' +alias grep='grep --color=auto' # colorize grep output, set GREP_COLORS +alias cp="cp -i" # Confirm before overwriting something +alias df='df -h' # Human-readable sizes +alias free='free -m' +alias vi='nvim' # Show sizes in MB +alias r='R' + +# Add an "alert" alias for long running commands. Use like so: 'sleep 10; alert' +alias notify='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +#Add a "dotfiles" alias for .dotfile git repo +alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' +#alias 'dotfiles-update'='dotfiles commit -a && dotfiles push' + + +colors() { + local fgc bgc vals seq0 + + printf "Color escapes are %s\n" '\e[${value};...;${value}m' + printf "Values 30..37 are \e[33mforeground colors\e[m\n" + printf "Values 40..47 are \e[43mbackground colors\e[m\n" + printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" + + # foreground colors + for fgc in {30..37}; do + # background colors + for bgc in {40..47}; do + fgc=${fgc#37} # white + bgc=${bgc#40} # black + + vals="${fgc:+$fgc;}${bgc}" + vals=${vals%%;} + + seq0="${vals:+\e[${vals}m}" + printf " %-9s" "${seq0:-(default)}" + printf " ${seq0}TEXT\e[m" + printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" + done + echo; echo + done +} + +# set title in zsh (for alacritty) +title() +{ + echo -e "\e]2;$1\007"; +} diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index e286c70..c23a386 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -4,17 +4,18 @@ bind-key C-a last-window # double-press of CTRL + a (tmux prefix) switches to pr set-window-option -g mode-keys vi # vi mode set-option -g allow-rename off # dont rename windows on command execution TODO fix set -s escape-time 0 # dont delay escape key in vim -set -g base-index 1 # start windows numbering at 1 +set -g base-index 0 # start windows numbering at 0 +set-option -g set-titles on #COLORS set -g default-terminal "screen-256color" # use default terminal colors set-option -g pane-border-style fg=white -set-option -g pane-active-border-style fg=green +set-option -g pane-active-border-style fg=blue set-option -g message-style bg=green,fg=black #STATUSBAR set -g status-position bottom set -g status-left "" set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,}#{=21:pane_title}" -set -g status-style fg=black,bg=red # color for the statusbar -set-window-option -g window-status-current-style fg=green,bg=black # color for the current window (tab) +set -g status-style fg=white,bg=black # color for the statusbar +set-window-option -g window-status-current-style fg=black,bg=blue # color for the current window (tab) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 01b1cb6..65e1c7c 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -57,22 +57,7 @@ WORDCHARS=${WORDCHARS//\/[&.;]} # Don't con -#ALIAS SECTION - -alias ls='ls -hN --group-directories-first --color=auto' # make output more readable and show directories first -alias grep='grep --color=auto' # colorize grep output, set GREP_COLORS -alias cp="cp -i" # Confirm before overwriting something -alias df='df -h' # Human-readable sizes -alias free='free -m' -alias vi='nvim' # Show sizes in MB -alias ll='ls -l' -alias la='ls --almost-all' -alias r='R' -# Add an "alert" alias for long running commands. Use like so: 'sleep 10; alert' -alias notify='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' -#Add a "dotfiles" alias for .dotfile git repo -alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' -#alias 'dotfiles-update'='dotfiles commit -a && dotfiles push' +source $XDG_CONFIG_HOME/shell/alias.sh #KEYBINDINGS SECTION (use 'cat -v' or 'od -c' to see raw keyboard output) @@ -107,7 +92,7 @@ source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zs #ZSH_HIGHLIGHT_STYLES[builtin]=fg=white,bold #ZSH_HIGHLIGHT_STYLES[function]=fg=white,bold #ZSH_HIGHLIGHT_STYLES[command]=fg=white,bold - ZSH_HIGHLIGHT_STYLES[precommand]=fg=#eaff00,bold + #ZSH_HIGHLIGHT_STYLES[precommand]=fg=#eaff00,bold #ZSH_HIGHLIGHT_STYLES[commandseparator]=none #ZSH_HIGHLIGHT_STYLES[hashed-command]=fg=009 #ZSH_HIGHLIGHT_STYLES[path]=fg=214,underline diff --git a/.config/zsh/p10k.zsh b/.config/zsh/p10k.zsh index 51371e2..88054dd 100644 --- a/.config/zsh/p10k.zsh +++ b/.config/zsh/p10k.zsh @@ -60,12 +60,12 @@ 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 - # go_version # go version (https://golang.org) - # rust_version # rustc version (https://www.rust-lang.org) + go_version # go version (https://golang.org) + rust_version # rustc version (https://www.rust-lang.org) # 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/) + java_version # java version (https://www.java.com/) # package # name@version from package.json (https://docs.npmjs.com/files/package.json) rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) rvm # ruby version from rvm (https://rvm.io)