aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bash/.bash/00-global.bash2
-rw-r--r--bash/.bash/01-aliases.bash6
-rw-r--r--bash/.bash/02-prompt.bash2
-rw-r--r--bash/.bash/03-boot.bash2
-rw-r--r--bash/.bash/04-other.bash2
-rw-r--r--bash/.bash_profile2
-rw-r--r--bash/.bashrc6
m---------dwm0
-rw-r--r--firefox/userChrome.css7
-rw-r--r--vim/.vimrc1
-rw-r--r--x/.xinitrc2
-rw-r--r--x/.xinitrc-not-docked6
12 files changed, 19 insertions, 19 deletions
diff --git a/bash/.bash/00-global.bash b/bash/.bash/00-global.bash
index 5ad99f7..1700755 100644
--- a/bash/.bash/00-global.bash
+++ b/bash/.bash/00-global.bash
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# 00-global.bash
# define global bash things
diff --git a/bash/.bash/01-aliases.bash b/bash/.bash/01-aliases.bash
index a3818cf..b0d4060 100644
--- a/bash/.bash/01-aliases.bash
+++ b/bash/.bash/01-aliases.bash
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# 01-aliases.bash
# bryson's bash aliases
@@ -63,11 +63,11 @@ alias nolibrary='xrandr --output HDMI-A-0 --off --output eDP --auto'
# bash navigation
alias add-alias='vim ~/.bash/01-aliases.bash; . ~/.bash_profile'
-function search() {
+search() {
find . -type f -exec grep ${1} {} \;
}
-function ssh-pixel() {
+sshpixel() {
ssh -p 8022 uO_14O@${1}
}
diff --git a/bash/.bash/02-prompt.bash b/bash/.bash/02-prompt.bash
index 62f835a..603b292 100644
--- a/bash/.bash/02-prompt.bash
+++ b/bash/.bash/02-prompt.bash
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# 02-prompt.bash
# bryson's gnarly bash prompt config
diff --git a/bash/.bash/03-boot.bash b/bash/.bash/03-boot.bash
index 6ea2c9d..c821a28 100644
--- a/bash/.bash/03-boot.bash
+++ b/bash/.bash/03-boot.bash
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# 03-boot.bash
# startup scripts for systems
diff --git a/bash/.bash/04-other.bash b/bash/.bash/04-other.bash
index ac59c89..ec258e1 100644
--- a/bash/.bash/04-other.bash
+++ b/bash/.bash/04-other.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
# if [[ -z $TMUX ]] && [[ -n $SSH_TTY ]]; then
# exec tmux new-session -A -s ssh
# fi
diff --git a/bash/.bash_profile b/bash/.bash_profile
index 7ec459d..c5cb988 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,3 +1,4 @@
+#!/bin/bash
# .bash_profile
PATH=$PATH:$HOME/.local/bin:$HOME/bin:$HOME/.cargo/bin
@@ -13,4 +14,5 @@ fi
export PATH
complete -cf doas
export PATH=$PATH:/home/bryson/.spicetify
+export EDITOR=/usr/bin/vim
#source "/home/bryson/git/emsdk/emsdk_env.sh"
diff --git a/bash/.bashrc b/bash/.bashrc
index c267237..3187d52 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,6 +1,8 @@
+#!/bin/bash
+
# get custom bash scripts
-if [[ -d ~/.bash/ ]]; then
- for f in ~/.bash/*; do source $f; done
+if [ -d ~/.bash/ ]; then
+ for f in ~/.bash/*; do . $f; done
fi
# install asdf
diff --git a/dwm b/dwm
-Subproject 7516b03d7d3c7844ebdab69cf731d59ea2b3c84
+Subproject c5738de01d3c8adccaf87842cd6efceafd795d9
diff --git a/firefox/userChrome.css b/firefox/userChrome.css
deleted file mode 100644
index 8e3ab5d..0000000
--- a/firefox/userChrome.css
+++ /dev/null
@@ -1,7 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-menupopup:not(.in-menulist){ --menu-color: var(--arrowpanel-color,white) !important; }
-
-menupopup {
- --panel-padding: 5px 0 !important;
-}
diff --git a/vim/.vimrc b/vim/.vimrc
index ee91e09..1a88791 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -63,6 +63,7 @@ nnoremap <leader>w :w<CR>
nnoremap <leader>q :q<CR>
nnoremap <leader>! :q!<CR>
nnoremap <leader>x :wq<CR>
+nnoremap <leader>b :e#<CR>
nnoremap <leader>h :wincmd h<CR>
nnoremap <leader>j :wincmd j<CR>
nnoremap <leader>k :wincmd k<CR>
diff --git a/x/.xinitrc b/x/.xinitrc
index d1e2ace..b69dd4c 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -65,7 +65,7 @@ xbanish &
numlockx &
# start keepassxc for passwords
-keepassxc &
+keepassxc ~/.passwords/Passwords.kdbx &
# set up wallpapers
#wallpapers.sh &
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked
index d4d2521..51aa3ae 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-not-docked
@@ -55,7 +55,7 @@ pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
# set up wallpaper
-feh --bg-fill ~/Pictures/Wallpapers/spacesuit-dithered.png
+feh --bg-fill ~/git/wallpapers-exorcist/gruvbox/volcano-landscape.jpg
# apply Xresources
xrdb -merge ~/.Xresources
@@ -64,13 +64,13 @@ xrdb -merge ~/.Xresources
xbanish &
# turn tearfree on
-xrandr --output eDP --auto --set TearFree on &
+xrandr --output eDP --auto --set TearFree on --output HDMI-A-0 --set TearFree on &
# run battery checker
~/bin/battery.pl &
# start keepassxc for passwords
-keepassxc &
+keepassxc ~/.passwords/Passwords.kdbx &
# start dwm
redshift &