vim-plug, script cleanup, more packages

15 files changed, 21 insertions, 91 deletions

diff --git a/Rinstall.sh b/Rinstall.sh
deleted file mode 100755
index 926d52e..0000000
--- a/Rinstall.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-packages="xtable ggplot2 plot3D"
-for f in $packages
-    do
-    sudo R --vanilla -e "install.packages('"$f"', repos='http://cran.us.r-project.org')"
-done
diff --git a/archer.sh b/archer.sh
index e1fe36e..2c8c42d 100755
--- a/archer.sh
+++ b/archer.sh
@@ -16,7 +16,7 @@ sudo pacman -S --noconfirm git base-devel
 cd /tmp
 git clone https://aur.archlinux.org/yay.git /tmp/yay
 cd /tmp/yay
-makepkg -sir 
+makepkg -sir
 
 echo Adding the candy flair to pacman
 sudo echo ILoveCandy >> /etc/pacman.conf
@@ -41,7 +41,8 @@ cd fiche && make && sudo make install
 puburl="$(cat ~/id_rsa.pub | nc termbin.com 9999)"
 printf "You may want to give this computer access to your git server...\n
 	add the newly created public key to your server.\n
-	You can access it here: $puburl"
+	You can access it here: $puburl\n
+	Consider adding this public key to your dropbox account."
 read -p "Press enter to continue"
 
 
@@ -53,9 +54,20 @@ do
 	cd $i && make && sudo make install
 done
 
+echo Setting up vim-Plug - neovim
+sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+nvim +PlugInstall +qall > /dev/null
+
 echo Set dash as the default shell for sh scripts
 sudo rm /usr/bin/sh
-ln -s $(which dash) /usr/bin/sh
+sudo ln -s $(which dash) /usr/bin/sh
+
+echo Enabling Yubikey support in firefox
+sudo cp $dir/70-u2f.rules /etc/udev/rules.d/
+
+echo Setting up time
+sudo timedatectl set-ntp true
 
 echo Setting up the wallpaper
-cp $pwd && cp wall.jpg ~/.config/
+cp $pwd/wall.jpg ~/.cache/wall.png/
diff --git a/candy.sh b/candy.sh
deleted file mode 100755
index f786185..0000000
--- a/candy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-sudo sed -i "s/^#Color/Color/;
-          s/^#TotalDownload/TotalDownload\nILoveCandy/" /etc/pacman.conf
diff --git a/clock.sh b/clock.sh
deleted file mode 100755
index 5ea2938..0000000
--- a/clock.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sudo timedatectl set-ntp true
diff --git a/git-remote-dropbox.sh b/git-remote-dropbox.sh
deleted file mode 100755
index 46ec076..0000000
--- a/git-remote-dropbox.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# This script supposes you have a usb key mounted in /mnt
-# This drive must contain your git-remote-dropbox.json finle in it's root...
-
-mkdir -p $HOME/.config/git
-cp /mnt/git-remote-dropbox.json $HOME/.config/git/git-remote-dropbox.json
-pip install --user git-remote-dropbox
diff --git a/install-packages.sh b/install-packages.sh
deleted file mode 100755
index 6ce857c..0000000
--- a/install-packages.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-packages=$(sed "s/#.*$//; /^$/d" packages.tm)
-yay -S --noconfirm $packages
diff --git a/main.sh b/main.sh
deleted file mode 100755
index 0fdea2a..0000000
--- a/main.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-./candy.sh
-./clock.sh
-./yay.sh
-./install-packages.sh
-./git-remote-dropbox.sh
-./yadm.sh
-./ssh.sh
-./vim-plug.sh
-./spotify.sh
-./zsh.sh
-./Rinstall.sh
-
diff --git a/packages.tm b/packages.tm
index b507d8f..82db5e9 100755
--- a/packages.tm
+++ b/packages.tm
@@ -2,12 +2,17 @@
 
 # Fonts
 nerd-fonts-complete          # Cause you want those nerdy icons everywhere
+spleen-font                  # Monospaced bitmap font
 
 # Desktop Environment
 xorg                         # xorg utilities
 xorg-server
 xorg-xinit
+xwallpaper                   # Wallpaper utility
+xsel                         # Clipboard utility
 picom-rounded-corners        # The good compositor
+flashfocus                   # Flash windows when they gets focused
+sxhkd
 
 # File viewers
 sxiv                         # Simple X Image viewer
@@ -62,7 +67,6 @@ cups                         # Another Printing Dependency
 protonmail-bridge            # Daemon for ProtonMail
 python-ueberzug              # View images in terminal applications
 dropbox                      # Because my life is on dropbox
-xsel                         # Clipboard manager
 networkmanager               # You can read dude...
 network-manager-applet       # Network Manager Applet
 youtube-dl                   # Download youtube videos
diff --git a/spotify.sh b/spotify.sh
deleted file mode 100755
index 5ab01e7..0000000
--- a/spotify.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-cwd=$(pwd)
-git clone https://aur.archlinux.org/spotify.git /tmp/spotify
-cd /tmp/spotify
-sed -i "s/https:\/\/repository-origin/http:\/\/repository/" PKGBUILD
-makepkg -sir --noconfirm --skipinteg
-cd "$cwd"
-
diff --git a/ssh.sh b/ssh.sh
deleted file mode 100755
index 5d49d2e..0000000
--- a/ssh.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-ssh-keygen -b 4096 -t rsa -f $HOME/.ssh/id_rsa -q -N ""
-cat $HOME/.ssh/id_rsa.pub | xsel -b && notify-send "New ssh key copied to clipboard"
-$BROWSER https://github.com/settings/keys
-
-
diff --git a/st.sh b/st.sh
deleted file mode 100755
index 1f5a8be..0000000
--- a/st.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cwd=$(pwd)
-mkdir -p $HOME/Compilation
-git clone https://github.com/ChausseBenjamin/st.git $HOME/Compilation/st
-cd $HOME/Compilation/st
-make && sudo make install
-cd "$cwd"
diff --git a/vim-plug.sh b/vim-plug.sh
deleted file mode 100755
index 44827ad..0000000
--- a/vim-plug.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
-    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
diff --git a/yadm.sh b/yadm.sh
deleted file mode 100755
index 17c99c2..0000000
--- a/yadm.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# YADM must already be installed...
-# git-remote-dropbox must already be configured
-
-yadm clone "dropbox:///git-private/manjaro-dotfiles" -b master
diff --git a/yay.sh b/yay.sh
deleted file mode 100755
index e9cc1c3..0000000
--- a/yay.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-cwd=$(pwd)
-sudo pacman -S --noconfirm git
-git clone https://aur.archlinux.org/yay.git
-cd yay
-makepkg -si --noconfirm
-cd "$cwd"
-
-
diff --git a/zsh.sh b/zsh.sh
deleted file mode 100755
index 3767ec3..0000000
--- a/zsh.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-!#bin/sh
-
-sudo chsh $(which zsh) master
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"