diff --git a/.gitignore b/.gitignore
index 9acb67e7..e714f9fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !/.bashrc
 !/.gitconfig
 !/.inputrc
+!/.nvidia-xinitrc
 !/.password-store
 !/.xinitrc
 !/.Xmodmap.example
diff --git a/.nvidia-xinitrc b/.nvidia-xinitrc
new file mode 100644
index 00000000..26c1e326
--- /dev/null
+++ b/.nvidia-xinitrc
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ $# -gt 0 ]; then
+    $*
+else
+    i3
+fi
diff --git a/.xinitrc b/.xinitrc
index 2651fdde..00526a13 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,7 +7,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
-setxkbmap "us,us" ",intl" "grp:alt_shift_toggle"
+setxkbmap "us,us" ",intl" "grp:shifts_toggle"
 [ -f ~/.Xmodmap ] && xmodmap ~/.Xmodmap
 
 exec i3