From ff70e29117b980a42ee536f0e2cda095ac42dd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 14 Apr 2024 01:37:57 +0200
Subject: [PATCH] Move i3 config into ~/.config

---
 dotfiles.yml |  7 ++++---
 i3/config.j2 | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dotfiles.yml b/dotfiles.yml
index 0ae95db..396721f 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -1,5 +1,4 @@
 empty_directories:
-  - name: .i3
   - name: .gnupg
     mode: '0700'
   - name: .config/nvim
@@ -15,6 +14,7 @@ empty_directories:
   - name: .config/helix
   - name: .config/git
   - name: .config/tmux
+  - name: .config/i3
 dotfiles:
   - from: git/gitconfig
     to: .config/git/config
@@ -28,7 +28,7 @@ dotfiles:
     to: .gnupg/gpg.conf
     template: true
   - from: i3/config
-    to: .i3/config
+    to: .config/i3/config
     template: true
   - from: i3/i3status-rust/config.toml
     to: .config/i3status-rust/config.toml
@@ -38,7 +38,7 @@ dotfiles:
   - from: i3/i3status-rust/icons/awesome.toml
     to: .config/i3status-rust/icons/awesome.toml
   - from: i3/scripts
-    to: .i3/scripts
+    to: .config/i3/scripts
   - from: tmux/tmux.conf
     to: .config/tmux/tmux.conf
   - from: vim/vimrc
@@ -93,3 +93,4 @@ dotfiles_remove:
   - .gitconfig
   - .vimrc
   - .tmux.conf
+  - .i3
diff --git a/i3/config.j2 b/i3/config.j2
index c720ffc..198aa69 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -20,7 +20,7 @@
     set $terminal "alacritty --config-file ~/.config/alacritty.toml"
     set $calc "alacritty --config-file ~/.config/alacritty.toml -e $SHELL -i -c calc"
 
-    set $scriptdir ~/.i3/scripts
+    set $scriptdir ~/.config/i3/scripts
 
     # Keys for the exit mode
     set $key_lock      l
@@ -206,27 +206,27 @@ assign [class="^Wine$"] $workspace10
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec --no-startup-id ~/.i3/scripts/appmenu
+    bindsym $mod+d exec --no-startup-id $scriptdir/appmenu
     bindsym $mod+Return exec $terminal
     bindsym $mod+Shift+Return exec $calc
 
-    bindsym F1 exec --no-startup-id ~/.i3/scripts/shutdown-menu
-    bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
+    bindsym F1 exec --no-startup-id $scriptdir/shutdown-menu
+    bindsym F2 exec --no-startup-id $scriptdir/screenmenu
 
-    bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
+    bindsym $mod+F1 exec --no-startup-id $scriptdir/i3exit lock
     bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/default.yml ; exec systemctl --user restart keyboard.service
     {% for screencfg in machine.screencfgs -%}
     bindsym $mod+{{ screencfg.key }} exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/{{ screencfg.name }}.yml ; exec systemctl --user restart keyboard.service
     {% endfor -%}
-    bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
-    bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
+    bindsym $mod+F4 exec --no-startup-id $scriptdir/i3exit suspend
+    bindsym $mod+Home exec --no-startup-id $scriptdir/shutdown-menu
 
     bindsym $mod+$screenshot exec --no-startup-id sh -c 'maim | xclip -selection clipboard -t image/png'
     bindsym $mod+Shift+$screenshot exec --no-startup-id sh -c 'maim --select | xclip -selection clipboard -t image/png'
 
     bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
 
-    bindsym $mod+$pim_toggle exec --no-startup-id ~/.i3/scripts/swap-from-workspace $workspace10
+    bindsym $mod+$pim_toggle exec --no-startup-id $scriptdir/swap-from-workspace $workspace10
 
 ################################################################################
 ### MODES ######################################################################