Add several packagesHEADmain

9 files changed, 47 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index bbbf6a1..d49f359 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,13 @@
 clean:
 	rm -f $$HOME/.profile
+	rm -f $$HOME/.xinitrc
+	rm -f $$HOME/.xprofile
 	rm -f $$HOME/.zprofile
 	stow --verbose --target=$$HOME --delete */
 
 install:
 	stow --verbose --target=$$HOME --restow */
-	ln -s $$HOME/.config/zsh/zprofile $$HOME/.zprofile
+	ln -s $$HOME/.config/xinitrc $$HOME/.xinitrc
+	ln -s $$HOME/.config/xprofile $$HOME/.xprofile
 	ln -s $$HOME/.config/zsh/zprofile $$HOME/.profile
+	ln -s $$HOME/.config/zsh/zprofile $$HOME/.zprofile
diff --git a/aliases/.config/aliasrc b/aliases/.config/aliasrc
new file mode 100644
index 0000000..969d5c2
--- /dev/null
+++ b/aliases/.config/aliasrc
@@ -0,0 +1,18 @@
+alias ls="ls -hN --color=auto --group-directories-first"
+alias ll='ls -l'
+
+alias cp='cp -iv'
+alias rm='rm -iv'
+alias mv='mv -iv'
+
+alias grep="grep --color=auto"
+alias diff="diff --color=auto"
+
+# Git
+alias gs='git status'
+alias ga='git add'
+alias gb='git branch'
+alias gc='git commit'
+alias gd='git diff'
+alias go='git checkout'
+alias gl='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'
diff --git a/bin/.local/bin/remaps b/bin/.local/bin/remaps
new file mode 100755
index 0000000..4cd25d4
--- /dev/null
+++ b/bin/.local/bin/remaps
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+setxkbmap -layout gb
+setxkbmap -option caps:super
diff --git a/statusbar/.local/bin/statusbar/battery b/bin/.local/bin/statusbar/battery
index 9373375..9373375 100755
--- a/statusbar/.local/bin/statusbar/battery
+++ b/bin/.local/bin/statusbar/battery
diff --git a/statusbar/.local/bin/statusbar/clock b/bin/.local/bin/statusbar/clock
index d2b8a51..d2b8a51 100755
--- a/statusbar/.local/bin/statusbar/clock
+++ b/bin/.local/bin/statusbar/clock
diff --git a/wget/.config/wget/wgetrc b/wget/.config/wget/wgetrc
new file mode 100644
index 0000000..4445aa6
--- /dev/null
+++ b/wget/.config/wget/wgetrc
@@ -0,0 +1 @@
+hsts-file=~/.cache/wget/wget-hsts
diff --git a/xinit/.config/xinitrc b/xinit/.config/xinitrc
new file mode 100644
index 0000000..ec388f3
--- /dev/null
+++ b/xinit/.config/xinitrc
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# xinitrc runs when you run starx
+
+# Source xprofile as that contains commands that need run whenever we startx.
+# Commands are kept in xprofile as that will run automatically if a display manager is used when logging in.
+. ~/.xprofile
+
+exec dwm
+
diff --git a/xprofile/.config/xprofile b/xprofile/.config/xprofile
new file mode 100644
index 0000000..3581af3
--- /dev/null
+++ b/xprofile/.config/xprofile
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+remaps & # Sets correct keyboard layout and remaps some keys to make life easier in dwm.
+dwmblocks &
diff --git a/zsh/.config/zsh/zprofile b/zsh/.config/zsh/zprofile
index 9f45164..a737d5b 100644
--- a/zsh/.config/zsh/zprofile
+++ b/zsh/.config/zsh/zprofile
@@ -13,3 +13,8 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
 export LESSHISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/less/history"
 export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
+
+## StartX when first logging in.
+if [[ "$(tty)" = "/dev/tty1" ]]; then
+    pgrep dwm || startx
+fi