diff --git a/src/.config/dunst/dunstrc b/src/.config/dunst/dunstrc index 39df8dd..f8eda63 100644 --- a/src/.config/dunst/dunstrc +++ b/src/.config/dunst/dunstrc @@ -42,7 +42,7 @@ # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). - transparency = 25 + transparency = 10 # The height of the entire notification. If the height is smaller # than the font height and padding combined, it will be raised @@ -65,7 +65,7 @@ frame_width = 3 # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" + frame_color = "#222" # Define a color for the separator. # possible values are: @@ -86,7 +86,7 @@ ### Text ### - font = Arial 16 + font = Arial 10 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. @@ -152,7 +152,7 @@ stack_duplicates = true # Hide the count of merged notifications with the same content - hide_duplicate_count = false + hide_duplicate_count = true # Display indicators for URLs (U) and actions (A). show_indicators = yes @@ -189,7 +189,7 @@ always_run_script = true # Define the title of the windows spawned by dunst - title = Dunst + title = Alert # Define the class of the windows spawned by dunst class = Dunst @@ -197,7 +197,7 @@ # Print a notification on startup. # This is mainly for error detection, since dbus (re-)starts dunst # automatically after a crash. - startup_notification = false + startup_notification = true ### Legacy @@ -247,22 +247,22 @@ # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. background = "#222222" - foreground = "#888888" + foreground = "#dfdfdf" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #icon = /path/to/icon [urgency_normal] - background = "#285577" - foreground = "#ffffff" + background = "#222222" + foreground = "#dfdfdf" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #icon = /path/to/icon [urgency_critical] - background = "#900000" - foreground = "#ffffff" - frame_color = "#ff0000" + background = "#222222" + foreground = "#dfdfdf" + frame_color = "#bd2c40" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable #icon = /path/to/icon diff --git a/src/.config/i3/config b/src/.config/i3/config index c102afd..c7edbf6 100644 --- a/src/.config/i3/config +++ b/src/.config/i3/config @@ -25,7 +25,7 @@ exec_always --no-startup-id nitrogen --head=0 --save --set-scaled ~/Pictures/Wal exec_always --no-startup-id spotify-slack-status -token $SLACK_TOKEN # start dunst for custom notification popups -# exec --no-startup-id dunst -config ~/.config/dunst/dunstrc & +exec --no-startup-id ~/.config/i3/dunst.sh ############################# # BINDINGS diff --git a/src/.config/i3/dunst.sh b/src/.config/i3/dunst.sh new file mode 100755 index 0000000..ce7f96b --- /dev/null +++ b/src/.config/i3/dunst.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +killall -q dunst +while pgrep -x dunst >/dev/null; do sleep 0.1; done + +dunst -config ~/.config/dunst/dunstrc diff --git a/src/.config/i3/lock.sh b/src/.config/i3/lock.sh new file mode 100755 index 0000000..bb79806 --- /dev/null +++ b/src/.config/i3/lock.sh @@ -0,0 +1,6 @@ +#!/bin/bash +i3lock-fancy -f 'Pragmata Pro' -t 'Type Password To Unlock'; + +if [ "$1" = "SUSPEND" ]; then + systemctl suspend; +if diff --git a/src/.config/i3/polybar.sh b/src/.config/i3/polybar.sh index d3c55d9..69ada53 100755 --- a/src/.config/i3/polybar.sh +++ b/src/.config/i3/polybar.sh @@ -1,6 +1,6 @@ #!/bin/bash killall -q polybar -while pgrep -x polybar >/dev/null; do sleep 0.1; done +while pgrep -x polybar > /dev/null; do sleep 0.1; done PRIMARY=$(xrandr | grep primary | awk '{ print $1 }') MONITOR=${PRIMARY} polybar 1080p-bottom & diff --git a/src/.config/i3/setup_external_displays.sh b/src/.config/i3/setup_external_displays.sh index 28066e2..b8505ff 100755 --- a/src/.config/i3/setup_external_displays.sh +++ b/src/.config/i3/setup_external_displays.sh @@ -1,21 +1,22 @@ #!/bin/bash PRIMARY=$(xrandr | grep primary | awk '{ print $1 }') -SECONDARY=$(xrandr | grep "DVI.*disconnected" | awk '{ print $1 }') -BACKGROUND=${BG:~/Pictures/Wallpapers/retro.jpg} +SECONDARY=$(xrandr | grep "DVI.*" | awk '{ print $1 }') +BACKGROUND=~/Pictures/Wallpapers/retro.jpg if [ "$1" = "CONNECT" ]; then - xrandr --output ${SECONDARY} --auto --above ${PRIMARY} --dpi 165 --filter bilinear; - nitrogen --head=1 --save --set-scaled ${BACKGROUND}; + xrandr --output ${SECONDARY} --auto --above ${PRIMARY} --dpi 165; + nitrogen --head=1 --save --set-scaled "${BACKGROUND}"; elif [ "$1" = "DISCONNECT" ]; then xrandr --output ${SECONDARY} --off; elif [ "$1" = "RECONNECT_PRIMARY" ]; then xrandr --output ${PRIMARY} --off; else + set +x; exit -1; fi -sleep 1; -xrandr --output ${PRIMARY} --auto --primary --preferred --filter bilinear; +sleep .5; +xrandr --output ${PRIMARY} --auto --primary --preferred --dpi 100 --filter bilinear; nitrogen --head=0 --save --set-scaled ${BACKGROUND}; diff --git a/src/.shell_extensions/aliases.sh b/src/.shell_extensions/aliases.sh index 98bdb2a..62fcdbb 100644 --- a/src/.shell_extensions/aliases.sh +++ b/src/.shell_extensions/aliases.sh @@ -6,7 +6,7 @@ alias pd="pushd $1" alias tx="tmux -f ~/.config/tmux/.tmux.conf" # list files -alias ll='ls -hGla' +alias ll='ls -hGla --color' #rake alias bake='bundle exec rake' diff --git a/src/.shell_extensions/environment.sh b/src/.shell_extensions/environment.sh index afa7179..4a38a3e 100644 --- a/src/.shell_extensions/environment.sh +++ b/src/.shell_extensions/environment.sh @@ -77,7 +77,6 @@ case "$TERM" in esac - # http://stackoverflow.com/questions/410616/increasing-the-maximum-number-of-tcp-ip-connections-in-linux # run these to increase concurrent connections in linux # sudo sysctl net.ipv4.ip_local_port_range="18000 61000" diff --git a/src/.shell_extensions/shell_colors.sh b/src/.shell_extensions/shell_colors.sh index 3762715..b3e118a 100644 --- a/src/.shell_extensions/shell_colors.sh +++ b/src/.shell_extensions/shell_colors.sh @@ -3,7 +3,6 @@ # If not running interactively, don't do anything [ -z "$PS1" ] && return - RED="\033[0;31m" YELLOW="\033[0;33m" GREEN="\033[0;32m" @@ -88,7 +87,12 @@ build_prompt_unix(){ local USER="$(colorize 15 34 ' \u@\h ')$(colorize 34 124 $RARS)" 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 LEFT="$TIME$USER$GIT$DIR\033[0;0m" + local DEPLOYMENT_NOTIF="" + if [ ! -z "${NODE_ENV}" ]; then + DEPLOYMENT_NOTIF=" (\$NODE_ENV='${NODE_ENV}')" + fi + + local LEFT="$TIME$USER$GIT$DIR\033[0;0m$DEPLOYMENT_NOTIF" echo "$LEFT" } @@ -107,6 +111,7 @@ print_prompt(){ PS1=$(printf "%*s\r%s\n$EMPTY\$$GRAY" "$(($(tput cols) - ${compensate}))" "$RIGHT" "$LEFT") } + # looks like the following: # [hh:mm] username@host (git branch || svn revision) ~/working/directory # $