From 8e22b1aee20b6d8a27eca6b942f7a24139047146 Mon Sep 17 00:00:00 2001 From: Adam Veldhousen Date: Mon, 6 Sep 2021 18:25:34 -0500 Subject: [PATCH] chore: work stuff --- src/.config/i3/config | 152 +++++++++++++------------- src/.config/i3/polybar.sh | 17 ++- src/.config/nitrogen/bg-saved.cfg | 26 ++--- src/.config/polybar/config | 80 ++++++++++---- src/.config/terminator/config | 83 +++++++------- src/.config/vim/.vimrc | 2 +- src/.config/vim/plugins.txt | 1 + src/.gitconfig | 9 +- src/.gitmessage | 38 +++---- src/.profile | 2 + src/.shell_extensions/aliases.sh | 2 +- src/.shell_extensions/environment.sh | 3 +- src/.shell_extensions/shell_colors.sh | 4 +- 13 files changed, 227 insertions(+), 192 deletions(-) diff --git a/src/.config/i3/config b/src/.config/i3/config index c7edbf6..7a31a9b 100644 --- a/src/.config/i3/config +++ b/src/.config/i3/config @@ -7,6 +7,11 @@ # text rendering and scalability on retina/hidpi displays (thanks to pango). font pango:DejaVu Sans Mono 12 + +# Mod1 = Alt +# Mod4 = Start button +set $mod Mod4 + ######################################### # STARTUP ######################################### @@ -20,19 +25,19 @@ exec_always --no-startup-id ~/.config/i3/polybar.sh # start picom for window composition exec_always --no-startup-id ~/.config/i3/picom.sh # set wallpaper -exec_always --no-startup-id nitrogen --head=0 --save --set-scaled ~/Pictures/Wallpapers/retro.jpg +exec_always --no-startup-id nitrogen --head=0 --save --set-scaled ~/Pictures/Wallpapers/logo.svg # start spotify-slack-status -exec_always --no-startup-id spotify-slack-status -token $SLACK_TOKEN - +exec_always --no-startup-id spotify-slack-status -token $SLACK_TOKEN -playing-emoji spotify -paused-emoji spotify # start dunst for custom notification popups exec --no-startup-id ~/.config/i3/dunst.sh + ############################# # BINDINGS ############################## # screen shot (area) -bindsym Mod1+x exec --no-startup-id gnome-screenshot -a -c -f /tmp/latest-screenshot.png +bindsym $mod+x exec --no-startup-id gnome-screenshot -a -c -f /tmp/latest-screenshot.png # Pulse Audio controls # set default audio sink to laptop speakers @@ -55,7 +60,7 @@ mode "Audio Setup" { bindsym Escape mode "default" } -bindsym Mod1+Shift+a mode "Audio Setup" +bindsym $mod+Shift+a mode "Audio Setup" # Media player controls bindsym XF86AudioPlay exec playerctl play-pause @@ -68,55 +73,55 @@ bindsym XF86MonBrightnessUp exec light -A 10 # increase screen brightness bindsym XF86MonBrightnessDown exec light -U 10 # decrease screen brightness # lock the screen -bindsym Mod1+Ctrl+Shift+l exec ~/.config/i3/lock.sh SUSPEND +bindsym $mod+Ctrl+Shift+l exec ~/.config/i3/lock.sh SUSPEND # start a terminal -bindsym Mod1+Return exec terminator +bindsym $mod+Return exec terminator # start firefox -bindsym Mod1+Shift+Return exec firefox -bindsym Ctrl+Shift+Return exec /opt/google/chrome/chrome --type=renderer --disable-webrtc-apm-in-audio-service --lang=en-US --enable-auto-reload --num-raster-threads=4 --enable-main-frame-before-activation --shared-files +bindsym $mod+Shift+Return exec firefox +bindsym Ctrl+Shift+Return exec /opt/google/chrome/chrome --type=renderer --disable-webrtc-apm-in-audio-service --lang=en-US --enable-auto- # insomnia -bindsym Mod1+Shift+i exec insomnia +bindsym $mod+Shift+i exec insomnia # Sets up external display -bindsym Mod1+Shift+g exec ~/.config/i3/setup_external_displays.sh CONNECT && ~/.config/i3/polybar.sh -bindsym Mod1+Shift+f exec ~/.config/i3/setup_external_displays.sh DISCONNECT && ~/.config/i3/polybar.sh -bindsym Mod1+Shift+Ctrl+g exec ~/.config/i3/setup_external_displays.sh RECONNECT_PRIMARY && ~/.config/i3/polybar.sh +bindsym $mod+Shift+g exec ~/.config/i3/setup_external_displays.sh CONNECT && ~/.config/i3/polybar.sh +bindsym $mod+Shift+f exec ~/.config/i3/setup_external_displays.sh DISCONNECT && ~/.config/i3/polybar.sh +bindsym $mod+Shift+Ctrl+g exec ~/.config/i3/setup_external_displays.sh RECONNECT_PRIMARY && ~/.config/i3/polybar.sh -bindsym Mod1+Shift+x move workspace to output right +bindsym $mod+Shift+x move workspace to output right # 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. -bindsym Mod1+d exec --no-startup-id i3-dmenu-desktop +bindsym $mod+d exec --no-startup-id i3-dmenu-desktop # reload the configuration file -bindsym Mod1+Shift+c reload +bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym Mod1+Shift+r restart +bindsym $mod+Shift+r restart # exit i3 (logs you out of your X session) -bindsym Mod1+Shift+e exec "i3-nagbar -t warning -m 'Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # move the currently focused window to the scratchpad -bindsym Mod1+Shift+minus move scratchpad +bindsym $mod+Shift+minus move scratchpad # Show the next scratchpad window or hide the focused scratchpad window. # If there are multiple scratchpad windows, this command cycles through them. -bindsym Mod1+minus scratchpad show +bindsym $mod+minus scratchpad show # split in horizontal orientation -bindsym Mod1+i split h +bindsym $mod+i split h # split in vertical orientation -bindsym Mod1+s split t +bindsym $mod+s split t # enter fullscreen mode for the focused container -bindsym Mod1+f fullscreen toggle +bindsym $mod+f fullscreen toggle -# use Mouse+Mod1 to drag floating windows to their wanted position -floating_modifier Mod1 +# use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod # kill focused window -bindsym Mod1+Shift+q kill +bindsym $mod+Shift+q kill # use these keys for focus, movement, and resize directions when reaching for # the arrows is not convenient @@ -126,69 +131,69 @@ set $up k set $right l # change focus -bindsym Mod1+$left focus left -bindsym Mod1+$down focus down -bindsym Mod1+$up focus up -bindsym Mod1+$right focus right +bindsym $mod+$left focus left +bindsym $mod+$down focus down +bindsym $mod+$up focus up +bindsym $mod+$right focus right # alternatively, you can use the cursor keys: -bindsym Mod1+Left focus left -bindsym Mod1+Down focus down -bindsym Mod1+Up focus up -bindsym Mod1+Right focus right +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right # move focused window -bindsym Mod1+Shift+$left move left -bindsym Mod1+Shift+$down move down -bindsym Mod1+Shift+$up move up -bindsym Mod1+Shift+$right move right +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$right move right # alternatively, you can use the cursor keys: -bindsym Mod1+Shift+Left move left -bindsym Mod1+Shift+Down move down -bindsym Mod1+Shift+Up move up -bindsym Mod1+Shift+Right move right +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right # change container layout (stacked, tabbed, toggle split) -bindsym Mod1+e layout stacking -bindsym Mod1+w layout tabbed -bindsym Mod1+q layout toggle split +bindsym $mod+e layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+q layout toggle split # toggle tiling / floating -bindsym Mod1+Shift+space floating toggle +bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym Mod1+space focus mode_toggle +bindsym $mod+space focus mode_toggle # focus the parent container -bindsym Mod1+a focus parent +bindsym $mod+a focus parent # focus the child container -#bindsym Mod1+d focus child +#bindsym $mod+d focus child # switch to workspace -bindsym Mod1+1 workspace 1 -bindsym Mod1+2 workspace 2 -bindsym Mod1+3 workspace 3 -bindsym Mod1+4 workspace 4 -bindsym Mod1+5 workspace 5 -bindsym Mod1+6 workspace 6 -bindsym Mod1+7 workspace 7 -bindsym Mod1+8 workspace 8 -bindsym Mod1+9 workspace 9 -bindsym Mod1+0 workspace 10 +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 # move focused container to workspace -bindsym Mod1+Shift+1 move container to workspace 1 -bindsym Mod1+Shift+2 move container to workspace 2 -bindsym Mod1+Shift+3 move container to workspace 3 -bindsym Mod1+Shift+4 move container to workspace 4 -bindsym Mod1+Shift+5 move container to workspace 5 -bindsym Mod1+Shift+6 move container to workspace 6 -bindsym Mod1+Shift+7 move container to workspace 7 -bindsym Mod1+Shift+8 move container to workspace 8 -bindsym Mod1+Shift+9 move container to workspace 9 -bindsym Mod1+Shift+0 move container to workspace 10 +bindsym $mod+Shift+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 # resize window (you can also use the mouse for that) mode "resize" { @@ -214,14 +219,9 @@ mode "resize" { bindsym Escape mode "default" } -bindsym Mod1+r mode "resize" - -# finds out, if available) -#bar { - #status_command i3status -#} - +bindsym $mod+r mode "resize" # shrink window borders for_window [class="^.*"] border pixel 1 new_window 1pixel +for_window [class="Tandem"] floating enable diff --git a/src/.config/i3/polybar.sh b/src/.config/i3/polybar.sh index 69ada53..272dff7 100755 --- a/src/.config/i3/polybar.sh +++ b/src/.config/i3/polybar.sh @@ -2,10 +2,19 @@ killall -q polybar while pgrep -x polybar > /dev/null; do sleep 0.1; done -PRIMARY=$(xrandr | grep primary | awk '{ print $1 }') + +BACKGROUND=~/Pictures/Wallpapers/logo.svg + +PRIMARY=$(xrandr | grep -i -e "eDP.* connected" | awk '{ print $1 }') MONITOR=${PRIMARY} polybar 1080p-bottom & MONITOR=${PRIMARY} polybar 1080p-top & +nitrogen --head=0 --save --set-color=#FFFFFF --set-centered ${BACKGROUND}; -SECONDARY=$(xrandr | grep "DVI.*connected" | awk '{ print $1 }') -MONITOR=${SECONDARY} polybar 4k-bottom & -MONITOR=${SECONDARY} polybar 4k-top & +SECONDARY=$(xrandr | grep "^DP-[0-9] connected" | awk '{ print $1 }') +if [ ! -z "${SECONDARY}" ]; then + nitrogen --head=1 --save --set-color=#FFFFFF --set-centered ${BACKGROUND}; + nitrogen --head=2 --save --set-color=#FFFFFF --set-centered ${BACKGROUND}; + nitrogen --head=3 --save --set-color=#FFFFFF --set-centered ${BACKGROUND}; + MONITOR=${SECONDARY} polybar 1080p-bottom & + MONITOR=${SECONDARY} polybar 1080p-top & +fi diff --git a/src/.config/nitrogen/bg-saved.cfg b/src/.config/nitrogen/bg-saved.cfg index 59bda16..bbe6b62 100644 --- a/src/.config/nitrogen/bg-saved.cfg +++ b/src/.config/nitrogen/bg-saved.cfg @@ -1,24 +1,14 @@ -[:1.2] -file=/home/adam/Pictures/Wallpapers/retro.jpg -mode=0 -bgcolor=#000000 - -[xin_0] -file=/home/adam/Pictures/Wallpapers/retro.jpg -mode=0 -bgcolor=#000000 - -[xin_2] +[:1.1] file=/home/adam/Pictures/Wallpapers/retro.jpg mode=0 bgcolor=#000000 [xin_1] -file=/home/adam/Pictures/Wallpapers/retro.jpg -mode=0 -bgcolor=#000000 +file=/home/adam/Pictures/Wallpapers/logo.svg +mode=2 +bgcolor=#ffffff -[:1.1] -file=/home/adam/Pictures/Wallpapers/retro.jpg -mode=0 -bgcolor=#000000 +[xin_0] +file=/home/adam/Pictures/Wallpapers/logo.svg +mode=2 +bgcolor=#ffffff diff --git a/src/.config/polybar/config b/src/.config/polybar/config index d9912b7..0895734 100644 --- a/src/.config/polybar/config +++ b/src/.config/polybar/config @@ -19,7 +19,7 @@ success = #55aa55 warning = #ffda17 [bar/1080p-top] -monitor = ${env:MONITOR:DP-0} +monitor = ${env:MONITOR:eDP-1} width = 100% height =25 @@ -64,7 +64,7 @@ dpi-x = 100 [bar/1080p-bottom] ;remove padding around bar ;override-redirect = true -monitor = ${env:MONITOR:DP-0} +monitor = ${env:MONITOR:eDP-1} width = 100% height = 30 @@ -92,7 +92,7 @@ font-2 = "PragmataPro Liga:style=Regular:pixelsize=12:1" modules-left = spotify modules-center = -modules-right = volume backlight filesystem temperature cpu memory keyboard +modules-right = displaymenu audiomenu volume backlight filesystem temperature cpu memory keyboard bottom = true ; tray-position = right @@ -121,7 +121,7 @@ foreground = ${colors.foreground} line-size = 3 line-color = #f00 -border-size = 0 +border-size = 0 border-color = #00000000 padding-left = 3 @@ -159,7 +159,7 @@ foreground = ${colors.foreground} line-size = 3 line-color = #f00 -border-size = 0 +border-size = 0 border-color = #00000000 padding-left = 3 @@ -184,10 +184,8 @@ tray-maxsize = 16 cursor-click = pointer cursor-scroll = ns-resize -dpi-y = 130 -dpi-x = 130 - - +dpi-y = 100 +dpi-x = 100 [module/xwindow] type = internal/xwindow @@ -243,7 +241,7 @@ label-empty-padding = 1 type = internal/i3 format = index-sort = true -wrapping-scroll = false +wrapping-scroll = true ; Only show workspaces on the same output as the bar pin-workspaces = true @@ -254,24 +252,24 @@ label-mode-background = ${colors.primary} ; focused = Active workspace on focused monitor label-focused = %index% -label-focused-background = ${module/bspwm.label-focused-background} -label-focused-underline = ${module/bspwm.label-focused-underline} -label-focused-padding = ${module/bspwm.label-focused-padding} +label-focused-background = ${colors.background-alt} +label-focused-underline = ${colors.success} +label-focused-padding = 2 ; unfocused = Inactive workspace on any monitor label-unfocused = %index% -label-unfocused-padding = ${module/bspwm.label-occupied-padding} +label-unfocused-padding = 1 ; visible = Active workspace on unfocused monitor label-visible = %index% -label-visible-background = ${self.label-focused-background} -label-visible-underline = ${self.label-focused-underline} -label-visible-padding = ${self.label-focused-padding} +label-visible-background = ${colors.foreground-alt} +label-visible-underline = ${colors.primary} +label-visible-padding = 2 ; urgent = Workspace with urgency hint set label-urgent = %index% -label-urgent-background = ${module/bspwm.label-urgent-background} -label-urgent-padding = ${module/bspwm.label-urgent-padding} +label-urgent-background = ${colors.background-alt} +label-urgent-padding = 2 [module/mpd] type = internal/mpd @@ -337,7 +335,8 @@ label = %percentage%% [module/wlan] type = internal/network -interface = wlo1 +;interface = wlo1 +interface = wlan0 interval = 5.0 format-connected-prefix = @@ -416,6 +415,7 @@ bar-volume-empty = ─ bar-volume-empty-font = 2 bar-volume-empty-foreground = ${colors.foreground-alt} + [module/battery] type = internal/battery ; Use the following command to list batteries and adapters: @@ -480,6 +480,46 @@ ramp-1 = |-| ramp-2 = |^| ramp-foreground = ${colors.foreground-alt} +[module/displaymenu] +type = custom/menu +expand-right = false +format-spacing = 1 +label-open = DISPLAY +label-open-foreground = ${colors.secondary} +label-close = CANCEL +label-close-foreground = ${colors.secondary} +label-separator = | +label-separator-foreground = ${colors.foreground-alt} + +menu-0-0 = Connect +menu-0-0-exec = ~/.config/i3/setup_external_displays.sh CONNECT + +menu-0-1 = Disconnect +menu-0-1-exec = ~/.config/i3/setup_external_displays.sh DISCONNECT + +[module/audiomenu] +type = custom/menu +expand-right = false +format-spacing = 1 +label-open = LINE-OUT +label-open-foreground = ${colors.secondary} +label-close = CANCEL +label-close-foreground = ${colors.secondary} +label-separator = | +label-separator-foreground = ${colors.foreground-alt} + +menu-0-0 = Speakers +menu-0-0-exec = pactl set-default-sink 'alsa_output.pci-0000_00_1f.3.analog-stereo' + +menu-0-1 = Jabra +menu-0-1-exec = pactl set-default-sink 'alsa_output.usb-0b0e_Jabra_SPEAK_510_USB_501AA56C0DBB020A00-00.analog-stereo' + +menu-0-2 = Razer Mic +menu-0-2-exec = pactl set-default-sink 'alsa_output.usb-Razer_Inc_Razer_Seiren_X_UC2102L01304427-00.analog-stereo' + +menu-0-3 = HyperX Headset +menu-0-3-exec = pactl set-default-sink 'alsa_output.usb-Kingston_HyperX_7.1_Audio_00000000-00.stereo-fallback' + [module/powermenu] type = custom/menu diff --git a/src/.config/terminator/config b/src/.config/terminator/config index 25bdb56..b7eeb5b 100644 --- a/src/.config/terminator/config +++ b/src/.config/terminator/config @@ -1,63 +1,64 @@ [global_config] - enabled_plugins = CustomCommandsMenu, LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler + title_transmit_bg_color = "#204a87" + title_receive_bg_color = "#ce5c00" + title_inactive_bg_color = "#555753" inactive_color_offset = 0.936073059361 + enabled_plugins = CustomCommandsMenu, LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler suppress_multiple_term_dialog = True - title_inactive_bg_color = "#555753" - title_receive_bg_color = "#ce5c00" - title_transmit_bg_color = "#204a87" + case_sensitive = False [keybindings] - close_term = w - close_window = w - edit_tab_title = F2 - edit_terminal_title = F2 + zoom_in = equal + zoom_out = minus + zoom_normal = plus + new_tab = t + go_up = k go_down = j go_left = h go_right = l - go_up = k - line_down = Down - line_up = Up - new_tab = t - new_window = n - next_tab = Tab - paste = v - search = f split_horiz = i split_vert = s + close_term = w + paste = v + search = f + line_up = Up + line_down = Down + close_window = w + next_tab = Tab ungroup_all = g ungroup_tab = u - zoom_in = equal - zoom_normal = plus - zoom_out = minus + new_window = n + edit_tab_title = F2 + edit_terminal_title = F2 +[profiles] + [[default]] + visible_bell = True + background_color = "#002b36" + background_darkness = 0.89 + background_type = transparent + cursor_color = "#aaaaaa" + font = PragmataPro Mono Liga 12 + foreground_color = "#839496" + scrollback_infinite = True + palette = "#282828:#cc241d:#98971a:#d79921:#458588:#b16286:#689d6a:#a89984:#928374:#fb4934:#b8bb26:#fabd2f:#83a598:#d3869b:#8ec07c:#ebdbb2" + login_shell = True + use_system_font = False [layouts] [[default]] [[[child0]]] + type = Window + parent = "" + order = 0 + position = 0:25 + maximised = False fullscreen = False + size = 958, 1023 + title = /bin/bash last_active_term = 83e6ff1b-e9c5-4688-af8c-efb0ae56dd94 last_active_window = True - maximised = False - order = 0 - parent = "" - position = 0:18 - size = 1916, 2120 - title = /bin/bash - type = Window [[[terminal1]]] - order = 0 + type = Terminal parent = child0 + order = 0 profile = default - type = Terminal uuid = 83e6ff1b-e9c5-4688-af8c-efb0ae56dd94 [plugins] -[profiles] - [[default]] - background_color = "#002b36" - background_darkness = 0.89 - background_type = transparent - cursor_color = "#aaaaaa" - font = PragmataPro Mono Liga 12 - foreground_color = "#839496" - login_shell = True - palette = "#282828:#cc241d:#98971a:#d79921:#458588:#b16286:#689d6a:#a89984:#928374:#fb4934:#b8bb26:#fabd2f:#83a598:#d3869b:#8ec07c:#ebdbb2" - scrollback_infinite = True - use_system_font = False - visible_bell = True diff --git a/src/.config/vim/.vimrc b/src/.config/vim/.vimrc index 1c19b47..27c6e4e 100644 --- a/src/.config/vim/.vimrc +++ b/src/.config/vim/.vimrc @@ -34,7 +34,7 @@ set noswapfile set backupcopy=yes set autoread set selection=exclusive -set ttimeoutlen=60 +set ttimeoutlen=70 set termguicolors " Use the OS clipboard by default (on versions compiled with `+clipboard`) set clipboard=unnamedplus diff --git a/src/.config/vim/plugins.txt b/src/.config/vim/plugins.txt index 330769d..7dedc91 100644 --- a/src/.config/vim/plugins.txt +++ b/src/.config/vim/plugins.txt @@ -45,3 +45,4 @@ git://github.com/nanotech/jellybeans.vim.git git://github.com/vim-scripts/ecostation.git git://github.com/vim-scripts/rdark.git git://github.com/trevorrjohn/vim-obsidian.git +git://github.com/sotte/presenting.vim.git diff --git a/src/.gitconfig b/src/.gitconfig index 6011ef3..cd3524d 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -1,7 +1,6 @@ [alias] - # View abbreviated SHA, description, and history graph of the latest 20 commits - lo = log --oneline -n 40 --graph --show-signature - l = log --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GS' --abbrev-commit --date=relative --branches + # View abbreviated SHA, description, and history graph + l = log --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GS' --abbrev-commit --date=relative --branches --graph -n 45 # View the current working tree status using the short format s = status -s @@ -19,6 +18,8 @@ # Clone a repository including all submodules c = clone --recursive + cpv = commit -pmv + # Commit all changes ca = !git add -A && git commit -av -S @@ -59,7 +60,6 @@ # Remove branches that have already been merged with master dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" - plog = log --graph --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GF %GS %n' --abbrev-commit --date=relative --branches [diff] # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject @@ -151,6 +151,7 @@ [pull] default = current + ff = only [user] email = adam.veldhousen@liveauctioneers.com diff --git a/src/.gitmessage b/src/.gitmessage index 47db7be..6d16486 100644 --- a/src/.gitmessage +++ b/src/.gitmessage @@ -1,29 +1,19 @@ +# ^ (optional scope): +# common s include: feat, bugfix, chore, ci, docs, style, perf, test, build +# fix: a commit of the type fix patches a bug in your codebase (this correlates with PATCH in Semantic Versioning). +# feat: a commit of the type feat introduces a new feature to the codebase (this correlates with MINOR in Semantic Versioning). +# +# : Capitalized, short (70 chars or less) summary -# ^ [issue #id] [Add/Fix/Remove/Update/Refactor/Document] [summary] ^ - -# Why is it necessary? (Bug fix, feature, improvements?) -# How does the change address the issue? -# What side effects does this change have? - -# Rationale: -# Capitalized, short (80 chars or less) summary -# More detailed explanatory text, if necessary. Wrap it to about 80 -# characters or so. In some contexts, the first line is treated as the -# subject of an email and the rest of the text as the body. The blank -# line separating the summary from the body is critical (unless you omit -# the body entirely); tools like rebase can get confused if you run the -# two together. -# +# ^ [optional body] # Write your commit message in the imperative: "Fix bug" and not "Fixed bug" # or "Fixes bug." This convention matches up with commit messages generated # by commands like git merge and git revert. -# -# Further paragraphs come after blank lines. -# -# - Bullet points are okay, too -# -# - Typically a hyphen or asterisk is used for the bullet, followed by a -# single space, with blank lines in between, but conventions vary here -# -# - Use a hanging indent + +# ^ [optional footer(s)] +# BREAKING CHANGE: a commit that has a footer BREAKING CHANGE:, or appends a ! after the type/scope, introduces a breaking API change (correlating with MAJOR in Semantic Versioning). +# A BREAKING CHANGE can be part of commits of any type. +# footers other than BREAKING CHANGE: may be provided and follow a convention similar to git trailer format. + +# set up the linter @ https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional # Read more @ https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html diff --git a/src/.profile b/src/.profile index 8b2c29c..50b87e4 100644 --- a/src/.profile +++ b/src/.profile @@ -26,3 +26,5 @@ if [ -f "./.motd" ]; then source .motd fi + +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" diff --git a/src/.shell_extensions/aliases.sh b/src/.shell_extensions/aliases.sh index 62fcdbb..fb76ac5 100644 --- a/src/.shell_extensions/aliases.sh +++ b/src/.shell_extensions/aliases.sh @@ -33,7 +33,7 @@ alias week='date +%V' alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date' # IP addresses -alias ip="dig +short myip.opendns.com @resolver1.opendns.com" +alias ipaddr="dig +short myip.opendns.com @resolver1.opendns.com" alias localip="ipconfig getifaddr en0" alias ips="ifconfig -a | grep -o 'inet6\? \(addr:\)\?\s\?\(\(\([0-9]\+\.\)\{3\}[0-9]\+\)\|[a-fA-F0-9:]\+\)' | awk '{ sub(/inet6? (addr:)? ?/, \"\"); print }'" diff --git a/src/.shell_extensions/environment.sh b/src/.shell_extensions/environment.sh index 4a38a3e..1ff2a44 100644 --- a/src/.shell_extensions/environment.sh +++ b/src/.shell_extensions/environment.sh @@ -1,7 +1,7 @@ #!/bin/bash # Bash behavior -shopt -s checkwinsize # Checks window size to get proper line wrapping +shopt -s checkwinsize # Checks window size to get proper line wrapping shopt -s cdspell # Corrects minor spelling errors when cd-ing shopt -s checkjobs # Stops bash from exiting if there are jobs running. A second attempt at exiting will ignore. set -o vi # Set prompt to vi mode @@ -54,6 +54,7 @@ else fi + if [ -d "${HOME}/.config/vim" ] ; then PATH=${HOME}/.config/vim:${PATH} fi diff --git a/src/.shell_extensions/shell_colors.sh b/src/.shell_extensions/shell_colors.sh index b3e118a..5d351b6 100644 --- a/src/.shell_extensions/shell_colors.sh +++ b/src/.shell_extensions/shell_colors.sh @@ -88,8 +88,8 @@ build_prompt_unix(){ local GIT="$(colorize 252 124 ' $(parse_git_branch_or_tag) ')$(colorize 124 240 '$RARS')" local DIR="$(colorize 11 240 ' \w ')$(colorize 240 0 $RARS)" local DEPLOYMENT_NOTIF="" - if [ ! -z "${NODE_ENV}" ]; then - DEPLOYMENT_NOTIF=" (\$NODE_ENV='${NODE_ENV}')" + if [ ! -z "${DEPLOYMENT}" ]; then + DEPLOYMENT_NOTIF=" (DEPLOYMENT='${DEPLOYMENT}')" fi local LEFT="$TIME$USER$GIT$DIR\033[0;0m$DEPLOYMENT_NOTIF"