1 files changed, 36 insertions, 338 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 83dcf989..58cfb425 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -80,7 +80,7 @@ let
     ];
   };
 
-  lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service";
+  lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
     mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
@@ -92,6 +92,7 @@ in {
     home-manager.users.${userName} = {
       imports = [
         ./libvirt
+        ./niri
         flakeInputs.nix-index-database.hmModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
@@ -184,7 +185,12 @@ in {
           };
         };
 
-        zathura.enable = true;
+        zathura = {
+          enable = true;
+          options = {
+            scroll-page-aware = true;
+          };
+        };
         imv.enable = true;
 
         mpv.config = {
@@ -250,287 +256,6 @@ in {
             "kitty_mod+m" = "detach_window ask";
           };
         };
-        waybar = {
-                enable = true;
-          systemd = {
-                  enable = true;
-            target = "hyprland-session.target";
-          };
-                settings = let
-            windowRewrites = {
-              "(.*) — Mozilla Firefox" = "$1";
-              "(.*) - Mozilla Thunderbird" = "$1";
-              "(.*) - mpv" = "$1";
-            };
-            iconSize = 11;
-          in [
-            {
-              layer = "top";
-              position = "top";
-              height = 14;
-              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" ];
-
-              "custom/weather" = {
-                format = "{}";
-                tooltip = true;
-                interval = 3600;
-                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" = {
-                format = "{}";
-                tooltip = true;
-                return-type = "json";
-                exec = pkgs.writers.writePython3 "keymap" {} ''
-                  import os
-                  import socket
-                  import re
-                  import subprocess
-                  import json
-
-
-                  def output(keymap):
-                      short = keymap
-                      if keymap == "English (programmer Dvorak)":
-                          short = "dvp"
-                      elif keymap == "English (US)":
-                          short = "<span color=\"#ffffff\">us</span>"
-                      print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
-
-
-                  r = subprocess.run(["hyprctl", "devices", "-j"], check=True, stdout=subprocess.PIPE, text=True)  # noqa: E501
-                  for keyboard in json.loads(r.stdout)['keyboards']:
-                      if keyboard['name'] != "at-translated-set-2-keyboard":
-                          continue
-                      output(keyboard['active_keymap'])
-
-                  sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                  sock.connect(os.environ["XDG_RUNTIME_DIR"] + "/hypr/" + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] + "/.socket2.sock")  # noqa: E501
-                  expected = re.compile(r'^activelayout>>at-translated-set-2-keyboard,(?P<keymap>.+)$')  # noqa: E501
-                  for line in sock.makefile(buffering=1, encoding='utf-8'):
-                      if match := expected.match(line):
-                          output(match.group("keymap"))
-                '';
-                on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
-              };
-              "custom/worktime" = {
-                interval = 60;
-                exec = getExe pkgs.worktime;
-                tooltip = false;
-              };
-              "custom/worktime-today" = {
-                interval = 60;
-                exec = "${getExe pkgs.worktime} today";
-                tooltip = false;
-              };
-              "hyprland/workspaces" = {
-                all-outputs = true;
-              };
-              "hyprland/window" = {
-                separate-outputs = true;
-                icon = true;
-                icon-size = 14;
-                rewrite = windowRewrites;
-              };
-              clock = {
-                  interval = 1;
-                  # timezone = "Europe/Berlin";
-                  format = "W{:%V-%u %F %H:%M:%S%Ez}";
-                  tooltip-format = "<tt><small>{calendar}</small></tt>";
-                  calendar = {
-                    mode = "year";
-                    mode-mon-col = 3;
-                    weeks-pos = "left";
-                    on-scroll = 1;
-                    format = {
-                      months = "<span color='#ffead3'><b>{}</b></span>";
-                      days = "{}";
-                      weeks = "<span color='#99ffdd'><b>{}</b></span>";
-                      weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-                      today = "<span color='#ff6699'><b>{}</b></span>";
-                    };
-                  };
-              };
-              battery = {
-                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-                icon-size = iconSize - 2;
-                states = { warning = 30; critical = 15; };
-                format-icons = ["&#xf008e;" "&#xf007a;" "&#xf007b;" "&#xf007c;" "&#xf007d;" "&#xf007e;" "&#xf007f;" "&#xf0080;" "&#xf0081;" "&#xf0082;" "&#xf0079;" ];
-                format-charging = "&#xf0084;";
-                format-plugged = "&#xf06a5;";
-                tooltip-format = "{capacity}% {timeTo}";
-                interval = 20;
-              };
-              tray = {
-                icon-size = 16;
-                # show-passive-items = true;
-                spacing = 1;
-              };
-              privacy = {
-                icon-spacing = 7;
-                icon-size = iconSize;
-                modules = [
-                  { type = "screenshare"; }
-                  { type = "audio-in"; }
-                ];
-              };
-              idle_inhibitor = {
-                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-                icon-size = iconSize;
-                format-icons = { activated = "&#xf0208;"; deactivated = "&#xf0209;"; };
-                timeout = 120;
-              };
-              backlight = {
-                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-                icon-size = iconSize;
-                tooltip-format = "{percent}%";
-                format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-                on-scroll-up = "lightctl -d -e4 -n1 up";
-                on-scroll-down = "lightctl -d -e4 -n1 down";
-              };
-              wireplumber = {
-                format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-                icon-size = iconSize;
-                tooltip-format = "{volume}% {node_name}";
-                format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
-                format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
-                # ignored-sinks = ["Easy Effects Sink"];
-                on-scroll-up = "volumectl -d -u up";
-                on-scroll-down = "volumectl -d -u down";
-                on-click = "volumectl -d toggle-mute";
-              };
-            }
-            {
-              layer = "top";
-              position = "top";
-              height = 14;
-              output = [ "!eDP-1" "!DP-2" "!DP-3" ];
-              modules-left = [ "hyprland/workspaces" ];
-              modules-center = [ "hyprland/window" ];
-              modules-right = [ "clock" ];
-
-              "hyprland/workspaces" = {
-                all-outputs = false;
-              };
-              "hyprland/window" = {
-                separate-outputs = true;
-                icon = true;
-                icon-size = 14;
-                rewrite = windowRewrites;
-              };
-              clock = {
-                  interval = 1;
-                  # timezone = "Europe/Berlin";
-                  format = "{:%H:%M}";
-                  tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}";
-              };
-            }
-          ];
-          style = ''
-            @define-color white #ffffff;
-            @define-color grey #555555;
-            @define-color blue #1a8fff;
-            @define-color green #23fd00;
-            @define-color orange #f28a21;
-            @define-color red #f2201f;
-
-            * {
-              border: none;
-              font-family: "Fira Sans Nerd Font";
-              font-size: 10pt;
-              min-height: 0;
-            }
-
-            window#waybar {
-              background-color: rgba(0, 0, 0, 0.66);
-              color: @white;
-            }
-
-            .modules-left {
-              margin-left: 9px;
-            }
-            .modules-right {
-              margin-right: 9px;
-            }
-
-            .module {
-              margin: 0 5px;
-            }
-
-            #workspaces button {
-              color: @grey;
-            }
-            #workspaces button.hosting-monitor {
-              color: @white;
-            }
-            #workspaces button.visible {
-              color: @blue;
-            }
-            #workspaces button.active {
-              color: @green;
-            }
-            #workspaces button.urgent {
-              color: @red;
-            }
-
-            #custom-weather, #custom-keymap, #custom-worktime, #custom-worktime-today {
-              color: @grey;
-              margin: 0 5px;
-            }
-            #custom-weather, #custom-worktime-today {
-              margin-right: 3px;
-            }
-            #custom-keymap, #custom-weather {
-              margin-left: 3px;
-            }
-
-            #tray {
-              margin: 0;
-            }
-            #battery, #idle_inhibitor, #backlight, #wireplumber {
-              color: @grey;
-              margin: 0 5px 0 2px;
-            }
-            #idle_inhibitor {
-              margin-right: 2px;
-              margin-left: 3px;
-            }
-            #battery {
-              margin-right: 3px;
-            }
-            #battery.discharging {
-              color: @white;
-            }
-            #battery.warning {
-              color: @orange;
-            }
-            #battery.critical {
-              color: @red;
-            }
-            #battery.charging {
-              color: @white;
-            }
-            #idle_inhibitor.activated {
-              color: @white;
-            }
-
-            #idle_inhibitor {
-              padding-top: 1px;
-            }
-
-            #privacy {
-              color: @red;
-              margin: -1px 2px 0px 5px;
-            }
-            #clock {
-              /* margin-right: 5px; */
-            }
-          '';
-              };
         wpaperd = {
           enable = true;
           settings.default = {
@@ -543,7 +268,7 @@ in {
           enable = true;
           settings = {
             main = {
-              terminal = lib.getExe pkgs.kitty;
+              terminal = lib.getExe cfg.programs.kitty.package;
               layer = "overlay";
               icon-theme = "Paper";
               font = "Fira Sans";
@@ -565,14 +290,6 @@ in {
       };
 
       services = {
-        dunst = {
-          settings = import ./dunst-settings.nix inputs;
-          iconTheme = {
-            package = pkgs.paper-icon-theme;
-            name = "Paper";
-          };
-          enable = true;
-        };
         emacs = {
           enable = true;
           socketActivation.enable = true;
@@ -601,8 +318,11 @@ in {
               device_mounted = [];
             };
             device_config = [
-              { mount_path = "/run/etc-metadata"; ignore = true; }
+              { loop_file = "/nix/store/*-etc-metadata.erofs"; is_mounted = false; ignore = true; }
+              { mount_path = "/run/nixos-etc-metadata"; ignore = true; }
+              { mount_path = "/run/nixos-etc-metadata.*"; ignore = true; }
             ];
+            icon_names.media = ["drive-removable-media-symbolic"];
           };
         };
         network-manager-applet.enable = true;
@@ -639,31 +359,17 @@ in {
           enable = true;
           events = [
             { event = "before-sleep"; command = lockCommand; }
-            { event = "after-resume"; command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on"; }
             { event = "lock"; command = lockCommand; }
           ];
           timeouts = [
-            { timeout = 300;
-              command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off";
-            }
             { timeout = 330; command = lockCommand; }
           ];
           extraArgs = [
+            "-w"
             "idlehint" "30"
           ];
         };
         poweralertd.enable = true;
-        avizo = {
-          enable = true;
-          settings.default = {
-            time = "1.0";
-            background = "rgba(0, 0, 0, 0.8)";
-            border-color = "rgba(0, 0, 0, 1)";
-            bar-fg-color = "rgba(160, 160, 160, 1)";
-            bar-bg-color = "rgba(32, 32, 32, 0.96)";
-            # y-offset = "0.25";
-          };
-        };
       };
 
       home.pointerCursor = {
@@ -704,16 +410,18 @@ in {
           fira fira-code pwvucontrol wrappedKeepassxc wl-clipboard-rs
           mumble pulseaudio-ctl pamixer libnotify screen-message
           wrappedYTMDesktop libsForQt5.qt5ct playerctl evince
-          thunderbird zoom-us steam steam-run wireshark virt-manager
-          rclone cached-nix-shell worktime fira-code-symbols
-          libreoffice xournalpp google-chrome nixos-shell virt-viewer
-          freerdp gnome-icon-theme paper-icon-theme sshpassSecret
-          weechat element-desktop matrix-synapse-tools.synadm
+          thunderbird zoom-us xdg-desktop-portal steam steam-run
+          wireshark virt-manager rclone cached-nix-shell worktime
+          fira-code-symbols libreoffice xournalpp google-chrome
+          nixos-shell virt-viewer freerdp gnome-icon-theme
+          paper-icon-theme sshpassSecret weechat element-desktop
+          matrix-synapse-tools.synadm
           flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
           sieve-connect gimp inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
           libguestfs-with-appliance nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
+          swtpm
         ];
 
         file = {
@@ -748,13 +456,6 @@ in {
       };
 
       xdg.configFile = {
-        "dunst/dunstrc.d" = {
-          source = ./dunstrc.d;
-          recursive = true;
-          onChange = ''
-            ${pkgs.systemd}/bin/systemctl --user try-restart dunst
-          '';
-        };
         "wireplumber" = {
           source = ./wireplumber;
           recursive = true;
@@ -786,6 +487,18 @@ in {
           };
         };
         "emacs/init.el".source = ./emacs.el;
+        "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
+          [Unit]
+          After=graphical-session.target
+        '';
+        "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
+          [Unit]
+          Before=graphical-session-pre.target
+        '';
+        "pdfpc/pdfpcrc".text = ''
+          mouse 8 prev
+          mouse 9 next
+        '';
       };
 
       xdg.dataFile = {
@@ -903,7 +616,6 @@ in {
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
               --property 'Environment=DSCP=46' \
               -- ${pkgs.dscp}/bin/dscp ${pkgs.google-chrome}/bin/google-chrome-stable \
-              --force-device-scale-factor=1.5 \
               --class=Rainbow \
               --kiosk "https://web.openrainbow.com" \
               --user-data-dir=''${HOME}/.config/google-chrome-rainbow
@@ -912,6 +624,9 @@ in {
             url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
             hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
           };
+          settings = {
+            StartupWMClass = "Rainbow";
+          };
         };
       };
 
@@ -927,23 +642,6 @@ in {
           color-scheme = "prefer-dark";
         };
       };
-
-      wayland.windowManager.hyprland = {
-        enable = true;
-        settings = import ./hyprland.nix inputs;
-      };
-
-      xdg.portal = {
-        enable = true;
-        xdgOpenUsePortal = true;
-        config = {
-          common.default = [ "gtk" ];
-          hyprland.default = [ "gtk" "kde" "hyprland" ];
-        };
-        extraPortals = with pkgs; [
-          xdg-desktop-portal-kde xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
-        ];
-      };
     };
   };
 }