3 files changed, 45 insertions, 15 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 051427bd..6671e5c7 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -344,7 +344,7 @@ in {
               font = "Fira Sans";
             };
             colors = {
-              background = "000000aa";
+              background = "000000cc";
               text = "cdd6f4ff";
               match = "94e2d5ff";
               selection = "585b70ff";
@@ -517,7 +517,7 @@ in {
           libguestfs-with-appliance nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
           swtpm (hunspellWithDicts (with hunspellDicts; [en_GB-large de_DE]))
-          libation
+          libation libqalculate
         ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; });
 
         file = {
@@ -577,6 +577,9 @@ in {
             General = {
               dot_as_separator = 0;
             };
+            Mode = {
+              calculate_as_you_type = 1;
+            };
           };
         };
         "emacs/init.el".source = pkgs.substitute {
@@ -691,7 +694,7 @@ in {
             exec -- \
               ${lib.getExe' config.systemd.package "systemd-run"} --wait --user --slice-inherit \
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
-              --property 'Environment=DSCP=46' \
+              -E DSCP=46 -E NIXOS_OZONE_WL \
               -- ${lib.getExe pkgs.dscp} ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
               --class=Rainbow \
               --app="https://web.openrainbow.com" \
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index bf997b7d..158ac4d6 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -134,7 +134,7 @@ let
 
       windows_json="$(niri msg -j windows)"
       active_workspace="$(jq -r '.[] | select(.is_focused) | .workspace_id' <<<"$windows_json")"
-      window_ix="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\u0000icon\u001f\(.app_id)"' <<<"$windows_json" | fuzzel --log-level=warning --dmenu --index)"
+      window_ix="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\u0000icon\u001f\(.app_id)"' <<<"$windows_json" | fuzzel --width=60 --log-level=warning --dmenu --index)"
       # shellcheck disable=SC2016
       window_json="$(gojq -rc --arg active_workspace "$active_workspace" --arg window_ix "$window_ix" 'map(select('"$window_select"')) | .[($window_ix | tonumber)]' <<<"$windows_json")"
 
@@ -449,7 +449,7 @@ in {
           { title = "^Access Request.*"; }
           { title = ".*Passkey credentials$"; }
         ];
-        windowRuleExtra = [
+        windowRuleExtra = with kdl; [
           (kdl.leaf "open-focused" false)
         ];
         key = "Mod+Control+P";
@@ -477,6 +477,20 @@ in {
         app-id = "com.github.wwmm.easyeffects";
         spawn = [ "easyeffects" ];
       }
+      { name = "time";
+        key = "Mod+Control+K";
+        app-id = "chrome-kimai.yggdrasil.li__-Default";
+        spawn = [ (toString (pkgs.resholve.writeScript "kimai" {
+          interpreter = pkgs.runtimeShell;
+          inputs = [ pkgs.dex ];
+          execer = [ "cannot:${lib.getExe pkgs.dex}" ];
+        } ''
+          exec dex $HOME/.local/state/nix/profile/share/applications/kimai.desktop
+        '')) ];
+        windowRuleExtra = with kdl; [
+          (leaf "block-out-from" "screencast")
+        ];
+      }
     ];
     programs.niri.config =
       let
@@ -679,16 +693,10 @@ in {
           (plain "window-rule" [
             (leaf "match" { app-id = "^thunderbird$"; })
             (leaf "match" { app-id = "^Element$"; })
-            (leaf "match" { app-id = "^Rainbow$"; })
+            (leaf "match" { app-id = "^chrome-web\.openrainbow\.com__-Default$"; })
             (leaf "open-on-workspace" "comm")
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^Kimai$"; })
-            (leaf "open-on-workspace" "comm")
-            (leaf "open-fullscreen" false)
-            (plain "default-column-width" [(leaf "proportion" (2. / 3.))])
-          ])
-          (plain "window-rule" [
             (leaf "match" { app-id = "^firefox$"; })
             (leaf "open-on-workspace" "web")
             (leaf "open-maximized" true)
@@ -803,12 +811,12 @@ in {
                         done < <(export LC_ALL=C.UTF-8; echo; find "$RESULTS_DIR" -type f -printf $'%T@ %p\n' | sort -n | cut -d' ' -f2- | xargs -r cat)
                         $FOUND || echo
                       }
-                      FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> ") || exit $?
+                      FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> " --width=60) || exit $?
                       if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
                         QALC_RES="$FUZZEL_RES"
                         QALC_RET=0
                       else
-                        QALC_RES=$(qalc "$FUZZEL_RES" 2>&1)
+                        QALC_RES=$(qalc -set "autocalc off" "$FUZZEL_RES" 2>&1)
                         QALC_RET=$?
                       fi
                       [[ -n "$QALC_RES" ]] || exit 1
@@ -828,11 +836,26 @@ in {
                       notify-send "$QALC_RES"
                     '';
                   }));
+                  "Mod+Shift+U".action =
+                    let
+                      qalcKitty = pkgs.symlinkJoin {
+                        name = "qalc-kitty";
+                        paths = [ config.programs.kitty.package ];
+                        buildInputs = [ pkgs.makeWrapper ];
+                        postBuild = ''
+                          wrapProgram $out/bin/kitty \
+                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
+                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
+                              shell ${lib.getExe pkgs.libqalculate}
+                            ''}"
+                        '';
+                      };
+                    in spawn (lib.getExe' qalcKitty "kitty");
                   "Mod+E".action = spawn (lib.getExe (pkgs.writeShellApplication {
                     name = "emoji-fuzzel";
                     runtimeInputs = with pkgs; [ config.programs.fuzzel.package wtype wl-clipboard-rs ];
                     text = ''
-                      FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " <"$HOME"/.local/share/emoji-data/list.txt) || exit $?
+                      FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " --cache "$HOME"/.cache/fuzzel-emoji --width=60 <"$HOME"/.local/share/emoji-data/list.txt) || exit $?
                       [[ -n "$FUZZEL_RES" ]] || exit 1
                       wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste
                     '';
@@ -973,6 +996,9 @@ in {
 
                   "Mod+D".action = with-urgent-window-action "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
                   "Mod+Shift+D".action = with-focused-window-action "{\"Action\":{\"UnsetUrgent\":{\"id\": .id}}}";
+
+                  "Mod+K".action = spawn (lib.getExe' pkgs.worktime "worktime-ui");
+                  "Mod+Shift+K".action = spawn (lib.getExe' pkgs.worktime "worktime-stop");
                 }))
                 (map ({ name, selector, spawn, key, ...}: if key != null && selector != null && spawn != null then bind key { action = focus-or-spawn-action selector name spawn; } else null) cfg.scratchspaces)
                 (map ({ name, moveKey, ...}: if moveKey != null then bind moveKey { action = kdl.magic-leaf "move-column-to-workspace" name; } else null) cfg.scratchspaces)
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
index 810bff89..eba26caa 100644
--- a/accounts/gkleen@sif/niri/mako.nix
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -25,6 +25,7 @@
           ignore-timeout = true;
           default-timeout = 2000;
         };
+        "app-name=worktime".history = false;
         "mode=silent".invisible = true;
       };
       package = pkgs.symlinkJoin {