diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/all/dircolors.conf | 93 | ||||
| -rw-r--r-- | config/all/git/config | 49 | ||||
| -rw-r--r-- | config/all/git/ignore | 11 | ||||
| -rw-r--r-- | config/all/zsh/.zprofile | 4 | ||||
| -rw-r--r-- | config/all/zsh/.zshrc | 4 | ||||
| -rw-r--r-- | config/all/zsh/20-appearance.zsh | 79 | ||||
| -rw-r--r-- | config/all/zsh/30-behavior.zsh | 54 | ||||
| -rw-r--r-- | config/all/zsh/40-key-bindings.zsh | 6 | ||||
| -rw-r--r-- | config/all/zsh/50-completion.zsh | 27 | ||||
| -rw-r--r-- | config/all/zsh/60-graphical-session.zsh | 8 | ||||
| -rw-r--r-- | config/all/zsh/99-function-overrides.zsh | 8 |
11 files changed, 0 insertions, 343 deletions
diff --git a/config/all/dircolors.conf b/config/all/dircolors.conf deleted file mode 100644 index f6decec..0000000 --- a/config/all/dircolors.conf +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 1996, 1999-2010 Free Software Foundation, Inc. -# Copying and distribution of this file, with or without modification, -# are permitted provided the copyright notice and this notice are preserved. - -# -# Colorizable terminals - -TERM Eterm -TERM ansi -TERM color-xterm -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM eterm-color -TERM foot-extra -TERM gnome -TERM gnome-256color -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mlterm -TERM putty -TERM rxvt -TERM rxvt-256color -TERM rxvt-cygwin -TERM rxvt-cygwin-native -TERM rxvt-unicode -TERM rxvt-unicode-256color -TERM rxvt-unicode256 -TERM screen -TERM screen-256color -TERM screen-256color-bce -TERM screen-bce -TERM screen-w -TERM screen.rxvt -TERM screen.linux -TERM terminator -TERM vt100 -TERM xterm -TERM xterm-16color -TERM xterm-256color -TERM xterm-88color -TERM xterm-color -TERM xterm-debian -TERM foot - -# -# Generic types - -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# -# Text color codes: -# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white -# -# Background color codes: -# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white - -RESET 0 # reset to "normal" color -DIR 34 # directory -LINK 36 # symbolic link -FIFO 47;33 # pipe -SOCK 35 # socket -DOOR 35 # door -BLK 47;33 # block device driver -CHR 47;33 # character device driver -ORPHAN 47;31 # symlink to nonexistent file, or non-stat'able file -SETUID 37;41 # file that is setuid (u+s) -SETGID 37;43 # file that is setgid (g+s) -CAPABILITY 30;41 # file with capability -STICKY_OTHER_WRITABLE 37;42 # dir that is sticky and other-writable (+t,o+w) -OTHER_WRITABLE 37;42 # dir that is other-writable (o+w) and not sticky -STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable -EXEC 32 # executable files - -# -# Extension-based - -#.tar.gz 01;31 diff --git a/config/all/git/config b/config/all/git/config deleted file mode 100644 index 71bf668..0000000 --- a/config/all/git/config +++ /dev/null @@ -1,49 +0,0 @@ -[user] - name = Matt Singleton - email = matt@xcolour.net - -[alias] - st = status - ci = commit - br = branch - co = checkout - df = diff - lg = log -p - -[core] - whitespace = trailing-space,space-before-tab,cr-at-eol - editor = vim - autocrlf = input - excludesfile = ~/.config/git/ignore - pager = less -+$LESS -RSX - -[push] - default = nothing - -[color] - ui = true - -[mergetool] - keepTemporaries = false - prompt = false - -[mergetool "vimdiff"] - layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE" - -[merge] - tool = vimdiff - conflictstyle = zdiff3 - -[diff] - tool = vimdiff - colorMoved = default - algorithm = histogram - -[init] - defaultBranch = main - -[pull] - ff = only - -[include] - path = config-local diff --git a/config/all/git/ignore b/config/all/git/ignore deleted file mode 100644 index 57dd8e6..0000000 --- a/config/all/git/ignore +++ /dev/null @@ -1,11 +0,0 @@ -*.class -*.pyc -*.swo -*.swp -.svn -.swo -*#* -# -.#* -doc/tags -.DS_STORE diff --git a/config/all/zsh/.zprofile b/config/all/zsh/.zprofile deleted file mode 100644 index 68b0ec4..0000000 --- a/config/all/zsh/.zprofile +++ /dev/null @@ -1,4 +0,0 @@ -if [ "$(uname)" = "Darwin" ]; then - # disable Apple Terminal's annoying session restore feature - SHELL_SESSIONS_DISABLE=1 -fi diff --git a/config/all/zsh/.zshrc b/config/all/zsh/.zshrc deleted file mode 100644 index f33ca44..0000000 --- a/config/all/zsh/.zshrc +++ /dev/null @@ -1,4 +0,0 @@ -for f in $ZDOTDIR/*.zsh -do - source "${f}" -done diff --git a/config/all/zsh/20-appearance.zsh b/config/all/zsh/20-appearance.zsh deleted file mode 100644 index fa3c3cc..0000000 --- a/config/all/zsh/20-appearance.zsh +++ /dev/null @@ -1,79 +0,0 @@ -# -# colorize shell programs - -if ls -Z . &>/dev/null 2>&1; then - # gnu coreutils? - alias ls='ls --color=auto' - eval `dircolors ${XDG_CONFIG_HOME:-${HOME}/.config}/dircolors.conf` -elif (( $+commands[gls] )); then - # prefixed gnu coreutils? - alias ls='gls --color=auto' - eval `gdircolors ${XDG_CONFIG_HOME:-${HOME}/.config}/dircolors.conf` -else - # assume bsd ls - alias ls='ls -G' - export LSCOLORS="exgxbxdxcxegedxbxgxcxd" -fi - -# grep -alias grep='grep --color=auto' -alias egrep='egrep --color=auto' -alias fgrep='fgrep --color=auto' - -# less -export LESS_TERMCAP_mb=$'\e[1;31m' # begin blinking - bold red -export LESS_TERMCAP_md=$'\e[1;36m' # begin bold - bold cyan -export LESS_TERMCAP_me=$'\e[0m' # end mode -export LESS_TERMCAP_so=$'\e[33;47m' # begin standout mode - yellow on light gray ("white") -export LESS_TERMCAP_se=$'\e[0m' # end standout mode -export LESS_TERMCAP_us=$'\e[4;35m' # begin underline - magenta underline -export LESS_TERMCAP_ue=$'\e[0m' # end underline -export MANROFFOPT="-c" - -# -# make a sweet prompt - -autoload colors; colors; -setopt prompt_subst # expansion of color codes, etc. in the prompt - -# print the fully resolved shell command with time stamp -# to be run from zsh's builtin 'preexec' with all arguments passed through ($*) -function theme_preexec () { - echo "($fg[magenta]`date +%r`$reset_color) $fg[cyan]$3$reset_color" -} - -# print the prompt char in red if the last command exited non-zero -function prompt_char { - echo "%(?.$.%{$fg[red]%}$%{$reset_color%})" -} - -function repo_prompt_info { - # git - ref=$(git symbolic-ref HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null) - if [ $? -eq 0 ]; then - #repo=$(basename $(git rev-parse --show-toplevel)) - echo "%{$fg[cyan]%}${ref#refs/heads/}%{$reset_color%}" - return - fi -} - -function workspace_prompt_info { - repo=$(repo_prompt_info) - if [ "$repo" ]; then - echo "[$repo] " - return - fi -} - -# print the hostname in green if local, else red -function hostname_info { - if [[ $ZSH_LOCAL_ENV == "true" ]]; then - echo "%{$fg[green]%}%{$ZSH_HOST_PREFIX%}%m%{$ZSH_HOST_SUFFIX%}%{$reset_color%}" - else - echo "%{$fg[red]%}%{$ZSH_HOST_PREFIX%}%m%{$ZSH_HOST_SUFFIX%}%{$reset_color%}" - fi -} - -# a colorful multiline prompt using the above defined functions -PROMPT=$'%{$fg[yellow]%}%n%{$reset_color%}@$(hostname_info):%{$fg[blue]%}%~%{$reset_color%} -$(workspace_prompt_info)$(prompt_char)%{$reset_color%} ' diff --git a/config/all/zsh/30-behavior.zsh b/config/all/zsh/30-behavior.zsh deleted file mode 100644 index 6b2b2c2..0000000 --- a/config/all/zsh/30-behavior.zsh +++ /dev/null @@ -1,54 +0,0 @@ -# -# execution - -setopt rm_star_wait # wait 10 seconds before accepting 'rm *' confirmation -export REPORTTIME=5 # report timing for any command longer than 5 seconds -unsetopt flowcontrol # disable ^s from freezing the terminal - -# -# history - -HISTFILE="${XDG_DATA_HOME:-${HOME}/.local/share}/zsh/history" -HISTSIZE=10000 -SAVEHIST=10000 - -setopt hist_ignore_all_dups # ignore dups including non-sequential ones -setopt share_history # share command history data between sessions -setopt hist_verify # load hist into command buffer rather than exec immediately - -# -# term support - -# make sure $TERM is installed -# if not, fall back on xterm-256color -infocmp "$TERM" > /dev/null 2>&1 || export TERM=xterm-256color - -# set term title appropriately based on term type -# user@host:current_dir (current_command) -case "$TERM" in - xterm*|rxvt*|screen*|alacritty*|foot) - term_preexec () { - printf '\e]0;%s (%s)\a' ${(%):-'%n@%m:%~'} "$1" - } - term_precmd () { - printf '\e]0;%s\a' ${(%):-'%n@%m:%~'} - } - ;; -esac - -# -# draw a horizontal separator - -function hr { - printf "$bg[red]${(l:$COLUMNS:: :)}$reset_color\n" - printf "$bg[yellow]${(l:$COLUMNS:: :)}\n" - printf "$bg[green]${(l:$COLUMNS:: :)}\n" - printf "$bg[cyan]${(l:$COLUMNS:: :)}\n" - printf "$bg[blue]${(l:$COLUMNS:: :)}\n" - printf "$bg[magenta]${(l:$COLUMNS:: :)}$reset_color\n" -} - -# -# less - -export LESS=-i diff --git a/config/all/zsh/40-key-bindings.zsh b/config/all/zsh/40-key-bindings.zsh deleted file mode 100644 index 4deac62..0000000 --- a/config/all/zsh/40-key-bindings.zsh +++ /dev/null @@ -1,6 +0,0 @@ -bindkey -e # use emacs mode -bindkey '^r' history-incremental-search-backward # ctrl-r -bindkey '^[[Z' reverse-menu-complete # shift-tab - -bindkey '\e[3~' delete-char # make sure delete key works -bindkey ' ' magic-space # also do history expansion on space diff --git a/config/all/zsh/50-completion.zsh b/config/all/zsh/50-completion.zsh deleted file mode 100644 index 23cb052..0000000 --- a/config/all/zsh/50-completion.zsh +++ /dev/null @@ -1,27 +0,0 @@ -# initialize the completion system -autoload -U compinit -compinit -d "${XDG_CACHE_HOME:-${HOME}/.cache}/zsh/zcompdump" -zmodload zsh/complist - -# complete only after the second consecutive tab -setopt auto_menu - -# use GNU ls color specification for completion menu -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} - -# use menu selection by default -zstyle ':completion:*:default' menu select - -# disable named-directories autocompletion -zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories -cdpath=(.) - -# don't autocomplete local users for (ssh|ftp|scp|rsync) -zstyle ':completion:*:*:(ssh|ftp|scp|rsync):*' users - -# Use caching so that commands like apt and dpkg complete are useable -zstyle ':completion::complete:*' use-cache 1 -zstyle ':completion:*' cache-path "${XDG_CACHE_HOME:-${HOME}/.cache}/zsh/zcompcache" - -# always rehash commands list -zstyle ':completion:*:commands' rehash 1 diff --git a/config/all/zsh/60-graphical-session.zsh b/config/all/zsh/60-graphical-session.zsh deleted file mode 100644 index 3d4b53a..0000000 --- a/config/all/zsh/60-graphical-session.zsh +++ /dev/null @@ -1,8 +0,0 @@ -if [ -n "$XDG_SESSION_DESKTOP" ] && command -v gnome-keyring-daemon > /dev/null; then - # load the keyring daemon into the environment if: - # - we're in a graphical session - # - the daemon is installed - # starts the daemon if it hasn't been started already, - # otherwise just exports the auth socket of the existing daemon - export $(gnome-keyring-daemon --start 2> /dev/null) -fi diff --git a/config/all/zsh/99-function-overrides.zsh b/config/all/zsh/99-function-overrides.zsh deleted file mode 100644 index 8b233e5..0000000 --- a/config/all/zsh/99-function-overrides.zsh +++ /dev/null @@ -1,8 +0,0 @@ -preexec () { - type term_preexec &> /dev/null && term_preexec $* - type theme_preexec &> /dev/null && theme_preexec $* -} - -precmd () { - type term_precmd &> /dev/null && term_precmd -} |