some more cleanup/tweaking

README.md

@@ -6,5 +6,14 @@ My custom config files and rcs.
 Installation
 ------------
 
-Inside the repository you can run `install` to place the configs in `~`
+Inside the repository you can run `installrc` to place the configs in `~`
 and install some packages for an i3 desktop.
+
+Modifications
+-------------
+
+Depending on your system, you'll likely want to tune the below items to your needs.
+
+* `config/i3/display.sh` - I recommend `arandr` to manage this file.
+* `config/i3/{lock.png, wallpaper.png}` - choose a different wallpaper
+* `config/i3/config` - Update to call your preferred programs.

bashrc

@@ -18,7 +18,7 @@
 #
 export EDITOR='vim'
 export LANG=en_US.utf8
-export HISTIGNORE="&:[ ]*:ls:ls -a:cd:cd .."    # leave commands out of history log
+export HISTIGNORE="&:[ ]*:ls:ls -a:cd:cd ..:ll"    # leave commands out of history log
 export HISTCONTROL='ignoredups'
 export HISTSIZE=5000
 export HISTFILESIZE=5000
@@ -36,7 +36,7 @@ SSH_ENV="$HOME/.ssh/agent-environment"
 start_agent() {
     /usr/bin/ssh-agent | sed 's/^echo/#echo/' >"$SSH_ENV"
     chmod 600 "$SSH_ENV"
-    . {$SSH_ENV} >/dev/null
+    . $SSH_ENV >/dev/null
     /usr/bin/ssh-add;
 }
 
@@ -99,19 +99,18 @@ alias ..='echo "cd .."; cd ..'
 alias ag='rg' # sorry silver searcher
 alias chomd='chmod'
 alias curl='curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
-alias externalip='curl -sS https://www.daveeddy.com/ip'
+alias externalip='curl -sS https://api.ipify.org'
 alias gerp='grep'
-alias hl='rg --passthru'
-alias ls='ls --color=auto'                                 # ls colored output
-alias grep='grep --color=auto'                              # grep colored output
-alias l='ls'
-alias ll='ls -lrtha'
-alias suod='sudo'
 alias gl='git log -p'
-alias wget='wget --user-agent="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
+alias grep='grep --color=auto'                              # grep colored output
+alias hl='rg --passthru'
+alias l='ls'
+alias ll='ls -lrth'
+alias ls='ls --color=auto'                                 # ls colored output
+alias suod='sudo'
 alias vrd='VAULT_UI=true VAULT_REDIRECT_ADDR=http://127.0.0.1:8200 vault server -log-level=trace -dev -dev-root-token-id=root'
+alias wget='wget --user-agent="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
 # Git Aliases
-alias nb='git checkout -b "$USER-$(date +%s)"' # new branch
 alias ga='git add . --all'
 alias gb='git branch'
 alias gc='git clone'
@@ -126,6 +125,7 @@ alias gr='git rev-parse --show-toplevel' # git root
 alias gs='git status'
 alias gt='git tag'
 alias gu='git pull' # gu = git update
+alias nb='git checkout -b "$USER-$(date +%s)"' # new branch
 
 # Prompt
 # Store `tput` colors for future use to reduce fork+exec
@@ -265,7 +265,7 @@ mkiso() {
     mkisofs -V $2 -J -r $1 -o isoimage.iso
 }
 
-
+# Functions below this line come from github.com/bahamas10/dotfiles
 # because `master` is sometimes `main` (or others), these must be functions.
 gmb() { # git main branch
 	local main

config/i3/config

@@ -10,23 +10,29 @@ floating_modifier $super
 
 
 # autostart
-exec --no-startup-id eval $(gnome-keyring-daemon -s)
+exec --no-startup-id eval $(gnome-keyring-daemon -s -d -c pkcs11,secrets,ssh)
 exec --no-startup-id hsetroot -fill ~/.config/i3/wallpaper.png
 exec --no-startup-id ~/.config/i3/display.sh
+exec --no-startup-id xfce4-power-manager &
+exec --no-startup-id unclutter &
 exec --no-startup-id redshift-gtk &
 exec --no-startup-id nm-applet &
+exec --no-startup-id nextcloud &
 exec --no-startup-id signal-desktop --password-store=gnome-libsecret &
+exec --no-startup-id xautolock -locker i3lock-fancy -time 5 &
 
 # start a terminal
 bindsym $super+Return exec i3-sensible-terminal
 
 # start dmenu (a program launcher)
-bindsym $super+d exec i3-dmenu-desktop --dmenu="dmenu -i -b \
+# bindsym $super+d exec i3-dmenu-desktop --dmenu="dmenu -i -b \
--fn 'Poppins:size=9' -nb '#141c21' -nf '#93a1a1' \
+# -fn 'Poppins:size=9' -nb '#141c21' -nf '#93a1a1' \
--sb '#289c93' -sf '#141c21'"
+# -sb '#289c93' -sf '#141c21'"
+bindsym $super+d exec rofi -show drun
 
 # common apps keybinds
 bindsym Print exec scrot 'screen_%a-%d%b%y_%H.%M.png' -e 'xdg-open ~/$f'
+bindsym $super+p exec xfce4-screenshooter -r -o xdg-open
 bindsym $super+l exec i3lock -i ~/.config/i3/lock.png
 bindsym $super+w exec x-www-browser
 bindsym $super+e exec thunar

htoprc

@@ -1,4 +1,4 @@
-# Dave eddy htoprc
+# Shane Peters htoprc
 fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=46
 sort_direction=1

screenrc

@@ -1,4 +1,4 @@
-# Dave Eddy <dave@daveeddy.com>
+# Shane Peters <shane@shaner.life>
 
 termcapinfo xterm* ti@:te@
 

tmux.conf

@@ -47,7 +47,7 @@ set -g set-titles-string "#I:#W"
 set-window-option -g monitor-activity on
 
 # don't rename windows automatically
-#set-window-option -g automatic-rename off
+set-window-option -g automatic-rename off
 
 ######################
 ### DESIGN CHANGES ###

xinitrc

@@ -5,20 +5,11 @@
 #--      CC BY-SA 3.0     --
 #---------------------------
 
-# numlock
-numlockx &
-
 # Merge custom X resources
 if [ -f $HOME/.Xresources ]; then
   xrdb -merge ~/.Xresources
 fi
 
-# volumeicon
-volumeicon &
-
-# clipboard mabager
-greenclip daemon &
-
 # xfce power manager
 xfce4-power-manager &
 
@@ -26,25 +17,13 @@ xfce4-power-manager &
 xautolock -locker i3lock-fancy -time 10 &
 
 # connection manager
-wicd-client --tray &
+nm-applet &
-
-# backlight setting
-xbacklight -set 50
-
-# http://unix.stackexchange.com/a/295652/88209
-source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
-
-# set xxkbmap before to apply custom keyboard mapping
-setxkbmap it
 
 # custom keyboard mapping
 if [ -f $HOME/.Xmodmap ]; then
     /usr/bin/xmodmap $HOME/.Xmodmap
 fi
 
-# single press of control to escape https://github.com/alols/xcape
-xcape -e 'Control_L=Escape'
-
 # hide unused mouse
 unclutter &
 
@@ -52,17 +31,5 @@ unclutter &
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
-# geoclue agent
-/usr/lib/geoclue-2.0/demos/agent &
-
-# qt5ct theming
-export QT_QPA_PLATFORMTHEME=qt5ct
-
-# workrave
-workrave &
-
-# check monitors status and set monitor setup
-autorandr -c
-
 # wm
-exec /usr/bin/awesome
+exec /usr/bin/i3