diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | bash/.bash_aliases | 15 | ||||
| -rw-r--r-- | bash/.bash_profile | 5 | ||||
| -rw-r--r-- | bash/.bashrc | 149 | ||||
| -rw-r--r-- | install.sh | 5 | ||||
| -rw-r--r-- | kitty/greyscale.conf | 48 | ||||
| -rw-r--r-- | kitty/kitty.conf | 5 | ||||
| -rw-r--r-- | konsole/Default.profile | 2 | ||||
| -rw-r--r-- | nvim/nvim/ftplugin/scheme.vim | 4 | ||||
| -rw-r--r-- | nvim/nvim/init.vim | 11 | ||||
| -rwxr-xr-x | plasma-env/guix.sh | 15 |
11 files changed, 117 insertions, 143 deletions
@@ -1,5 +1,4 @@ # Configuration files -My dotfiles. Vim, NeoVim, Git, Tmux and Bash for now. Use `install.sh` to install the dotfiles. It uses `stow` internally. diff --git a/bash/.bash_aliases b/bash/.bash_aliases index e9dcea3..55b8292 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -9,13 +9,10 @@ alias r='ssh -l root' alias fuck='COMMAND=$(history -p \!\!); echo sudo $COMMAND; sudo $COMMAND' # enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias fgrep='fgrep --color=auto' +alias egrep='egrep --color=auto' # some more ls aliases alias ll='ls -alF' @@ -41,3 +38,7 @@ alias pandoc-xelatex="pandoc $@ --pdf-engine=xelatex --to latex -N" alias elenqdoc-article="pandoc-xelatex $@ --standalone --template elenq-article --metadata=documentclass:article" alias elenqdoc-book="pandoc-xelatex $@ --standalone --template elenq-book --metadata=documentclass:book --top-level-division=chapter" +# Kitty +if [ $TERM = "xterm-kitty" ]; then + alias ssh="kitty +kitten ssh" +fi diff --git a/bash/.bash_profile b/bash/.bash_profile index fe92a75..7d5f3c9 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,8 +1,3 @@ -# Create .config if it doesn't exist and set XDG vars if they are unset -mkdir -p $HOME/.config -export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:=$HOME/.config} -export XDG_DATA_HOME=${XDG_DATA_HOME:=$HOME/.config} - # Load bashrc to mantain only one file if [ -f "$HOME/.bashrc" ]; then source "$HOME/.bashrc" diff --git a/bash/.bashrc b/bash/.bashrc index defe7ff..df74698 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,89 +1,20 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples +# Bash initialization for interactive non-login shells and +# for remote shells (info "(bash) Bash Startup Files"). -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac +export SHELL -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi +if [[ $- != *i* ]] +then + # We are being invoked from a non-interactive shell. If this + # is an SSH session (as in "ssh host command"), source + # /etc/profile so we get PATH and other essential variables. + [[ -n "$SSH_CLIENT" ]] && source /etc/profile -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + # Don't do anything else. + return fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac -# colored GCC warnings and errors -export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' - - -# enable programmable completion features -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi +source /etc/bashrc # VARIABLE EXPORTS ###################################################################### @@ -99,19 +30,30 @@ export COLOR_DEFAULT="\[\033[0;39m\]" export COLOR_WHITE=$COLOR_DEFAULT export EDITOR=nvim +PATH=$PATH:$HOME/.local/bin + +# PROMPT +PS1BASE="$COLOR_BLUE\u$COLOR_GREY@\h $COLOR_YELLOW\w\[\033[00m\]" -# Guile (guix) -export GUILE_LOAD_PATH="$HOME/.guix-profile/share/guile/site/2.2${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" -export GUILE_LOAD_COMPILED_PATH="$HOME/.guix-profile/lib/guile/2.2/site-ccache${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" +#PS1BASE="$COLOR_CYAN\u $COLOR_YELLOW\w\[\033[m\]" +PS1GIT="$COLOR_BLUE\$(__git_ps1)$COLOR_DEFAULT" +PS1END="$COLOR_DEFAULT\$ " +export PS1="${PS1BASE}${PS1GIT}${PS1END}" -export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" -export PATH="$HOME/.guix-profile/bin${PATH:+:}$PATH" -export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" # Locale directory +# GUIX +###################################################################### +# Adjust the prompt depending on whether we're in 'guix environment'. +if [ -n "$GUIX_ENVIRONMENT" ] +then + PS1="$PS1BASE$PS1GIT [env]$PS1END" +fi ###################################################################### # Pandoc bash completion -eval "$(pandoc --bash-completion)" +if hash pandoc 2>/dev/null; then + eval "$(pandoc --bash-completion)" +fi # Load in the git branch prompt script. source ~/.git-prompt.sh @@ -121,34 +63,3 @@ if [ -f ~/.bash_aliases ] ; then . ~/.bash_aliases fi -# PROMPT -PS1BASE="\[\e]0;\u: \w\a\]${debian_chroot:+($debian_chroot)}$COLOR_BLUE\u\[\033[00m\] $COLOR_YELLOW\w\[\033[00m\]" - -#PS1BASE="$COLOR_CYAN\u $COLOR_YELLOW\w\[\033[m\]" -PS1GIT="$COLOR_BLUE\$(__git_ps1)$COLOR_DEFAULT" -PS1END="$COLOR_DEFAULT\$ " -export PS1="${PS1BASE}${PS1GIT}${PS1END}" - -# Guix -if [ -n "$GUIX_ENVIRONMENT" ] # Change prompt if shell is in an environment -then - PS1GUIXENV="$COLOR_RED(guixenv)$COLOR_DEFAULT" - PS1="${PS1BASE}${PS1GIT}${PS1GUIXENV}${PS1END}" -fi -export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs" -export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt" - -# Python virtualenvwrapper -export WORKON_HOME=~/Envs -mkdir -p $WORKON_HOME -source /usr/local/bin/virtualenvwrapper.sh - -# Microchip -export PATH="$PATH:/opt/microchip/xc8/v1.44/bin" - -# Rust -export PATH="$HOME/.cargo/bin:$PATH" - -# Direnv -eval "$(direnv hook bash)" - @@ -7,7 +7,10 @@ stow -Rt ~ bash tmux git stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} nvim # konsole colors -stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/konsole" konsole +# stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/konsole" konsole # kitty stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/kitty" kitty + +# Plasma session environment variables +#stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/plasma-workspace/env" plasma-env diff --git a/kitty/greyscale.conf b/kitty/greyscale.conf new file mode 100644 index 0000000..02cc41a --- /dev/null +++ b/kitty/greyscale.conf @@ -0,0 +1,48 @@ +foreground #FFFFFF +background #000000 +selection_foreground #FFFFFF +selection_background #EEEEEE + +url_color #ffb86c + +# black +color0 #000000 +color8 #000000 + +# red +color1 #444444 +color9 #555555 + +# green +color2 #888888 +color10 #999999 + +# yellow +color3 #333333 +color11 #DDDDDD + +# blue +color4 #222222 +color12 #333333 + +# magenta +color5 #666666 +color13 #777777 + +# cyan +color6 #AAAAAA +color14 #BBBBBB + +# white +color7 #EEEEEE +color15 #FFFFFF + +# Cursor colors +cursor color15 +cursor_text_color background + +# Tab bar colors +active_tab_foreground #44475a +active_tab_background #f8f8f2 +inactive_tab_foreground #282a36 +inactive_tab_background #6272a4 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 7af85c7..fb5b78f 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1190,3 +1190,8 @@ include dracula.conf map alt+3 disable_ligatures_in tab cursor map ctrl+shift+plus change_font_size all +2.0 map ctrl+shift+minus change_font_size all -2.0 + + + +# extras +map ctrl+shift+t launch --cwd=current --type=tab diff --git a/konsole/Default.profile b/konsole/Default.profile index 5881bf0..33010ec 100644 --- a/konsole/Default.profile +++ b/konsole/Default.profile @@ -1,7 +1,7 @@ [Appearance] BoldIntense=true ColorScheme=Dracula-Linux -Font=B612 Mono,11,-1,5,50,0,0,0,0,0,Regular +Font=B612 Mono,12,-1,5,50,0,0,0,0,0,Regular LineSpacing=1 UseFontLineChararacters=false diff --git a/nvim/nvim/ftplugin/scheme.vim b/nvim/nvim/ftplugin/scheme.vim index ebf87d8..42a2dee 100644 --- a/nvim/nvim/ftplugin/scheme.vim +++ b/nvim/nvim/ftplugin/scheme.vim @@ -1,3 +1,7 @@ +" Use λ easier +inoremap <c-l> λ +syn keyword schemeSyntax λ + setlocal tabstop=2 softtabstop=0 expandtab shiftwidth=2 setlocal autoindent diff --git a/nvim/nvim/init.vim b/nvim/nvim/init.vim index 3f773c8..1f558e4 100644 --- a/nvim/nvim/init.vim +++ b/nvim/nvim/init.vim @@ -2,8 +2,8 @@ """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" set nocompatible filetype off -set rtp+=$XDG_CONFIG_HOME/nvim/bundle/Vundle.vim -call vundle#begin($XDG_CONFIG_HOME . '/nvim/bundle/') +set rtp+=$HOME/.config/nvim/bundle/Vundle.vim +call vundle#begin($HOME . '/.config/nvim/bundle/') " let Vundle manage Vundle, required Plugin 'VundleVim/Vundle.vim' @@ -136,13 +136,6 @@ set ignorecase set smartcase -" SPELLING - -" Highlight spelling errors in red and underline -hi clear SpellBad -hi SpellBad cterm=underline ctermfg=Red guifg=Red gui=underline - - " TEXT WIDTH " Textwidth for automatic wrap, `gq` is formatting operation diff --git a/plasma-env/guix.sh b/plasma-env/guix.sh new file mode 100755 index 0000000..94efdec --- /dev/null +++ b/plasma-env/guix.sh @@ -0,0 +1,15 @@ +#!/bin/bash +export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" + +GUIX_PROFILE=${GUIX_ENVIRONMENT:="$HOME/.guix-profile"} +. $GUIX_PROFILE/etc/profile + +# Make Desktop Environment find guix apps: +export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" + +export LIBRARY_PATH="$GUIX_PROFILE/lib${LIBRARY_PATH:+:}$LIBRARY_PATH" +export CPATH="$GUIX_PROFILE/include${CPATH:+:}$CPATH" +export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" # Locale directory + +export SSL_CERT_DIR="$GUIX_PROFILE/etc/ssl/certs" +export SSL_CERT_FILE="$GUIX_PROFILE/etc/ssl/certs/ca-certificates.crt" |