5 files changed, 45 insertions, 21 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index f2df467a..83dcf989 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -160,7 +160,7 @@ in {
             yaml-mode json-mode shakespeare-mode smart-mode-line
             highlight-parentheses highlight-symbol ag sass-mode lua-mode
             fira-code-mode use-package wanderlust # notmuch
-            use-package-ensure-system-package git-gutter emacsScratch
+            git-gutter emacsScratch
             edit-server mediawiki editorconfig typescript-mode
             markdown-mode nftables-mode rustic lsp-mode lsp-ui
             direnv company projectile tomorrow-night-paradise-theme
@@ -209,6 +209,7 @@ in {
           flk = "$HOME/projects/machines";
           rz = "$HOME/projects/rz";
           pro = "$HOME/projects/pro";
+          media = "$HOME/media";
         };
 
         obs-studio = {
@@ -227,7 +228,7 @@ in {
         kitty = {
           enable = true;
           font = {
-            package = pkgs.fira;
+            package = pkgs.nerd-fonts.fira-mono;
             name = "Fira Mono";
             size = 10;
           };
@@ -270,13 +271,14 @@ in {
               output = [ "eDP-1" "DP-2" "DP-3" ];
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "custom/worktime" "custom/worktime-today" "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+              modules-right = [ # "custom/worktime" "custom/worktime-today"
+                "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
 
               "custom/weather" = {
                 format = "{}";
                 tooltip = true;
                 interval = 3600;
-                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
+                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
                 return-type = "json";
               };
               "custom/keymap" = {
@@ -598,6 +600,9 @@ in {
             notification_actions = {
               device_mounted = [];
             };
+            device_config = [
+              { mount_path = "/run/etc-metadata"; ignore = true; }
+            ];
           };
         };
         network-manager-applet.enable = true;
@@ -768,6 +773,8 @@ in {
               idle-hide = true;
               follow-focus = true;
               start-hidden = true;
+              time-format = "%H:%M:%S";
+              date-format = "%Y-%m-%d";
             };
           };
         };
@@ -931,10 +938,10 @@ in {
         xdgOpenUsePortal = true;
         config = {
           common.default = [ "gtk" ];
-          hyprland.default = [ "gtk" "hyprland" ];
+          hyprland.default = [ "gtk" "kde" "hyprland" ];
         };
         extraPortals = with pkgs; [
-          xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
+          xdg-desktop-portal-kde xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
         ];
       };
     };
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index b1b1b198..183cb322 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -14,7 +14,7 @@
 (setq package-archives nil)
 (package-initialize)
 (require 'use-package)
-(use-package use-package-ensure-system-package :ensure t)
+;; (use-package use-package-ensure-system-package :ensure t)
 
 (require 'evil)
 (evil-mode 1)
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 52dee24f..90ae689a 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -3,17 +3,13 @@ let
   cfg = config.home-manager.users.${userName};
 in {
   monitor = [
-    ",preferred,auto,auto"
-    "eDP-1,3840x2160@60,auto,1.5"
+    ",preferred,auto,auto,bitdepth,8"
+    "eDP-1,3840x2160@60,auto,1.5,bitdepth,8"
   ];
 
   "$terminal" = "kitty";
   "$menu" = "fuzzel";
 
-  exec-once = [
-    "wpaperd"
-  ];
-
   env = [
     "NIXOS_OZONE_WL,1"
     "QT_QPA_PLATFORM,wayland"
@@ -85,7 +81,9 @@ in {
   };
 
   cursor = {
+    use_cpu_buffer = true;
     hide_on_key_press = true;
+    # no_hardware_cursors = 0;
   };
 
   input = {
@@ -147,7 +145,10 @@ in {
     "$mainMod SHIFT, up, swapwindow, u"
     "$mainMod SHIFT, down, swapwindow, d"
 
-    "$mainMod, T, cyclenext"
+    "$mainMod, N, cyclenext, tiled"
+    "$mainMod, T, cyclenext, prev tiled"
+    "$mainMod SHIFT, N, swapnext"
+    "$mainMod SHIFT, T, swapnext, prev"
 
     "$mainMod, G, focusmonitor, 0"
     "$mainMod, C, focusmonitor, 1"
@@ -374,7 +375,7 @@ in {
     "workspace special:pwvucontrol, class:^com\.saivert\.pwvucontrol$"
     "workspace special:easyeffects, class:^com\.github\.wwmm\.easyeffects$"
     "workspace special:blueman, class:^\.blueman-manager-wrapped$"
-    "workspace special:keepass silent, class:^org\.keepassxc\.KeePassXC$, title:^(?!Unlock Database.*)(?!.*(Access Request|Passkey credentials))"
+    "workspace special:keepass silent, class:^org\.keepassxc\.KeePassXC$, title:^(?!Unlock Database.*)(?!.*(Access Request|Passkey credentials)).*$"
     # "group set always lock invade, class:^Element$"
     "workspace 2, class:^firefox$"
     "workspace 4, class:^evince$"
@@ -385,12 +386,12 @@ in {
     "workspace 1, class:^thunderbird$"
     "workspace 5, class:^virt-manager$"
     "workspace 5, class:^qemu$"
-    "float, class:^org\.keepassxc\.KeePassXC$, title:Access Request$"
-    "center, class:^org\.keepassxc\.KeePassXC$, title:Access Request$"
-    "float, class:^org\.keepassxc\.KeePassXC$, title:Passkey credentials$"
-    "center, class:^org\.keepassxc\.KeePassXC$, title:Passkey credentials$"
-    "float, class:^org\.keepassxc\.KeePassXC$, title:^Unlock Database"
-    "center, class:^org\.keepassxc\.KeePassXC$, title:^Unlock Database"
+    "float, class:^org\.keepassxc\.KeePassXC$, title:^.*Access Request$"
+    "center, class:^org\.keepassxc\.KeePassXC$, title:^.*Access Request$"
+    "float, class:^org\.keepassxc\.KeePassXC$, title:^.*Passkey credentials$"
+    "center, class:^org\.keepassxc\.KeePassXC$, title:^.*Passkey credentials$"
+    "float, class:^org\.keepassxc\.KeePassXC$, title:^Unlock Database.*$"
+    "center, class:^org\.keepassxc\.KeePassXC$, title:^Unlock Database.*$"
     "float, class:^xdg-desktop-portal-gtk$"
     "center, class:^xdg-desktop-portal-gtk$"
 
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 33bf7ef2..c8400c28 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -322,6 +322,21 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
+    wpaperd = {
+      Install = {
+        WantedBy = ["graphical-session.target"];
+      };
+      Unit = {
+        BindsTo = ["graphical-session-pre.target"];
+        After = ["graphical-session-pre.target"];
+      };
+      Service = {
+        ExecStart = lib.getExe cfg.programs.wpaperd.package;
+        Type = "simple";
+        Restart = "always";
+        RestartSec = "2s";
+      };
+    };
   } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
       Unit = {
         Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 75a4497c..e3f675a1 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -308,6 +308,7 @@ done < <(find ~/projects ~/uni -regextype posix-extended -maxdepth 2 -type d -re
 
 alias '..'='cd ..'
 alias rzadm=$'tmpdir -i sh -c \'mkdir adm; sshfs gkleen@mgmt01:/adm adm\''
+alias mathcloud=$'tmpdir -i rclone mount --daemon mathcloud:// .'
 alias -g L='| less'
 alias -g S='&> /dev/null'
 alias -g G='| grep'