11 files changed, 69 insertions, 36 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 11bd221c..61a5fdb4 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -51,10 +51,10 @@ let
   wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; };
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
-    mpv yt-dlp
+    mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
   ];
   
-  home-manager.users.${userName} = {
+  config.home-manager.users.${userName} = {
     nixpkgs.config = {
       zathura.useMupdf = false;
     };
@@ -82,6 +82,9 @@ in {
           Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
             ProxyJump mathw0h
 
+          Match host *.ifi.lmu.de,*.math.lmu.de
+            AddressFamily inet
+
           Host *
         '';
       };
@@ -320,6 +323,16 @@ in {
       };
     };
 
+    xdg.configFile = {
+      "dunst/dunstrc.d" = {
+        source = ./dunstrc.d;
+        recursive = true;
+        onChange = ''
+          ${pkgs.systemd}/bin/systemctl --user try-restart dunst
+        '';
+      };
+    };
+
     fonts.fontconfig.enable = true;
 
     systemd.user = import ./systemd.nix inputs;
diff --git a/accounts/gkleen@sif/dunst-settings.nix b/accounts/gkleen@sif/dunst-settings.nix
index 540602c2..7f36922f 100644
--- a/accounts/gkleen@sif/dunst-settings.nix
+++ b/accounts/gkleen@sif/dunst-settings.nix
@@ -5,7 +5,11 @@
     markup = "full";
     format = "<i>%s</i> %p\\n%b";
     alignment = "left";
-    geometry = "1216x10-32+64";
+    # geometry = "1216x10-32+64";
+    width = 250;
+    height = 50;
+    offset = "32x64";
+    origin = "top-right";
     shrink = true;
     monitor = 0;
     follow = "none";
@@ -30,6 +34,7 @@
     sticky_history = false;
 
     dmenu = "${pkgs.dmenu}/bin/dmenu";
+    browser = "${pkgs.xdg-utils}/bin/xdg-open";
   };
   # shortcuts = {
   #   close = "ctrl+space";
@@ -37,37 +42,4 @@
   #   history = "ctrl+comma";
   #   context = "ctrl+period";
   # };
-  urgency_low = {
-    background = "#000000";
-    foreground = "#999999";
-    timeout = 5;
-  };
-  urgency_normal = {
-    background = "#000000";
-    foreground = "#ffffff";
-    timeout = 15;
-  };
-  urgency_critical = {
-    background = "#900000";
-    foreground = "#ffffff";
-    timeout = 0;
-  };
-  pulseaudio-ctl = {
-    summary = "Volume *";
-    body = "Current is *";
-    set_stack_tag = "volume";
-    history_ignore = true;
-  };
-  mail = {
-    appname = "notmuch";
-    timeout = 0;
-  };
-  zulip = {
-    appname = "Zulip";
-    timeout = 0;
-  };
-  element = {
-    appname = "Element";
-    timeout = 0;
-  };
 }
diff --git a/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf b/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
new file mode 100644
index 00000000..442cc243
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
@@ -0,0 +1,4 @@
+[urgency_low]
+background="#000000"
+foreground="#999999"
+timeout=5
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf b/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
new file mode 100644
index 00000000..a95dfdf1
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
@@ -0,0 +1,4 @@
+[urgency_normal]
+background="#000000"
+foreground="#ffffff"
+timeout=15
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf b/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
new file mode 100644
index 00000000..d57fe91c
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
@@ -0,0 +1,4 @@
+[urgency_critical]
+background="#900000"
+foreground="#ffffff"
+timeout=0
diff --git a/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf b/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
new file mode 100644
index 00000000..074f4535
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
@@ -0,0 +1,5 @@
+[pulseaudio-ctl]
+body="Current is *"
+history_ignore=yes
+set_stack_tag="volume"
+summary="Volume *"
diff --git a/accounts/gkleen@sif/dunstrc.d/20-element.conf b/accounts/gkleen@sif/dunstrc.d/20-element.conf
new file mode 100644
index 00000000..5ff6031e
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/20-element.conf
@@ -0,0 +1,3 @@
+[element-im]
+appname=Element
+timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-mail.conf b/accounts/gkleen@sif/dunstrc.d/20-mail.conf
new file mode 100644
index 00000000..cb568e01
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/20-mail.conf
@@ -0,0 +1,3 @@
+[element]
+appname="notmuch"
+timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-zulip.conf b/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
new file mode 100644
index 00000000..d7fbd32c
--- /dev/null
+++ b/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
@@ -0,0 +1,3 @@
+[zulip]
+appname="Zulip"
+timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index de2d92f8..ec02b1c3 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -128,6 +128,7 @@ in {
     };
     dunst = {
       Service = {
+        ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
         Restart = "always";
       };
       Install = {
diff --git a/accounts/gkleen@sif/xcompose.nix b/accounts/gkleen@sif/xcompose.nix
new file mode 100644
index 00000000..50dddacd
--- /dev/null
+++ b/accounts/gkleen@sif/xcompose.nix
@@ -0,0 +1,21 @@
+{ userName, pkgs, ... }:
+let
+  runSed = path: sedScript: pkgs.runCommand (baseNameOf path) { buildInputs = [ pkgs.gnused ]; } "sed -r -f ${pkgs.writeText "script-file" sedScript} ${path} > $out";
+in {
+  config.home-manager.users.${userName}.home.file.".XCompose".text = ''
+     include "${pkgs.xorg.libX11}/share/X11/locale/en_US.UTF-8/Compose"
+     include "${runSed "${pkgs.xcompose}/dotXCompose" ''
+       /include "%L"/ s/^/# /
+     ''}"
+     include "${pkgs.xcompose}/frakturcompose"
+     include "${pkgs.xcompose}/emoji.compose"
+     include "${pkgs.xcompose}/modletters.compose"
+     include "${pkgs.xcompose}/tags.compose"
+     include "${pkgs.xcompose}/maths.compose"
+     include "${pkgs.xcompose}/parens.compose"
+
+     <Multi_key>  <colon> <parenleft> :  "🙁"   U1F641      # SLIGHTLY FROWNING FACE
+     <Multi_key> <Multi_key>  <colon> <minus> <parenleft> :  "🙁"   U1F641      # SLIGHTLY FROWNING FACE
+     <Multi_key> <Multi_key>  <colon> <c> :  "☹️"   U2639      # WHITE FROWNING FACE VARIANT
+  '';
+}