X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=install.sh;h=66f5fdb622992737b372405c888cde9f85c7ad50;hb=026d4e8596a1f0f67ca38793025c146c9252f801;hp=683be200fc7e24ff1f1867368d3e8094a8faaa03;hpb=5c03e6e91441c2a3018adba7c1b2624cbdb5f18b;p=dotfiles.git

diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index 683be20..66f5fdb
--- a/install.sh
+++ b/install.sh
@@ -1,22 +1,20 @@
-#!/bin/bash
-ln -s /home/marlub/documents/scripts/dotfiles/.bashrc ~/.bashrc
-ln -s /home/marlub/documents/scripts/dotfiles/.gitconfig /home/marlub/.gitconfig
-ln -s /home/marlub/documents/scripts/dotfiles/.Xresources .
-ln -s /home/marlub/documents/scripts/dotfiles/.Xresources /home/marlub/.Xresources
-ln -s /home/marlub/documents/scripts/dotfiles/.vimrc /home/marlub/.vimrc
-ln -s /home/marlub/documents/scripts/dotfiles/.notmuch-config /home/marlub/.notmuch-config
-ln -s /home/marlub/documents/scripts/dotfiles/.inputrc /home/marlub/.inputrc
-ln -s /home/marlub/documents/scripts/dotfiles/.i3/bar ~/.i3/bar
-ln -s /home/marlub/documents/scripts/dotfiles/.i3/bg ~/.i3/bg
-ln -s /home/marlub/documents/scripts/dotfiles/.i3/config ~/.i3/config
-ln -s /home/marlub/documents/scripts/dotfiles/.i3/screen.sh ~/.i3/screen.sh
-ln -s /home/marlub/documents/scripts/dotfiles/.vim /home/marlub/.vim
+# Set keymaps
+sudo localectl set-x11-keymap --no-convert dvorak,ru pc104 ,phonetic_dvorak grp:shifts_toggle,compose:ralt
+sudo localectl set-keymap --no-convert dvorak
 
-mkdir /home/marlub/.mutt
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/addressbook.py /home/marlub/.mutt/addressbook.py
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/crypto.muttrc /home/marlub/.mutt/colors.muttrc
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/muttrc /home/marlub/.mutt/crypto.muttrc
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/offlineimap.py /home/marlub/.mutt/muttrc
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/offlineimap.py /home/marlub/.mutt/offlineimap.py
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/offlineimaprc /home/marlub/.mutt/offlineimaprc
-ln -s /home/marlub/documents/scripts/dotfiles/.mutt/signature /home/marlub/.mutt/signature
+# Link the dotfiles
+hf=(.bashrc .gitconfig .inputrc .toprc
+.xinitrc .Xresources
+.vim .vimrc
+.mutt/mailcap .mutt/msmtprc .mutt/muttrc
+.mutt/offlineimap.py .mutt/offlineimaprc .mutt/notmuch-config 
+.config/i3/config .config/i3status/config
+.newsbeuter/config
+.config/khal/khal.conf
+.config/khard/khard.conf
+.config/vdirsyncer/config)
+for f in ${hf[*]}
+do
+	unlink "$HOME/$f" || true
+	ln -vs "$PWD/$f" "$HOME/$f"
+done