aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--home-manager/config/fish/config.fish12
-rw-r--r--home-manager/config/tmux/tmux.conf2
-rw-r--r--home-manager/home.nix2
3 files changed, 8 insertions, 8 deletions
diff --git a/home-manager/config/fish/config.fish b/home-manager/config/fish/config.fish
index 4330a58..0d605ed 100644
--- a/home-manager/config/fish/config.fish
+++ b/home-manager/config/fish/config.fish
@@ -22,10 +22,10 @@ alias grep 'rg'
alias mkdir 'mkdir -p'
alias mv 'mv -i'
alias rm 'rm -i'
-alias ssh 'TERM=xterm-256color ssh'
+alias ssh 'TERM=xterm-256color command ssh'
alias tree 'tree -N --gitignore'
alias view 'nvim -R'
-alias vim nvim
+alias vim 'nvim'
alias vimdiff 'nvim -d'
if [ -n $on_darwin ]
@@ -93,17 +93,17 @@ if [ -n $has_nvim ]
end
function ee
if [ (count $argv) -eq 0 ]
- fzf --reverse --bind 'enter:execute(nvim {})'
+ fzf --reverse --bind 'enter:become(nvim {})'
else
- find $argv[1] -type f -print0 | fzf --read0 --reverse --bind 'enter:execute(nvim {})'
+ find $argv[1] -type f -print0 | fzf --read0 --reverse --bind 'enter:become(nvim {})'
end
end
else
function ee
if [ (count $argv) -eq 0 ]
- fzf --reverse --bind 'enter:execute(vim {})'
+ fzf --reverse --bind 'enter:become(vim {})'
else
- find $argv[1] -type f -print0 | fzf --read0 --reverse --bind 'enter:execute(vim {})'
+ find $argv[1] -type f -print0 | fzf --read0 --reverse --bind 'enter:become(vim {})'
end
end
end
diff --git a/home-manager/config/tmux/tmux.conf b/home-manager/config/tmux/tmux.conf
index 0746f82..321e095 100644
--- a/home-manager/config/tmux/tmux.conf
+++ b/home-manager/config/tmux/tmux.conf
@@ -12,7 +12,7 @@
# BASICS {{{2
set-option -g renumber-windows on
set-option -g focus-events on
-set-option -g default-shell fish
+set-option -g default-shell ~/.nix-profile/bin/fish
# TERMINAL FEATURES {{{2
set-option -ga terminal-overrides ',tmux-256color:RGB'
diff --git a/home-manager/home.nix b/home-manager/home.nix
index e74da8a..c3c21d1 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -80,7 +80,7 @@ in
SQLITE_HISTORY = "${XDG_CACHE_HOME}/sqlite_history";
# Local
- LANG = "en_US.UTF-8";
+ LANG = "en_US.utf-8";
LC_ALL = "";
# Locale: Less
LESSCHARSET = "utf-8";