From c28ff030f8a76d1c8a99238d0932b1a0d5fc871c Mon Sep 17 00:00:00 2001
From: Ayush Mukherjee <me@ayushm.com>
Date: Tue, 7 Dec 2021 21:19:12 +0530
Subject: [PATCH] add hostname to bash PS1

---
 .bashrc       |  2 +-
 .xinitrc      | 33 +++------------------------------
 nvim/init.vim |  4 ++--
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/.bashrc b/.bashrc
index dee1e4b..fd6fde4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -28,7 +28,7 @@ alias wmc='nvim ~/.config/i3/config'
 # asus tools aliases
 alias sup='supergfxctl'
 
-PS1='\[\e[1;33m\]\u \[\e[1;32m\]\w \[\e[0m\]$(parse_git_branch)\n\[\e[35m\]\[\e[1m\]\$ \[\e[0m\]'
+PS1='\[\e[1;33m\]\u ($HOSTNAME) \[\e[1;32m\]\w \[\e[0m\]$(parse_git_branch)\n\[\e[35m\]\[\e[1m\]\$ \[\e[0m\]'
 
 # export term
 export TERM=xterm-256color
diff --git a/.xinitrc b/.xinitrc
index d02e0fe..eddeb12 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,31 +1,5 @@
 #!/bin/sh
 # x.org xinit stuff
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
   [ -x "$f" ] && . "$f"
@@ -41,7 +15,7 @@ fi
 # xrandr --setprovideroffloadsink nouveau Intel
 
 # eDP's dpi
-xrandr --dpi 119 --output eDP-1 --mode 1920x1080 --rate 60
+xrandr --dpi 119 --output eDP-1 --mode 1920x1080 --rate 144
 
 # lang exports
 export LANG=en_US.UTF-8
@@ -63,9 +37,8 @@ export LC_ALL=en_US.UTF-8
 xrdb -merge .Xresources
 
 # gnome keyring
-# eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-# export SSH_AUTH_SOCK
-# source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
 
 # start tlp
 # sudo tlp start
diff --git a/nvim/init.vim b/nvim/init.vim
index 2225f1f..6c8247c 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -15,8 +15,8 @@ syntax on
 set number
 set nohlsearch
 set relativenumber
-set tabstop=4 softtabstop=4
-set shiftwidth=4
+set tabstop=2 softtabstop=2
+set shiftwidth=2
 set expandtab
 set smartindent
 set smartcase