diff options
author | Blaise Thompson <blaise@untzag.com> | 2018-01-06 14:24:46 -0600 |
---|---|---|
committer | Blaise Thompson <blaise@untzag.com> | 2018-01-06 14:24:46 -0600 |
commit | d26f786740de8edf82458c439fd81a60cd5061c7 (patch) | |
tree | 60bd7c4302f91ede1b02ca130f526743bebe4db2 | |
parent | 0732e043deaa65768e0c151d5f16bcf7caff1f97 (diff) | |
parent | 02598be9d73f6ba4f2f71c49c0c923d79485605f (diff) |
Merge branch 'master' of github.com:untzag/dotfiles
-rw-r--r-- | i3/config | 1 | ||||
-rwxr-xr-x | install.sh | 2 | ||||
-rwxr-xr-x | link.sh | 3 | ||||
-rw-r--r-- | password-store/.gpg-id | 1 | ||||
-rw-r--r-- | password-store/AlcoholEdu/password.gpg | bin | 332 -> 0 bytes | |||
-rw-r--r-- | password-store/AlcoholEdu/username.gpg | bin | 340 -> 0 bytes | |||
l--------- | password-store/password-store | 1 |
7 files changed, 3 insertions, 5 deletions
@@ -195,3 +195,4 @@ hide_edge_borders both exec insync start exec xset s off -dpms +exec xset -b # never beep @@ -26,6 +26,8 @@ install imagemagick install scrot install insync install ranger +install tree +install aspell install aspell-en # i3 @@ -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 Binary files differdeleted file mode 100644 index 6c4eeb7..0000000 --- a/password-store/AlcoholEdu/password.gpg +++ /dev/null diff --git a/password-store/AlcoholEdu/username.gpg b/password-store/AlcoholEdu/username.gpg Binary files differdeleted file mode 100644 index 236f931..0000000 --- a/password-store/AlcoholEdu/username.gpg +++ /dev/null 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 |