aboutsummaryrefslogtreecommitdiff
path: root/xorg
diff options
context:
space:
mode:
Diffstat (limited to 'xorg')
-rw-r--r--xorg/.Xresources9
-rw-r--r--xorg/.config/env6
-rwxr-xr-xxorg/.xinitrc12
3 files changed, 18 insertions, 9 deletions
diff --git a/xorg/.Xresources b/xorg/.Xresources
index 2ed927f..836a597 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,6 +1,7 @@
#include ".cache/wal/colors.Xresources"
-#define font "JetBrainsMono Nerd Font:size=19:pixelsize=24:antialias=true:autohint=true"
+#define cfontname JetBrainsMono NF
+#define cfont "JetBrainsMono NF:size=9:pixelsize=14:antialias=true:autohint=true"
! Terminal colors
*.color0: c00
@@ -49,7 +50,9 @@
*.accent: cas
*accent: cas
-Xft.dpi: 220
+Xft.dpi: 96
+Xft.font: cfont
+Xft.fontname: cfontname
Xcursor.theme: capitaine-cursors-light
@@ -60,7 +63,7 @@ dwm.selbordercolor: cps
dwm.selbgcolor: cps
dwm.selfgcolor: cbg
-Nsxiv.bar.font: font
+Nsxiv.bar.font: cfont
Nsxiv.bar.background: cps
Nsxiv.bar.foreground: cbg
Nsxiv.mark.foreground: cps
diff --git a/xorg/.config/env b/xorg/.config/env
index 9521ca2..a33c61b 100644
--- a/xorg/.config/env
+++ b/xorg/.config/env
@@ -5,8 +5,8 @@ export XDG_CACHE_HOME="$HOME/.cache/"
export XDG_SESSION_TYPE="x11"
### SCRIPTS
-export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):/opt/:$PATH"
-export PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin"
+export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):/opt/:/opt/android-sdk/platform-tools/:$PATH"
+export PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin:$HOME/.cargo/bin/"
### DEFAULTS
export TERM="xterm"
@@ -33,7 +33,7 @@ export FLUTTER_ROOT="$HOME/software/flutter/bin/flutter"
export CHROME_EXECUTABLE="$(which brave)"
export CHROME_PATH="$CHROME_EXECUTABLE"
-export JAVA_HOME="/usr/lib/jvm/java-20-openjdk/"
+export JAVA_HOME="/usr/lib/jvm/default/"
export ANDROID_HOME="sdkmanager"
export ANDROID_HOME="/opt/android-sdk"
export ANDROID_SDK_ROOT="/opt/android-sdk"
diff --git a/xorg/.xinitrc b/xorg/.xinitrc
index 09ca67a..d51a201 100755
--- a/xorg/.xinitrc
+++ b/xorg/.xinitrc
@@ -1,9 +1,10 @@
#!/bin/bash
setxkbmap us
-. "$HOME/.screenlayout/home.sh"
+# . "$HOME/.screenlayout/newhome.sh"
feh --bg-fill "$HOME/.config/wallpaper"
+# should this be in .profile / .bash_profile ?
env_file="$HOME/.config/env"
modmap_file="$HOME/.Xmodmap"
resources_file="$HOME/.Xresources"
@@ -24,10 +25,14 @@ eval $(/usr/bin/gnome-keyring-daemon --start) && export SSH_AUTH_SOCK
updates check &
-unclutter -idle 1 &
-brightness load &
+# move this to .local/bin/autostart ?
+# or .xsession
+# unclutter -idle 1 &
+# brightness load &
+# otd-daemon &
clipmenud &
fcitx5 -d &
+# syncthing --no-browser &
slstatus &
# plank &
dunst &
@@ -35,6 +40,7 @@ picom &
[ ! -s "$HOME/.config/mpd/pid" ] && mpd &
+# exec dwl # 2> "$HOME/dwm.log"
exec dwm # 2> "$HOME/dwm.log"
# exec leftwm
# exec awesome