2 files changed, 6 insertions, 9 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 216a98ea..0e25fc95 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -273,8 +273,6 @@ in {
               workspaces = list()
 
               def focus_workspace(output, workspace):
-                  global workspace_history, history_lock
-
                   with history_lock:
                       workspace_history[output] = [workspace] + [ws for ws in workspace_history[output] if ws != workspace]  # noqa: E501
                       print(json.dumps(workspace_history), file=sys.stderr)
@@ -299,8 +297,6 @@ in {
 
           class RequestHandler(StreamRequestHandler):
               def handle(self):
-                  global workspace_history, history_lock
-
                   with detaching(TextIOWrapper(self.wfile, encoding='utf-8', write_through=True)) as out:  # noqa: E501
                       with history_lock:
                           json.dump(workspace_history, out)
@@ -455,8 +451,8 @@ in {
           (plain "layout" [
             (leaf "gaps" 8)
             (plain "struts" [
-              (leaf "left" 0)
-              (leaf "right" 0)
+              (leaf "left" 26)
+              (leaf "right" 26)
               (leaf "top" 0)
               (leaf "bottom" 0)
             ])
@@ -609,6 +605,7 @@ in {
           (plain "window-rule" [
             (leaf "match" { app-id = "^org\\.pwmt\\.zathura$"; })
             (leaf "match" { app-id = "^evince$"; })
+            (leaf "match" { app-id = "^org\\.gnome\\.Papers$"; })
             (leaf "default-column-display" "tabbed")
           ])
 
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index bae818f6..cc131c08 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -20,7 +20,7 @@ in {
         {
           layer = "top";
           position = "top";
-          height = 14;
+          height = 21;
           output = [ "eDP-1" "DP-2" "DP-3" ];
           modules-left = [ "niri/workspaces" ];
           modules-center = [ "niri/window" ];
@@ -254,10 +254,10 @@ in {
         }
 
         .modules-left {
-          margin-left: 12px;
+          margin-left: 38px;
         }
         .modules-right {
-          margin-right: 12px;
+          margin-right: 38px;
         }
 
         .module {