aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenj <benj@rse8.com>2020-03-27 18:06:57 -0700
committerbenj <benj@rse8.com>2020-03-27 18:06:57 -0700
commit447505fe5248a17fcc060a70805b53b2e6bd2f5a (patch)
tree319328bb4fbc89b71ff51370862496a2166641d8
parent252c76e268f720fc6a4afcd6523d0f1d8674b547 (diff)
downloadsetup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar.gz
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar.bz2
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar.lz
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar.xz
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.tar.zst
setup-447505fe5248a17fcc060a70805b53b2e6bd2f5a.zip
i3 auracle check, bash history line length
Diffstat (limited to '')
-rw-r--r--.bashrc8
-rwxr-xr-xdes/i3/i3blocks/scripts/archupdates2
-rwxr-xr-xdes/i3/i3lock.sh2
-rwxr-xr-xscripts/format_displays.sh24
4 files changed, 22 insertions, 14 deletions
diff --git a/.bashrc b/.bashrc
index cc66b9f..cb46670 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,9 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
+# History size
+HISTSIZE=1000000
+
# generic setup
function parse_git_branch () {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
@@ -71,7 +74,7 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
alias ls='ls --color=auto'
# Setup keychain
- /usr/bin/keychain $HOME/.ssh/id_rsa $HOME/.ssh/id_ed25519 $HOME/.ssh/nido_id_ed25519
+ /usr/bin/keychain $HOME/.ssh/id_rsa $HOME/.ssh/id_ed25519 $HOME/.ssh/imagine_id_rsa $HOME/.ssh/nido_id_ed25519
/usr/bin/keychain --agents gpg AE38865D
. $HOME/.keychain/${HOSTNAME}-sh
. $HOME/.keychain/${HOSTNAME}-sh-gpg
@@ -96,3 +99,6 @@ source /usr/local/arcanist/resources/shell/bash-completion
source ~/.setup/.bashrc.local
complete -C /usr/bin/vault vault
+complete -C /usr/bin/aws_completer aws
+complete -C /usr/bin/terraform terraform
+alias please='python ~/workspace/imagine/infrastructure/scripts/please/please.py'
diff --git a/des/i3/i3blocks/scripts/archupdates b/des/i3/i3blocks/scripts/archupdates
index c07c45f..52538b0 100755
--- a/des/i3/i3blocks/scripts/archupdates
+++ b/des/i3/i3blocks/scripts/archupdates
@@ -1,7 +1,7 @@
#!/usr/bin/bash
PAC_UPDATES=$(checkupdates | wc -l)
-AUR_UPDATES=$(cower -u | wc -l)
+AUR_UPDATES=$(auracle sync -q | wc -l)
if [[ $PAC_UPDATES -gt 0 || $AUR_UPDATES -gt 0 ]]; then
echo " [$PAC_UPDATES .. $AUR_UPDATES]"
diff --git a/des/i3/i3lock.sh b/des/i3/i3lock.sh
index 39bd8da..7af16b1 100755
--- a/des/i3/i3lock.sh
+++ b/des/i3/i3lock.sh
@@ -2,5 +2,5 @@
IMG="~/.setup/des/i3/assets/wallpaper/yosemite_color_block.png"
-xautolock -time 1 -locker "i3lock -i $IMG" -notify 20 -notifier 'xset dpms force off' &
+xautolock -time 1 -locker "i3lock -i $IMG" -notify 1 -notifier 'xset dpms force off' &
xautolock -time 10 -locker "systemctl suspend" &
diff --git a/scripts/format_displays.sh b/scripts/format_displays.sh
index acb2638..ce998b7 100755
--- a/scripts/format_displays.sh
+++ b/scripts/format_displays.sh
@@ -42,6 +42,7 @@ EDP_1=${DISP_RES["eDP-1"]}
DP_1=${DISP_RES["DP-1"]}
DP_2=${DISP_RES["DP-2"]}
HDMI_1=${DISP_RES["HDMI-1"]}
+HDMI_2=${DISP_RES["HDMI-2"]}
if [ -n "$EDP_1" ]; then
# if no other displays are set, then we bring all windows into eDP-1
@@ -54,9 +55,10 @@ if [ -n "$EDP_1" ]; then
fi
fi
-if [ -n "$DP_1" ]; then
- if_echo "Found DP-1. Setting DP-1 above primary display (eDP-1)"
- xrandr --output DP-1 --mode "$DP_1" --above eDP-1
+# Add this to make my work computer display work with HDMI2
+if [ -n "$HDMI_2" ]; then
+ if_echo "Found HDMI-2. Setting HDMI-2 above primary display (eDP-1)"
+ xrandr --output HDMI-2 --mode "$HDMI2" --above eDP-1
fi
if [[ -n "$DP_2" && -n "$DP_1" ]]; then
@@ -67,16 +69,16 @@ elif [[ -n "$DP_2" ]]; then
xrandr --output DP-2 --mode "$DP_2" --above eDP-1
fi
-if [[ -n "$HDMI_1" && -n "$DP_2" && "$DP_1" ]]; then
- if_echo "Found HDMI-1. Setting it right of DP-2"
- xrandr --output HDMI-1 --mode "$HDMI_1" --right-of DP-2
-elif [[ -n "$HDMI_1" && ( "$DP_2" || "$DP_1" ) ]]; then
+if [[ -n "$HDMI_2" && -n "$DP_2" && "$DP_1" ]]; then
+ if_echo "Found HDMI-2. Setting it right of DP-2"
+ xrandr --output HDMI-2 --mode "$HDMI_2" --right-of DP-2
+elif [[ -n "$HDMI_2" && ( "$DP_2" || "$DP_1" ) ]]; then
if [ -n "$DP_2" ]; then
- if_echo "Found HDMI-1 and DP-2 but not DP-1. Setting HDMI-1 right of DP-2"
- xrandr --output HDMI-1 --mode "$HDMI_1" --right-of DP-2
+ if_echo "Found HDMI-2 and DP-2 but not DP-1. Setting HDMI-2 right of DP-2"
+ xrandr --output HDMI-2 --mode "$HDMI_2" --right-of DP-2
else
- if_echo "Found HDMI-1 and DP-1 but not DP-2. Setting HDMI-1 right of DP-1"
- xrandr --output HDMI-1 --mode "$HDMI_1" --right-of DP-1
+ if_echo "Found HDMI-2 and DP-1 but not DP-2. Setting HDMI-2 right of DP-1"
+ xrandr --output HDMI-2 --mode "$HDMI_2" --right-of DP-1
fi
fi