From d2ee41eace7c3a0ccbbe614cfb837bba494d38bb Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Thu, 1 Feb 2024 13:35:23 +0100
Subject: [PATCH] Move i3 to home-manager

---
 .dotter/local.laptop.toml                  |  2 +-
 homes/x86_64-linux/julian@aspi/default.nix |  2 +-
 modules/home/i3/i3/config                  | 18 +++++-------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.dotter/local.laptop.toml b/.dotter/local.laptop.toml
index dca3c4c..80da18f 100644
--- a/.dotter/local.laptop.toml
+++ b/.dotter/local.laptop.toml
@@ -1,2 +1,2 @@
 includes = [".dotter/laptop.toml"]
-packages = ["i3"]
+packages = []
diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix
index 8f11dfd..511fc17 100644
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@@ -32,7 +32,7 @@ config, ... }: {
     neovim.enable = true;
     alacritty.enable = true;
     emacs.enable = true;
-    # i3.enable = true;
+    i3.enable = true;
     rofi.enable = true;
   };
 
diff --git a/modules/home/i3/i3/config b/modules/home/i3/i3/config
index bff6ca7..543c605 100644
--- a/modules/home/i3/i3/config
+++ b/modules/home/i3/i3/config
@@ -142,8 +142,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10; workspace $ws10
 
 # Monitor config
-set $monitor_left {{monitor-primary}}
-set $monitor_right {{monitor-secondary}}
+set $monitor_left "HDMI-1"
+set $monitor_right "eDP-1"
 
 workspace $ws1 output $monitor_left
 workspace $ws2 output $monitor_left
@@ -185,11 +185,11 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 bar {
-    font pango:DejaVu Sans Mono, Font Awesome {{bar-font-size}}
+    font pango:DejaVu Sans Mono, Font Awesome 15
     status_command i3status-rs
     position bottom
 
-    {{tray-output}}
+    tray_output eDP-1
 }
 
 
@@ -269,12 +269,8 @@ exec --no-startup-id nextcloud --background
 # exec --no-startup-id /usr/bin/emacs --daemon
 
 # Authentication agent
-{{#if dotter.packages.nix}}
-exec --no-startup-id /etc/manual-links/polkit-gnome-authentication-agent-1
-{{else}}
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start
-{{/if}}
 
 # Notify about software updates
 exec --no-startup-id pamac-tray
@@ -295,17 +291,13 @@ exec --no-startup-id nitrogen --restore
 exec --no-startup-id redshift
 
 # Notifications
-{{#if dotter.packages.nix}}
-exec --no-startup-id /etc/manual-links/xfce4-notifyd
-{{else}}
 exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd
-{{/if}}
 
 # exec --no-startup-id xautolock -time 10 -locker blurlock
 exec_always --no-startup-id ff-theme-util
 exec_always --no-startup-id fix_xcursor
 
-exec_always --no-startup-id {{screenlayout-script}}
+exec_always --no-startup-id "$scripts/display-layoutpicker"
 
 
 #############################