Merge branch 'master' of github.com:foltik/dotfiles

lain/.bash_profile

@@ -0,0 +1,3 @@
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+    exec startx
+fi

lain/.bashrc

@@ -0,0 +1,7 @@
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+# Unless we are running bash with a command explicitly (-c), drop into fish
+if [ -z "$BASH_EXECUTION_STRING" ]; then
+    exec fish
+fi

lain/.config/fish/config.fish

@@ -0,0 +1,7 @@
+### Environment Variables ###
+set -U fish_user_paths ~/.local/bin
+# Use all cores for make by default
+set -gx MAKEFLAGS -j(nproc)
+# TTY for gpg pinentry
+set -gx GPG_TTY (tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null

lain/.pam_environment

@@ -1,2 +1,6 @@
+EDITOR          DEFAULT="nvim"
 SSH_AGENT_PID   DEFAULT=
 SSH_AUTH_SOCK   DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+GTK_IM_MODULE   DEFAULT="ibus"
+XMODIFIERS      DEFAULT="@im=ibus"
+QT_IM_MODULE    DEFAULT="ibus"