aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc2
-rw-r--r--.config/nixpkgs/config.nix6
-rw-r--r--.vimrc5
3 files changed, 8 insertions, 5 deletions
diff --git a/.bashrc b/.bashrc
index 4e10fed..8e40402 100644
--- a/.bashrc
+++ b/.bashrc
@@ -80,6 +80,7 @@ alias alsamixer='alsamixer -V all'
alias archey3="archey3 --config=~/.config/archey3.cfg"
alias audacity='PULSE_LATENCY_MSEC=30 audacity'
alias colortest='msgcat --color=test'
+alias dash='PS1="$ " dash'
alias diceware='diceware -d " "'
alias dict='dict -h localhost'
alias dmesg='dmesg -e'
@@ -95,6 +96,7 @@ alias mocp='mocp -M $XDG_CONFIG_HOME/moc'
alias pacman='sudo pacman'
alias rangerinf='while true; do ranger; done'
alias rofi='rofi -cache-dir $XDG_DATA_HOME'
+alias sh='dash'
alias tidy='tidy -config $HOME/.config/tidy.conf'
alias wavemon='sudo wavemon'
alias wget='wget --hsts-file $HOME/.cache/wget.history'
diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index 193e9a4..95bb2b7 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -292,9 +292,9 @@ in
paths = [ elixir ];
};
- Bash = pkgs.buildEnv {
- name = "bash";
- paths = [ bats shellcheck ];
+ Shell = pkgs.buildEnv {
+ name = "shell";
+ paths = [ bats shellcheck dash ];
};
Haskell = pkgs.buildEnv {
diff --git a/.vimrc b/.vimrc
index 8a98508..332e1fc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -260,7 +260,7 @@ function s:terminal(start, end, language)
if g:terminal_buffer == -1 || !bufexists(g:terminal_buffer)
terminal ++rows=10
let g:terminal_buffer = bufnr('')
- call term_sendkeys(g:terminal_buffer, "exec " . a:language . "\<cr>")
+ call term_sendkeys(g:terminal_buffer, a:language . "; exit" . "\<cr>")
wincmd p
elseif bufwinnr(g:terminal_buffer) == -1
exec 'sbuffer ' . g:terminal_buffer
@@ -297,9 +297,10 @@ augroup AutoCommands
autocmd FileType lua noremap <buffer> <leader>cc :REPL lua<cr>
autocmd FileType php noremap <buffer> <leader>cc :REPL psysh<cr>
autocmd FileType elixir noremap <buffer> <leader>cc :REPL iex<cr>
+ autocmd FileType sh noremap <buffer> <leader>cc :REPL dash -x<cr>
autocmd FileType nix noremap <buffer> <leader>cc :REPL nix repl<cr>
+ autocmd FileType bash noremap <buffer> <leader>cc :REPL bash -x<cr>
autocmd FileType python noremap <buffer> <leader>cc :REPL python<cr>
- autocmd FileType sh,bash noremap <buffer> <leader>cc :REPL sh -x<cr>
autocmd FileType perl noremap <buffer> <leader>cc :REPL perl -de0<cr>
autocmd FileType javascript noremap <buffer> <leader>cc :REPL node<cr>