From 311ced1059ff4879ad81b9d1a9bcee903e171000 Mon Sep 17 00:00:00 2001
From: Myve <forge@myvelabs.com>
Date: Tue, 21 Jan 2025 01:45:02 +0000
Subject: [PATCH] Tweak i3 desktop

---
 i3/Dockerfile |  2 +-
 i3/entrypoint | 42 +++++++-----------------------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/i3/Dockerfile b/i3/Dockerfile
index 0610255..1f68d9e 100644
--- a/i3/Dockerfile
+++ b/i3/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
     && pacman -Su --ask 4 --needed ${addpkg} \
         sudo bash bash-completion \
         tigervnc \
-        i3-wm ttf-dejavu \
+        i3-wm i3status dmenu konsole kate dolphin breeze-icons ttf-dejavu \
     && pacman -Scc --ask 4 \
     && useradd --create-home --gid users --shell /usr/bin/bash user \
     && printf '%s\n' 'user ALL=(ALL:ALL) NOPASSWD: /usr/bin/pacman' \
diff --git a/i3/entrypoint b/i3/entrypoint
index 4387236..10f77e9 100755
--- a/i3/entrypoint
+++ b/i3/entrypoint
@@ -12,7 +12,7 @@ then
 fi
 
 # Create base directories
-for dir in ssh config/tigervnc
+for dir in ssh config/tigervnc config/i3
 do
     [ -d ~/.${dir} ] || mkdir -p ~/.${dir}/
 done
@@ -60,40 +60,12 @@ depth=32
 ${_MYVNC_VNCSHARING}
 vncconfig
 
-# i3 preferences
-mkdir -p ~/.config/i3/config.d
-cat >~/.config/i3/config <<- 'i3config'
-# Font
-font pango:DejaVu Sans Mono 8
-
-# Include custom config
-include ~/.config/i3/config.d/*.conf
-
-# Binds for killing application
-bindsym Mod1+Mod4+Shift+q kill
-bindsym Mod1+Mod4+Shift+f fullscreen toggle
-
-# Binds for cycling workspaces
-bindsym Mod1+Mod4+Shift+Right workspace next
-bindsym Mod1+Mod4+Shift+Left workspace prev
-
-# Locked mode
-mode locked {
-    bindsym Mod4+Mod1+Escape mode default
-}
-bindsym Mod4+Mod1+Escape mode locked
-
-# Hide bar permanently
-exec --no-startup-id i3-msg bar mode invisible
-
-# Always open window in fullscreen
-for_window [all] fullscreen enable
-for_window [all] border none
-default_border none
-
-# Execute startup script for webapp
-exec --no-startup-id /usr/bin/bash ~/.config/i3/startapp.sh
-i3config
+# i3 config
+mkdir -p ~/.config/i3
+curl --fail -s -L https://raw.githubusercontent.com/i3/i3/next/etc/config | sed 's/exec i3-config-wizard/# &/' > ~/.config/i3/config
+echo -e '\ngaps inner 8
+gaps outer 4
+# for_window [class="^.*"] border pixel 2' >> ~/.config/i3/config
 
 # Launch Tigervnc
 /usr/bin/dbus-launch vncserver :0