Skip to content

Commit cec5ce6

Browse files
authored
Add nvim and xmonad configs (#75)
* Add nvim and xmonad configs * Add Mason and telescope * Update Dockerfile and add dockerfile-language-server to lsp-config * Re-arrange files to be linked in .config * Simplify stow execution * Make dockerfile run the installer to start in an already customized session * Add config for mpd * Add xdj-ninja in to docker image and make sure dotfiles are xdg compliant * Restore vim for non nvim systems, and make it xdg compliant * Add xmonad desktop entry, dunst config and update lua config paths * Make nvim not break if plugins are missing, and make installer automatically sync plugins * Xmonad README * Update vimrc and replace language specific plugins with polyglot and set qt env vars * Add nvim README * Remove backup script (stow will tell you what you need to backup), update README for project and sort out EDITOR, GIT_EDITOR and VISUAL
1 parent 35c57ec commit cec5ce6

73 files changed

Lines changed: 1614 additions & 548 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bash_profile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Create this file to load extras before
2+
if [ -f $HOME/.config/bash/before ]; then
3+
. $HOME/.config/bash/before
4+
fi
5+
6+
# Update $PATH
7+
if [ -f $HOME/.config/bash/paths ]; then
8+
. $HOME/.config/bash/paths
9+
fi
10+
11+
# Update PS1 and PROMPT_COMMAND
12+
if [ -f $HOME/.config/bash/prompt ]; then
13+
. $HOME/.config/bash/prompt
14+
fi
15+
16+
# Load command aliases
17+
if [ -f $HOME/.config/bash/aliases ]; then
18+
. $HOME/.config/bash/aliases
19+
fi
20+
21+
shopt -s histappend
22+
23+
# enable programmable completion features (you don't need to enable
24+
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
25+
# sources /etc/bash.bashrc).
26+
if ! shopt -oq posix; then
27+
if [ -f /usr/share/bash-completion/bash_completion ]; then
28+
. /usr/share/bash-completion/bash_completion
29+
elif [ -f /etc/bash_completion ]; then
30+
. /etc/bash_completion
31+
fi
32+
fi
33+
34+
# Setup development environment
35+
if [ -f $HOME/.config/bash/environments ]; then
36+
. $HOME/.config/bash/environments
37+
fi
38+
39+
# Create this file to load extras after
40+
if [ -f $HOME/.config/bash/after ]; then
41+
. $HOME/.config/bash/after
42+
fi
43+
44+
# vim: set filetype=sh:
File renamed without changes.

.config/X11/xinitrc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## Note: This path is picked up by xinitrc but not startx if you need startx
2+
# copy or link this file to $HOME as .xinitrc
3+
4+
xrdb -load "$XDG_CONFIG_HOME/X11/xresources" # perhaps this should be in Xsession?
5+
6+
xset s off
7+
xset -dpms
8+
xset s noblank
9+
10+
xset r rate 200 20
11+
12+
setxkbmap us
13+
setxkbmap -option ctrl:nocaps
14+
15+
### Select a window manager
16+
17+
### i3 execs
18+
# exec dbus-launch dwm
19+
# exec --no-startup-id xss-lock -- ~/.config/i3/lock.sh
20+
21+
### xmonad
22+
exec xmonad
23+
24+
# vim: set ft=sh :
File renamed without changes.
File renamed without changes.
File renamed without changes.

bash/.bash/after renamed to .config/bash/after

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Setup FZF
2-
if [ -f /usr/share/doc/fzf/examples/key-bindings.bash ]; then
2+
if [[ -f /usr/share/doc/fzf/examples/key-bindings.bash ]]; then
33
source /usr/share/doc/fzf/examples/key-bindings.bash
44
fi
55

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
DIRCOLORS_PATH=`which dircolors`
22
EXA_PATH=`which exa`
3+
NVIM_PATH=`which nvim`
34

45
# Create color aliases
56
if [[ -x $DIRCOLORS_PATH ]]; then
67
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
7-
alias ls='ls --color=auto'
88
alias grep='grep --color=auto'
99
alias fgrep='fgrep --color=auto'
1010
alias egrep='egrep --color=auto'
1111
fi
1212

1313
if [[ -x $EXA_PATH ]]; then
1414
alias ls="exa --git-ignore --icons -h"
15+
else
16+
alias ls='ls --color=auto'
1517
fi
1618

1719
alias ll='ls -alFh'
@@ -23,6 +25,12 @@ alias pip=pip3
2325
alias tmux="tmux -2"
2426
alias xclip="xclip -se clipboard"
2527

28+
if [[ -x $NVIM_PATH ]]; then
29+
alias vim=nvim
30+
else
31+
alias vim='vim -u ${XDG_CONFIG_HOME:-$HOME/.config}/vim/vimrc'
32+
fi
33+
2634
# What services are listening for connections
2735
alias listening="lsof -Pan -iTCP -sTCP:listen"
2836

.config/bash/environments

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
FNM_PATH=`which fnm`
2+
NIX_PROFILE=$HOME/.nix-profile/etc/profile.d/nix.sh
3+
NVIM_PATH=`which nvim`
4+
PYENV_PATH=`which pyenv`
5+
QT5CT_PATH=`which qt5ct`
6+
7+
if [[ -x $FNM_PATH ]]; then
8+
eval "`fnm env`"
9+
fi
10+
11+
if [[ -x $PYENV_PATH ]]; then
12+
eval "$(pyenv init -)"
13+
eval "$(pyenv virtualenv-init -)"
14+
fi
15+
16+
if [[ -f $NIX_PROFILE ]]; then
17+
source $NIX_PROFILE
18+
fi
19+
20+
if [[ -x QT5CT_PATH ]]; then
21+
export QT_QPA_PLATFORMTHEME=qt5ct
22+
else
23+
export QT_STYLE_OVERRIDE=gtk2
24+
fi
25+
26+
export PYTHONIOENCODING=UTF-8
27+
28+
VIM=vim
29+
30+
if [[ -x $NVIM_PATH ]]; then
31+
VIM=nvim
32+
fi
33+
34+
# Set editor
35+
export EDITOR=$VIM
36+
export VISUAL=$VIM
37+
export GIT_EDITOR="$VIM -f"
38+
39+
# Set history
40+
export HISTCONTROL=erasedups
41+
export HISTSIZE=10000
42+
export HISTTIMEFORMAT="%D %T "
43+
export HISTIGNORE="&:ls:exit"
44+
45+
# Set pager settings
46+
export LESS="-R -iMSx2 -FX"
47+
48+
# XDG
49+
export XDG_DATA_HOME="$HOME/.local/share"
50+
export XDG_CONFIG_HOME="$HOME/.config"
51+
export XDG_STATE_HOME="$HOME/.local/state"
52+
export XDG_CACHE_HOME="$HOME/.cache"
53+
export XDG_RUNTIME_DIR="/run/user/$UID"
54+
55+
export ACKRC="$XDG_CONFIG_HOME/ack/ackrc"
56+
export PSQLRC="$XDG_CONFIG_HOME/pg/psqlrc"
57+
export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
58+
59+
# vim: set ft=sh:

0 commit comments

Comments
 (0)