summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaise Thompson <blaise@untzag.com>2018-01-06 14:24:46 -0600
committerBlaise Thompson <blaise@untzag.com>2018-01-06 14:24:46 -0600
commitd26f786740de8edf82458c439fd81a60cd5061c7 (patch)
tree60bd7c4302f91ede1b02ca130f526743bebe4db2
parent0732e043deaa65768e0c151d5f16bcf7caff1f97 (diff)
parent02598be9d73f6ba4f2f71c49c0c923d79485605f (diff)
Merge branch 'master' of github.com:untzag/dotfiles
-rw-r--r--i3/config1
-rwxr-xr-xinstall.sh2
-rwxr-xr-xlink.sh3
-rw-r--r--password-store/.gpg-id1
-rw-r--r--password-store/AlcoholEdu/password.gpgbin332 -> 0 bytes
-rw-r--r--password-store/AlcoholEdu/username.gpgbin340 -> 0 bytes
l---------password-store/password-store1
7 files changed, 3 insertions, 5 deletions
diff --git a/i3/config b/i3/config
index 669fe3b..4646f35 100644
--- a/i3/config
+++ b/i3/config
@@ -195,3 +195,4 @@ hide_edge_borders both
exec insync start
exec xset s off -dpms
+exec xset -b # never beep
diff --git a/install.sh b/install.sh
index 97aa64c..64d95b8 100755
--- a/install.sh
+++ b/install.sh
@@ -26,6 +26,8 @@ install imagemagick
install scrot
install insync
install ranger
+install tree
+install aspell
install aspell-en
# i3
diff --git a/link.sh b/link.sh
index 341b721..e0792ef 100755
--- a/link.sh
+++ b/link.sh
@@ -17,9 +17,6 @@ for f in $files; do
ln -s $dir/$f ~/.$name
done
-# password-store
-ln -sf ~/dotfiles/password-store ~/.password-store
-
# i3
ln -sf ~/dotfiles/i3/config ~/.config/i3/config
ln -sf ~/dotfiles/i3/lock.sh ~/.config/i3/lock.sh
diff --git a/password-store/.gpg-id b/password-store/.gpg-id
deleted file mode 100644
index c58e4d0..0000000
--- a/password-store/.gpg-id
+++ /dev/null
@@ -1 +0,0 @@
-093CC218
diff --git a/password-store/AlcoholEdu/password.gpg b/password-store/AlcoholEdu/password.gpg
deleted file mode 100644
index 6c4eeb7..0000000
--- a/password-store/AlcoholEdu/password.gpg
+++ /dev/null
Binary files differ
diff --git a/password-store/AlcoholEdu/username.gpg b/password-store/AlcoholEdu/username.gpg
deleted file mode 100644
index 236f931..0000000
--- a/password-store/AlcoholEdu/username.gpg
+++ /dev/null
Binary files differ
diff --git a/password-store/password-store b/password-store/password-store
deleted file mode 120000
index 3a9c8ff..0000000
--- a/password-store/password-store
+++ /dev/null
@@ -1 +0,0 @@
-/home/blaise/dotfiles/password-store \ No newline at end of file