summaryrefslogtreecommitdiff
path: root/accounts/gkleen@sif
diff options
context:
space:
mode:
Diffstat (limited to 'accounts/gkleen@sif')
-rw-r--r--accounts/gkleen@sif/default.nix17
-rw-r--r--accounts/gkleen@sif/dunst-settings.nix40
-rw-r--r--accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf4
-rw-r--r--accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf4
-rw-r--r--accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf4
-rw-r--r--accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf5
-rw-r--r--accounts/gkleen@sif/dunstrc.d/20-element.conf3
-rw-r--r--accounts/gkleen@sif/dunstrc.d/20-mail.conf3
-rw-r--r--accounts/gkleen@sif/dunstrc.d/20-zulip.conf3
-rw-r--r--accounts/gkleen@sif/systemd.nix1
-rw-r--r--accounts/gkleen@sif/xcompose.nix21
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
51 wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; }; 51 wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; };
52in { 52in {
53 imports = with flake.nixosModules.userProfiles.${userName}; [ 53 imports = with flake.nixosModules.userProfiles.${userName}; [
54 mpv yt-dlp 54 mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
55 ]; 55 ];
56 56
57 home-manager.users.${userName} = { 57 config.home-manager.users.${userName} = {
58 nixpkgs.config = { 58 nixpkgs.config = {
59 zathura.useMupdf = false; 59 zathura.useMupdf = false;
60 }; 60 };
@@ -82,6 +82,9 @@ in {
82 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null" 82 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
83 ProxyJump mathw0h 83 ProxyJump mathw0h
84 84
85 Match host *.ifi.lmu.de,*.math.lmu.de
86 AddressFamily inet
87
85 Host * 88 Host *
86 ''; 89 '';
87 }; 90 };
@@ -320,6 +323,16 @@ in {
320 }; 323 };
321 }; 324 };
322 325
326 xdg.configFile = {
327 "dunst/dunstrc.d" = {
328 source = ./dunstrc.d;
329 recursive = true;
330 onChange = ''
331 ${pkgs.systemd}/bin/systemctl --user try-restart dunst
332 '';
333 };
334 };
335
323 fonts.fontconfig.enable = true; 336 fonts.fontconfig.enable = true;
324 337
325 systemd.user = import ./systemd.nix inputs; 338 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 @@
5 markup = "full"; 5 markup = "full";
6 format = "<i>%s</i> %p\\n%b"; 6 format = "<i>%s</i> %p\\n%b";
7 alignment = "left"; 7 alignment = "left";
8 geometry = "1216x10-32+64"; 8 # geometry = "1216x10-32+64";
9 width = 250;
10 height = 50;
11 offset = "32x64";
12 origin = "top-right";
9 shrink = true; 13 shrink = true;
10 monitor = 0; 14 monitor = 0;
11 follow = "none"; 15 follow = "none";
@@ -30,6 +34,7 @@
30 sticky_history = false; 34 sticky_history = false;
31 35
32 dmenu = "${pkgs.dmenu}/bin/dmenu"; 36 dmenu = "${pkgs.dmenu}/bin/dmenu";
37 browser = "${pkgs.xdg-utils}/bin/xdg-open";
33 }; 38 };
34 # shortcuts = { 39 # shortcuts = {
35 # close = "ctrl+space"; 40 # close = "ctrl+space";
@@ -37,37 +42,4 @@
37 # history = "ctrl+comma"; 42 # history = "ctrl+comma";
38 # context = "ctrl+period"; 43 # context = "ctrl+period";
39 # }; 44 # };
40 urgency_low = {
41 background = "#000000";
42 foreground = "#999999";
43 timeout = 5;
44 };
45 urgency_normal = {
46 background = "#000000";
47 foreground = "#ffffff";
48 timeout = 15;
49 };
50 urgency_critical = {
51 background = "#900000";
52 foreground = "#ffffff";
53 timeout = 0;
54 };
55 pulseaudio-ctl = {
56 summary = "Volume *";
57 body = "Current is *";
58 set_stack_tag = "volume";
59 history_ignore = true;
60 };
61 mail = {
62 appname = "notmuch";
63 timeout = 0;
64 };
65 zulip = {
66 appname = "Zulip";
67 timeout = 0;
68 };
69 element = {
70 appname = "Element";
71 timeout = 0;
72 };
73} 45}
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 @@
1[urgency_low]
2background="#000000"
3foreground="#999999"
4timeout=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 @@
1[urgency_normal]
2background="#000000"
3foreground="#ffffff"
4timeout=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 @@
1[urgency_critical]
2background="#900000"
3foreground="#ffffff"
4timeout=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 @@
1[pulseaudio-ctl]
2body="Current is *"
3history_ignore=yes
4set_stack_tag="volume"
5summary="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 @@
1[element-im]
2appname=Element
3timeout=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 @@
1[element]
2appname="notmuch"
3timeout=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 @@
1[zulip]
2appname="Zulip"
3timeout=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 {
128 }; 128 };
129 dunst = { 129 dunst = {
130 Service = { 130 Service = {
131 ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
131 Restart = "always"; 132 Restart = "always";
132 }; 133 };
133 Install = { 134 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 @@
1{ userName, pkgs, ... }:
2let
3 runSed = path: sedScript: pkgs.runCommand (baseNameOf path) { buildInputs = [ pkgs.gnused ]; } "sed -r -f ${pkgs.writeText "script-file" sedScript} ${path} > $out";
4in {
5 config.home-manager.users.${userName}.home.file.".XCompose".text = ''
6 include "${pkgs.xorg.libX11}/share/X11/locale/en_US.UTF-8/Compose"
7 include "${runSed "${pkgs.xcompose}/dotXCompose" ''
8 /include "%L"/ s/^/# /
9 ''}"
10 include "${pkgs.xcompose}/frakturcompose"
11 include "${pkgs.xcompose}/emoji.compose"
12 include "${pkgs.xcompose}/modletters.compose"
13 include "${pkgs.xcompose}/tags.compose"
14 include "${pkgs.xcompose}/maths.compose"
15 include "${pkgs.xcompose}/parens.compose"
16
17 <Multi_key> <colon> <parenleft> : "🙁" U1F641 # SLIGHTLY FROWNING FACE
18 <Multi_key> <Multi_key> <colon> <minus> <parenleft> : "🙁" U1F641 # SLIGHTLY FROWNING FACE
19 <Multi_key> <Multi_key> <colon> <c> : "☚ī¸" U2639 # WHITE FROWNING FACE VARIANT
20 '';
21}