4 files changed, 21 insertions, 52 deletions
diff --git a/config/zsh/aliases/dev.zsh b/config/zsh/aliases/dev.zsh
index 65922a1..fa0bf5c 100644
--- a/config/zsh/aliases/dev.zsh
+++ b/config/zsh/aliases/dev.zsh
@@ -23,19 +23,6 @@ far() {
   fd "$file_r" | sad "$matcher_r" "$result" -p diff-so-fancy "$@";
 }
 
-# :: FileType Filename
-calc() {
-  local syntax="${1:-javascript}"
-  shift
-  nvim -c \
-    "let g:startify_disable_at_vimenter = 1 |\
-    set bt=nofile ls=0 |\
-    hi ColorColumn ctermbg=NONE |\
-    hi VertSplit ctermbg=NONE |\
-    hi NonText ctermfg=0 |\
-    Codi $syntax" "$@"
-}
-
 get_node_script_runner() {
   # TODO: Check .engines.*
   # jq -r .engines.pnpm package.json
@@ -64,21 +51,3 @@ bindkey '^B' p__run_npm_script;
 fix-interpreter() {
   nix-shell -p patchelf --run "patchelf --set-interpreter \$(patchelf --print-interpreter \$(which mkdir)) $@"
 }
-
-
-# Terminal through neovim
-vt() {
-  nvim +term \
-    +'norm i' \
-    +"lua vim.fn.feedkeys([[$1]])" \
-    +'lua vim.go.termguicolors = false' \
-    +'set nonumber norelativenumber signcolumn=no' \
-    +'autocmd TermClose * execute "qa"' \
-    +'hi @_phenax.term-title guibg=#1a1824 guifg=#8e7ae3 gui=bold' \
-    +'set winbar=%#@_phenax.term-title#%=nvim-term%=';
-}
-
-p__nvim_virtual_terminal() { vt "$BUFFER"; }
-zle -N p__nvim_virtual_terminal;
-bindkey '^T' p__nvim_virtual_terminal;
-
diff --git a/config/zsh/aliases/edit.zsh b/config/zsh/aliases/edit.zsh
index fe14d92..2111430 100644
--- a/config/zsh/aliases/edit.zsh
+++ b/config/zsh/aliases/edit.zsh
@@ -4,7 +4,7 @@ alias eemacs='gemacs && emedit Emacs.org';
 alias eorg='gnotes && sensible-editor index.md';
 alias ezsh='gzsh && sensible-editor zshrc';
 alias edot='sensible-editor ~/nixos/scripts/dotfiles.sh';
-alias evim='gvim && sensible-editor init.lua';
+alias evim='gvim && sensible-editor';
 
 alias edwm='gdwm && sensible-editor config.def.h';
 alias ebar='gbar && sensible-editor blocks.h';
@@ -13,4 +13,4 @@ alias equte='gqute && sensible-editor config.py';
 alias eas='sensible-editor ~/nixos/packages/dwm/autostart.sh';
 alias emime="sensible-editor ~/nixos/scripts/bin/open";
 
-alias fedit='sensible-editor `fzf`'
+alias fe='sensible-editor `fzf`'
diff --git a/config/zsh/aliases/git.zsh b/config/zsh/aliases/git.zsh
index c33781d..9611a16 100644
--- a/config/zsh/aliases/git.zsh
+++ b/config/zsh/aliases/git.zsh
@@ -54,14 +54,14 @@ alias grc='git rebase --continue'
 # egc         : Open files in last commit
 # egc HEAD~1  : Open files in commit before the last one
 egc() {
-  nvim $(git show --name-only --pretty="" "$@");
+  sensible-editor $(git show --name-only --pretty="" "$@");
 }
 
 # Open files in diff
 # egd              : Open files changed (HEAD)
 # egd origin/main  : Open files diff between origin/main
 egd() {
-  nvim $(git diff --name-only ${1:-HEAD});
+  sensible-editor $(git diff --name-only ${1:-HEAD});
 }
 
 grename() {
@@ -98,3 +98,13 @@ gco() {
   fi
 }
 
+ghpr() {
+  if [ -f '.github/pull_request_template.md' ]; then
+    gh pr create -e -a "@me" -T 'pull_request_template.md' "$@" || true
+  else
+    gh pr create -e -a "@me" "$@" || true
+  fi
+
+  xdg-open "$(gh pr view --json url -q .url)"
+}
+
diff --git a/config/zsh/aliases/ls.zsh b/config/zsh/aliases/ls.zsh
index a3a484a..4e763fd 100644
--- a/config/zsh/aliases/ls.zsh
+++ b/config/zsh/aliases/ls.zsh
@@ -1,28 +1,18 @@
-# Trash
-alias trash="ls \$TRASH_TMP_DIR";
-
 # List files aliases
-alias l="ls -1";
-alias la='ls -a';
-alias ll='ls -alF';
-alias lt='ls --tree';
+alias ll="ls -lh --time-style=+ --group-directories-first --color=always";
 alias la='ls -A';
 alias lsize='du -h -d1';
 
-lc () { # lf with cd to navigated directory on quit
+alias l='daffm';
+alias lt='daffm';
+
+# cd to navigated directory on quit
+lc () {
   tmp="$(mktemp)"
-  lf -last-dir-path="$tmp" "$@"
+  DAFFM_LAST_DIR_PATH="$tmp" daffm -c @lastcd
   if [ -f "$tmp" ]; then
     dir="$(cat "$tmp")"
     rm -f "$tmp"
     [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
   fi
 }
-
-lfshow() {
-  local TMP_F="$(mktemp)";
-  lf -selection-path "$TMP_F" "$@"  >/dev/null 2>&1;
-  local res="$(< "$TMP_F")";
-  rm -f "$TMP_F";
-  echo "$res"
-}