From 2b3852355706eaa1edaf0dfd410ab631336d680d Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 11 Mar 2023 14:45:07 +0100
Subject: [PATCH] i3: adapt config to nix

---
 .dotter/global.toml  |  5 +++--
 .dotter/kardorf.toml |  1 +
 .dotter/laptop.toml  |  1 +
 i3/i3/config         | 17 ++++++++++++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.dotter/global.toml b/.dotter/global.toml
index 21ae811..8749da7 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -28,8 +28,9 @@ mc = "~/.config/mc"
 [i3.variables]
 monitor-primary = "not-specified"
 monitor-secondary = "not-specified"
-# Tray-output defaults to primary
-tray-output = ""
+screenlayout-script = "echo screenlayout-script not specified"
+bar-font-size = 15
+tray-output = "primary"
 
 [emacs.files]
 "emacs/doom" = "~/.config/doom"
diff --git a/.dotter/kardorf.toml b/.dotter/kardorf.toml
index 7ddae10..058781a 100644
--- a/.dotter/kardorf.toml
+++ b/.dotter/kardorf.toml
@@ -2,4 +2,5 @@
 monitor-primary = "DVI-D-1"
 monitor-secondary = "VGA-0"
 screenlayout-script = "~/.screenlayout/2desktop-vga.sh"
+bar-font-size = 18
 tray-output = "tray_output VGA-0"
diff --git a/.dotter/laptop.toml b/.dotter/laptop.toml
index b31c94b..285c0ac 100644
--- a/.dotter/laptop.toml
+++ b/.dotter/laptop.toml
@@ -2,3 +2,4 @@
 monitor-primary = "eDP1"
 monitor-secondary = "HDMI1"
 screenlayout-script = "$scripts/display-layoutpicker"
+bar-font-size = 15
diff --git a/i3/i3/config b/i3/i3/config
index 4f5dea3..11f14cd 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -185,7 +185,7 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 bar {
-    font pango:DejaVu Sans Mono, Font Awesome 18
+    font pango:DejaVu Sans Mono, Font Awesome {{bar-font-size}}
     status_command i3status-rs
     position bottom
 
@@ -283,9 +283,15 @@ exec --no-startup-id nm-applet
 exec --no-startup-id blueman-applet
 exec --no-startup-id xfce4-power-manager
 exec --no-startup-id nextcloud
+# exec --no-startup-id xfce4-screensaver
 
 # Authentication agent
+exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start
+{{#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
+{{/if}}
 
 # Notify about software updates
 exec --no-startup-id pamac-tray
@@ -302,8 +308,13 @@ exec --no-startup-id pa-applet
 exec --no-startup-id nitrogen --restore
 
 # Notifications
-exec --no-startup-id dunst -config ~/.config/dunst/dunstrc
-# exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd
+# exec --no-startup-id dunst -config ~/.config/dunst/dunstrc
+
+{{#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