rice

commit 241fd522eedd4da5e9175e47df7cfdafe75b008c
parent 99b6eaeac2b1ba71dd916085088a9e13956237c9
Author: Mark Feller <mjfeller1992@gmail.com>
Date:   Mon, 25 May 2020 11:10:03 -0600

fix some merge issues

Diffstat:
M
dots/.config/zsh/.zshrc
 | 
2
+-
D
dots/.local/share/applications/.keep
 | 
0

M
install
 | 
14
+++++++++-----

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dots/.config/zsh/.zshrc b/dots/.config/zsh/.zshrc
@@ -3,7 +3,7 @@ source $HOME/.config/zsh/fzf.zsh
 source $HOME/.config/zsh/kubernetes.zsh
 source $HOME/.config/zsh/terraform.zsh
 source $HOME/.config/zsh/gcloud.zsh
-source $HOME/.config/aliases
+source $HOME/.config/aliasrc
 
 # oh my zsh plugins
 plugins=(
diff --git a/dots/.local/share/applications/.keep b/dots/.local/share/applications/.keep
diff --git a/install b/install
@@ -8,15 +8,19 @@ shared() {
     cp -rv dots/.config/ncmpcpp   $HOME/.config
     cp -rv dots/.config/notmuch   $HOME/.config
     cp -rv dots/.config/zsh       $HOME/.config
-    cp -rv dots/.config/aliases   $HOME/.config
+    cp -rv dots/.config/aliasrc   $HOME/.config
     cp -rv dots/.emacs.d          $HOME
     cp -rv dots/.local            $HOME
 }
 
 linux() {
-    cp -rv dots/.config/compton $HOME/.config
-    cp -rv dots/.config/dunst   $HOME/.config
-    cp -rv dots/.config/vis     $HOME/.config
+    cp -rv dots/.config/compton       $HOME/.config
+    cp -rv dots/.config/dunst         $HOME/.config
+    cp -rv dots/.config/vis           $HOME/.config
+    cp -rv dots/.config/mimeapps.list $HOME/.config
+    cp -rv dots/.xinitrc  $HOME
+    cp -rv dots/.xprofile $HOME
+    cp -rv dots/.zprofile $HOME
 }
 
 macos() {
@@ -25,4 +29,4 @@ macos() {
     cp -rv dots/.config/alacritty $HOME/.config
 }
 
-macos
+$@