diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index 7c2946f..b8ffbc9 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -91,8 +91,8 @@ if has('autocmd') endif " color scheme -let base16colorspace=256 -let &t_Co=256 +let base16colorspace=16 +let &t_Co=16 set background=dark syntax enable colorscheme base16-donokai diff --git a/apps/shell/bash/aliases b/apps/shell/bash/aliases index a3cc4ff..1815d79 100644 --- a/apps/shell/bash/aliases +++ b/apps/shell/bash/aliases @@ -70,7 +70,6 @@ alias .........="cd ../../../../../../../.." # tmux aliases # TODO: see if this can be worked around? -alias tmux='TERM=screen-256color-bce tmux' # syntax higlighting for vim in tmux alias tmnew="tmux new -s" alias tmls="tmux list-sessions" alias tmatt="tmux attach -t" diff --git a/apps/shell/fish/aliases.fish b/apps/shell/fish/aliases.fish index 7f0812a..fe0ca40 100755 --- a/apps/shell/fish/aliases.fish +++ b/apps/shell/fish/aliases.fish @@ -76,7 +76,6 @@ alias ......... "cd ../../../../../../../.." # tmux aliases # TODO: see if this can be worked around? -alias tmux 'env TERM=screen-256color-bce tmux' # syntax higlighting for vim in tmux alias tmnew "tmux new -s" alias tmls "tmux list-sessions" alias tmatt "tmux attach -t" diff --git a/apps/shell/tmux/conf b/apps/shell/tmux/conf index 865fe65..d3de2ca 100644 --- a/apps/shell/tmux/conf +++ b/apps/shell/tmux/conf @@ -11,7 +11,7 @@ bind r source-file "$HOME/.tmux.conf" set -as terminal-overrides ',xterm*:smxx=\E[9m' # sane defaults -set -g default-terminal "tmux-256color" +set -g default-terminal "tmux" set -g mouse on # honestly not exactly sure? @@ -19,7 +19,7 @@ set -g mouse on set -g escape-time 0 # show window activity -# TODO: this needs to be properly setup +# TODO: this needs to be properly setup - presumably with tmux-session-list setw -g monitor-activity on setw -g visual-bell on setw -g bell-action other @@ -46,7 +46,8 @@ bind-key j switch-client -p bind-key h switch-client -p bind-key k switch-client -n bind-key l switch-client -n -bind s run-shell "tmux new-window tmuxswitcher" +# bind s run-shell "tmux new-window sh -c '$DOTFILES_PATH/bin/tmuxswitcher'" +bind s run-shell "tmux new-window 'sh -c ~/.config/dotfiles/bin/tmuxswitcher'" # reset the working directory of the current session bind-key P attach-session -t . -c '#{pane_current_path}' \; display-message 'Reset session dir to #{pane_current_path}' diff --git a/bin/n b/bin/n index 342cac6..a219661 100755 --- a/bin/n +++ b/bin/n @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh fn="${1}"; shift N "$(date +%Y-%m-%d)_${fn}" $* diff --git a/bin/nf b/bin/nf index 19a4200..04fe516 100755 --- a/bin/nf +++ b/bin/nf @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh SUBDIR="${2:-}" mkdir -p "$NOTES_PATH/$SUBDIR"