diff --git a/bash/path b/bash/path index b5ceb69..6262fe1 100644 --- a/bash/path +++ b/bash/path @@ -26,5 +26,6 @@ add-path /usr/local/go/bin add-path ~/.bin add-path ~/opt/depot_tools add-path ~/.yarn/bin +add-path ~/.local/bin -unset -f _add-path +unset -f add-path diff --git a/bash/prompt b/bash/prompt index 4600d2b..f266402 100644 --- a/bash/prompt +++ b/bash/prompt @@ -1,5 +1,14 @@ #!/usr/bin/env bash +function _hostname-color { + case "$(whoami)" in + william) echo $blue;; + buddy) echo $blue;; + root) echo $bred;; + *) echo $purple;; + esac +} + # display hostname PS1="\[$green\]"'\u'"\[$yellow\] " PS1="$PS1\[$(_hostname-color)\]"'$(_hostname-show)'"" @@ -26,15 +35,6 @@ function parse_git_status { fi } -function _hostname-color { - case "$(whoami)" in - william) echo $blue;; - buddy) echo $blue;; - root) echo $bred;; - *) echo $purple;; - esac -} - function _hostname-show { hostname -s | tr '[A-Z]' '[a-z]' } diff --git a/config/i3/config b/config/i3/config index 07e3d8e..f3eecb4 100644 --- a/config/i3/config +++ b/config/i3/config @@ -36,7 +36,8 @@ bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+Shift+q kill # start dmenu (a program launcher) -bindsym $mod+d exec dmenu_run +#bindsym $mod+d exec dmenu_run +bindsym $mod+space exec dmenu_run # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. @@ -71,7 +72,7 @@ bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right # split in horizontal orientation -#bindsym $mod+h split h +bindsym $mod+r split h # split in vertical orientation bindsym $mod+v split v @@ -85,10 +86,10 @@ bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split # toggle tiling / floating -bindsym $mod+Shift+space floating toggle +#bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +#bindsym $mod+space focus mode_toggle # focus the parent container bindsym $mod+a focus parent @@ -141,35 +142,35 @@ bindsym $mod+Shift+r restart bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - #bindsym j resize shrink width 10 px or 10 ppt - #bindsym k resize grow height 10 px or 10 ppt - #bindsym l resize shrink height 10 px or 10 ppt - #bindsym semicolon resize grow width 10 px or 10 ppt - #bindsym h resize shrink width 10 px or 10 ppt - #bindsym j resize grow height 10 px or 10 ppt - #bindsym k resize shrink height 10 px or 10 ppt - #bindsym l resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} +# mode "resize" { +# # These bindings trigger as soon as you enter the resize mode +# +# # Pressing left will shrink the window’s width. +# # Pressing right will grow the window’s width. +# # Pressing up will shrink the window’s height. +# # Pressing down will grow the window’s height. +# #bindsym j resize shrink width 10 px or 10 ppt +# #bindsym k resize grow height 10 px or 10 ppt +# #bindsym l resize shrink height 10 px or 10 ppt +# #bindsym semicolon resize grow width 10 px or 10 ppt +# #bindsym h resize shrink width 10 px or 10 ppt +# #bindsym j resize grow height 10 px or 10 ppt +# #bindsym k resize shrink height 10 px or 10 ppt +# #bindsym l resize grow width 10 px or 10 ppt +# +# # same bindings, but for the arrow keys +# bindsym Left resize shrink width 10 px or 10 ppt +# bindsym Down resize grow height 10 px or 10 ppt +# bindsym Up resize shrink height 10 px or 10 ppt +# bindsym Right resize grow width 10 px or 10 ppt +# +# # back to normal: Enter or Escape or $mod+r +# bindsym Return mode "default" +# bindsym Escape mode "default" +# bindsym $mod+r mode "default" +# } -bindsym $mod+r mode "resize" +# bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) diff --git a/profile b/profile index c6d8309..a96c784 100644 --- a/profile +++ b/profile @@ -9,5 +9,5 @@ export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"} export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"} export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"} -[[ -f ~/.nvm/nvm.sh ]] && source ~/.nvm/nvm.sh +[[ -f $HOME/.nvm/nvm.sh ]] && source $HOME/.nvm/nvm.sh [[ -r $NVM_DIR/bash_completion ]] && source $NVM_DIR/bash_completion