Fix a few things

* vim as git difftool
* don't use ale completion (we use deoplete)
* normal Iosevka font
* fix a var name collision
* rename home directory to `.home` to hide better
* fix warning with `c` function for going to $NICE_HOME
* improve fsw command
This commit is contained in:
Daniel Flanagan 2018-10-19 01:17:08 -05:00
parent 4496ecde5d
commit d33fa3f5dc
6 changed files with 12 additions and 6 deletions

View file

@ -16,3 +16,8 @@
prompt = false prompt = false
[alias] [alias]
d = difftool d = difftool
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false

View file

@ -66,7 +66,7 @@ let g:indent_guide_auto_colors = 1
let g:indent_guides_enable_on_vim_startup = 1 let g:indent_guides_enable_on_vim_startup = 1
Plug 'w0rp/ale' " syntax checker Plug 'w0rp/ale' " syntax checker
let g:ale_completion_enabled = 1 let g:ale_completion_enabled = 0
" let g:ale_sign_column_always = 0 " let g:ale_sign_column_always = 0
" let g:ale_set_signs = 0 " let g:ale_set_signs = 0
" highlight clear ALEErrorSign " highlight clear ALEErrorSign

View file

@ -2,16 +2,16 @@
# user's username # user's username
USERNAME=daniel USERNAME=daniel
GROUPS=admin,users,wheel USER_GROUPS="admin,users,wheel"
# add admin group # add admin group
groupadd admin 2>/dev/null groupadd admin 2>/dev/null
# create actual home directory # create actual home directory
mkdir -p "/home/$USERNAME/usr" mkdir -p "/home/$USERNAME/.home"
# add user with groups # add user with groups
useradd -m -d "/home/$USERNAME/usr" -G "$GROUPS" -s "/bin/bash" "$USERNAME" useradd -m -d "/home/$USERNAME/.home" -G "${USER_GROUPS}" -s "/bin/bash" "$USERNAME"
# give home directory ownership # give home directory ownership
chown -R "$USERNAME:$USERNAME" "/home/$USERNAME" chown -R "$USERNAME:$USERNAME" "/home/$USERNAME"

View file

@ -29,7 +29,7 @@ function c() {
if [[ -n $1 ]]; then if [[ -n $1 ]]; then
cd "${NICE_HOME}" || exit 1 cd "${NICE_HOME}" || exit 1
else else
cd "${NICE_HOME}" && cd "${[@]}" || exit 1 cd "${NICE_HOME}" && cd "${1}" || exit 1
fi fi
} }
alias cd..="cd .." alias cd..="cd .."

View file

@ -10,6 +10,7 @@ export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
export NICE_HOME="$HOME" export NICE_HOME="$HOME"
[[ $(basename "${HOME}") = "usr" ]] && export NICE_HOME="$HOME/.." [[ $(basename "${HOME}") = "usr" ]] && export NICE_HOME="$HOME/.."
[[ $(basename "${HOME}") = ".home" ]] && export NICE_HOME="$HOME/.."
# TODO: nice home on a per-device basis # TODO: nice home on a per-device basis

View file

@ -76,7 +76,7 @@ export -f gcwd
fsw() { fsw() {
SHELL_COMMAND="${1}" SHELL_COMMAND="${1}"
shift shift
inotifywait -q -m -e close_write "${@}" | while read -r _ _; do inotifywait -q -m -e close_write -r "${@}" | while read -r _ _; do
eval "${SHELL_COMMAND}" eval "${SHELL_COMMAND}"
done done
} }