From 7eb6d4034b67a2a4b141d87a03e5b81952feffc0 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Wed, 18 Jan 2023 21:51:23 +0100 Subject: Fix i3 --- .config/i3/config | 4 +--- .profile | 25 ++++++++++++++----------- .xinitrc | 2 ++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index c35bc2d..f799129 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -11,8 +11,6 @@ set $down j set $up k set $right l -set_from_resource ~/.config/xresources - font pango:DejaVu Sans Mono 11 set $color0 #000000 @@ -44,7 +42,7 @@ client.background $color7 default_border pixel 8 # Applications -set $term alacritty +set $term i3-sensible-terminal # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. set $menu rofi -show drun -Iai -w 3 diff --git a/.profile b/.profile index bc07a20..cf657cd 100644 --- a/.profile +++ b/.profile @@ -44,17 +44,20 @@ then fi # Sway specific -SDL_VIDEODRIVER="wayland" -_JAVA_AWT_WM_NONREPARENTING=1 -QT_QPA_PLATFORM="wayland" -XDG_CURRENT_DESKTOP="sway" -XDG_SESSION_DESKTOP="sway" - -export SDL_VIDEODRIVER -export _JAVA_AWT_WM_NONREPARENTING -export QT_QPA_PLATFORM -export XDG_CURRENT_DESKTOP -export XDG_SESSION_DESKTOP +if [ `pgrep sway` ] +then + SDL_VIDEODRIVER="wayland" + _JAVA_AWT_WM_NONREPARENTING=1 + QT_QPA_PLATFORM="wayland" + XDG_CURRENT_DESKTOP="sway" + XDG_SESSION_DESKTOP="sway" + + export SDL_VIDEODRIVER + export _JAVA_AWT_WM_NONREPARENTING + export QT_QPA_PLATFORM + export XDG_CURRENT_DESKTOP + export XDG_SESSION_DESKTOP +fi PATH="$HOME/go/bin:$DENO_INSTALL/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$PATH" export PATH diff --git a/.xinitrc b/.xinitrc index 5701a83..3c8a410 100644 --- a/.xinitrc +++ b/.xinitrc @@ -29,5 +29,7 @@ xinput --set-prop $TID 'libinput Natural Scrolling Enabled' 1 & xrandr --output eDP1 --primary --auto xrandr --output HDMI1 --same-as eDP1 --auto +xrdb -merge .config/xresources + exec i3 -- cgit v1.2.3