diff --git a/.config/xinitrc b/.config/xinitrc index b05af2e..c07d157 100644 --- a/.config/xinitrc +++ b/.config/xinitrc @@ -1,4 +1,7 @@ #!/bin/sh [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/xprofile" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/xprofile" -exec tdm --xstart +if [[ "$OSTYPE" == "darwin"* ]]; then +else + exec tdm --xstart +fi diff --git a/.config/xprofile b/.config/xprofile index 7b63bbe..a6d4ec0 100644 --- a/.config/xprofile +++ b/.config/xprofile @@ -1,26 +1,32 @@ #!/bin/sh -export _JAVA_AWT_WM_NONREPARENTING=1 +if [[ "$OSTYPE" == "darwin"* ]]; then -# Disable auto-dim/autolock/screen saver -xset s off -dpms + export _JAVA_AWT_WM_NONREPARENTING=1 -# Set cpu-governor to performance (Sometime it still set to powersave) -cpupower frequency-set -g performance + # Disable auto-dim/autolock/screen saver + xset s off -dpms -# Slow app startup fix (for flatpaks) -dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY + # Set cpu-governor to performance (Sometime it still set to powersave) + cpupower frequency-set -g performance -# Universal Autostarts -# fcitx5 -d & -xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/Xresources & -unclutter & -dunst & -numlockx & -lxpolkit & + # Slow app startup fix (for flatpaks) + dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY -# Custom Resolutions -xrandr --newmode "768x432" 25.75 768 792 864 960 432 435 440 450 -hsync +vsync -xrandr --newmode "960x540" 40.75 960 992 1088 1216 540 543 548 562 -hsync +vsync -xrandr --addmode VGA1 768x432 -xrandr --addmode VGA1 960x540 + # Universal Autostarts + # fcitx5 -d & + xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/Xresources & + unclutter & + dunst & + numlockx & + lxpolkit & + + # Custom Resolutions + xrandr --newmode "768x432" 25.75 768 792 864 960 432 435 440 450 -hsync +vsync + xrandr --newmode "960x540" 40.75 960 992 1088 1216 540 543 548 562 -hsync +vsync + xrandr --addmode VGA1 768x432 + xrandr --addmode VGA1 960x540 + +else + +fi diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 0c8975f..d921174 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -4,9 +4,11 @@ # exec startx #fi -bash /usr/bin/tdm +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + bash /usr/bin/tdm -[[ -f ~/.zshrc ]] && . ~/.zshrc -[ ! -s ~/.config/mpd/pid ] && mpd + [[ -f ~/.zshrc ]] && . ~/.zshrc + [ ! -s ~/.config/mpd/pid ] && mpd -export PATH="$HOME/.poetry/bin:$PATH" + export PATH="$HOME/.poetry/bin:$PATH" +fi diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 19d7761..de5c417 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -8,8 +8,12 @@ export ANDROID_AVD_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android/.android/avd" # -- Path # PATH="$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" -PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" -export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library +if [[ "$OSTYPE" == "darwin"* ]]; then + PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:${PATH:+:${PATH}}" +else + PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}" +fi +# export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library # -- IBus stuff (IME) export GTK_IM_MODULE="ibus"