summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCullum Smith <cullum@sacredheartsc.com>2024-11-08 06:43:06 -0500
committerCullum Smith <cullum@sacredheartsc.com>2024-11-08 06:43:06 -0500
commit16563f67769c863f61859a825eefcf8fc150d31f (patch)
treeff3859d7c351b324a1b40edd7f8530e806271323
parente039039e31a221e8c5739562e3d1e5cfdef4af74 (diff)
downloaddotfiles-16563f67769c863f61859a825eefcf8fc150d31f.tar.gz
update x11 stuff
-rw-r--r--sh/.profile5
-rw-r--r--sh/.shrc1
-rw-r--r--x11/.xinitrc8
-rw-r--r--x11/.xsession5
4 files changed, 15 insertions, 4 deletions
diff --git a/sh/.profile b/sh/.profile
index e37077f..e9ebfd6 100644
--- a/sh/.profile
+++ b/sh/.profile
@@ -1 +1,6 @@
+export CLICOLOR=1
+export PAGER=less
+export LESS='-iMRS -x2'
+export EDITOR=vim
+export LSCOLORS=DxfxgxgxcxxbxbaCacADAd
export ENV="${HOME}/.shrc"
diff --git a/sh/.shrc b/sh/.shrc
index fc05e91..c35c7bd 100644
--- a/sh/.shrc
+++ b/sh/.shrc
@@ -9,7 +9,6 @@ export PAGER=less
export LESS='-iMRS -x2'
export EDITOR=vim
export LSCOLORS=DxfxgxgxcxxbxbaCacADAd
-#export LSCOLORS=ExfxgxgxcxxbxbaCacADAd
alias ls='ls -FHh'
alias ll='ls -l'
diff --git a/x11/.xinitrc b/x11/.xinitrc
index 5a1c4fc..5911ed8 100644
--- a/x11/.xinitrc
+++ b/x11/.xinitrc
@@ -7,7 +7,8 @@ xidle_timeout=900
case $(hostname -s) in
rlaptop1)
- font_size=16
+ font_size=20
+ dpi=120
;;
esac
@@ -21,4 +22,7 @@ setxkbmap -option ctrl:nocaps
xidle -program "$(which i3lock) -e -c ${bg_color}" -timeout "$xidle_timeout" &
sudo -n networkmgr &
-exec i3
+i3
+
+# Chrome seems to hang around after exit and use 100% CPU
+killall chrome
diff --git a/x11/.xsession b/x11/.xsession
index 25bc758..408e6f9 100644
--- a/x11/.xsession
+++ b/x11/.xsession
@@ -1,4 +1,7 @@
#!/bin/sh
. "${HOME}/.profile"
-. "${HOME}/.xinitrc"
+
+if [ -z "$XDG_CURRENT_DESKTOP" ]; then
+ . "${HOME}/.xinitrc"
+fi