bash/kitty

@@ -1,5 +0,0 @@
-if test -n "$KITTY_INSTALLATION_DIR"; then
-  export KITTY_SHELL_INTEGRATION="enabled"
-  source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"
-fi
-

bash/prompt

@@ -57,17 +57,8 @@ set_prompt() {
 
     local buffer=""
 
-    local hostname=""
-    if [[ -n $HOST ]]; then
-        hostname="${HOST%.local}"
-    elif [[ -n $HOSTNAME ]]; then
-        hostname="${HOSTNAME}"
-    else
-        hostname="$(hostname -s)"
-    fi
-
     if [[ -n $SSH_CLIENT ]]; then
-        buffer="${buffer}${hostname} "
+        buffer="${buffer}${HOST%.local} "
     fi
 
     if [[ -n $STY ]]; then
@@ -114,16 +105,16 @@ set_prompt() {
 
     local rbuffer=""
 
-    # CMD_DURATION=${CMD_DURATION:-0}
-    # local duration="${CMD_DURATION%.*}"
+    CMD_DURATION=${CMD_DURATION:-0}
+    local duration="${CMD_DURATION%.*}"
 
-    # if [[ ${duration:-0} -gt 0 ]]; then
-    #     printf -v formatted_duration "%.3f" "${CMD_DURATION}"
+    if [[ ${duration:-0} -gt 0 ]]; then
+        printf -v formatted_duration "%.3f" "${CMD_DURATION}"
 
-    #     rbuffer=" %F{yellow}${formatted_duration}s${rbuffer}"
-    # fi
+        rbuffer=" %F{yellow}${formatted_duration}s${rbuffer}"
+    fi
 
-    # [[ ${CMD_RC} -ne 0 ]] && rbuffer=" %F{red}${CMD_RC}${rbuffer}"
+    [[ ${CMD_RC} -ne 0 ]] && rbuffer=" %F{red}${CMD_RC}${rbuffer}"
 
     if [[ -n "${rbuffer}" ]]; then
       RPROMPT="${rbuffer}%f"

bash/rc

@@ -12,9 +12,6 @@ source $DOTFILES_BASH_DIR/completion
 source $DOTFILES_SHELL_DIR/go
 source $DOTFILES_SHELL_DIR/chruby
 source $DOTFILES_BASH_DIR/fzf
-source $DOTFILES_SHELL_DIR/direnv
-source $DOTFILES_SHELL_DIR/kd
-source $DOTFILES_BASH_DIR/kitty
 
 source $DOTFILES_SHELL_DIR/git_prompt_info
 GIT_PS1_SHOWDIRTYSTATE=1
@@ -24,12 +21,12 @@ GIT_PS1_SHOWUNTRACKEDFILES=1
 precmd() {
     CMD_RC=$?
 
-    # if [[ -n ${CMD_START} ]]; then
-    #     CMD_END="${EPOCHREALTIME}"
-    #     CMD_DURATION=$(bc <<<"${CMD_END} - ${CMD_START}")
-    #     unset CMD_START
-    #     unset CMD_END
-    # fi
+    if [[ -n ${CMD_START} ]]; then
+        CMD_END="${EPOCHREALTIME}"
+        CMD_DURATION=$(bc <<<"${CMD_END} - ${CMD_START}")
+        unset CMD_START
+        unset CMD_END
+    fi
 
     _direnv_hook
     #clear_incomplete_line

home/Xresources

@@ -38,10 +38,6 @@ Xft.rgba:       rgb
 Xft.hinting:    true
 Xft.hintstyle:  hintslight
 
-!---- cursor ----
-Xcursor.size: 48
-Xcursor.theme: DMZ-Black
-
 
 !---- xterm ----
 
@@ -98,7 +94,7 @@ xterm*color15:     #ffffff
 
 !---- urxvt ----
 
-urxvt*geometry:           80x24
+urxvt*geometry:           90x33
 urxvt*font:               xft:Menlo:pixelsize=14,xft:AquaKana:pixelsize:14
 urxvt*letterSpace:        -2
 urxvt*saveLines:          10240

shell/aliases

@@ -5,12 +5,12 @@ case "$OSTYPE" in
         alias top="top -o cpu -s 5"
         ;;
     *linux*)
-        alias ls="ls --color=no"
+        alias ls="ls --color"
         ;;
 esac
 
 alias ll="ls -l"
-alias tree="tree -n"
+alias tree="tree -C"
 if command -v colordiff 2>&1 >/dev/null; then
     alias diff="colordiff"
 fi

shell/gpg

@@ -2,9 +2,4 @@
 #export GPG_TTY
 #gpg-connect-agent updatestartuptty /bye >/dev/null
 
-if ps -u "${USER}" | grep -v grep | grep -q gpg-agent; then
-    :
-elif type pinentry-rofi >/dev/null 2>&1; then
-    gpg-agent --homedir /home/lloeki/.gnupg --use-standard-socket --daemon --pinentry-program=/etc/profiles/per-user/lloeki/bin/pinentry-rofi
-fi
 # vim: ft=bash

shell/ssh

@@ -18,11 +18,6 @@ if [[ -n "${SSH_AUTH_SOCK}" ]]; then
         case "${OSTYPE}" in
             linux*)
                 # TODO: unsure yet
-                # maybe:
-                # ssh-add ~/.ssh/id_*[!.pub]
-                # or on demand:
-                # see ssh_config(5) AddKeysToAgent yes or ask
-                # see ssh(1) SSH_ASKPASS=/path/to/ask / SSH_ASKPASS_REQUIRE=prefer
                 :
                 ;;
             darwin*)

zsh/kitty

@@ -1,6 +0,0 @@
-if test -n "$KITTY_INSTALLATION_DIR"; then
-  export KITTY_SHELL_INTEGRATION="enabled"
-  autoload -Uz -- "$KITTY_INSTALLATION_DIR"/shell-integration/zsh/kitty-integration
-  kitty-integration
-  unfunction kitty-integration
-fi

zsh/prompt

@@ -131,17 +131,8 @@ set_prompt() {
 
     local buffer=""
 
-    local hostname=""
-    if [[ -n $HOST ]]; then
-        hostname="${HOST%.local}"
-    elif [[ -n $HOSTNAME ]]; then
-        hostname="${HOSTNAME}"
-    else
-        hostname="$(hostname -s)"
-    fi
-
     if [[ -n $SSH_CLIENT ]]; then
-        buffer="${buffer}${hostname} "
+        buffer="${buffer}${HOST%.local} "
     fi
 
     if [[ -n $STY ]]; then

zsh/rc

@@ -14,7 +14,6 @@ source $DOTFILES_ZSH_DIR/prompt
 source $DOTFILES_ZSH_DIR/fzf
 source $DOTFILES_SHELL_DIR/go
 source $DOTFILES_SHELL_DIR/direnv
-source $DOTFILES_ZSH_DIR/kitty
 
 set -o ignoreeof
 unsetopt BEEP