feat(browser): move to zen

This reverts commit 4d36ddff56
since updated xwayland-satellite breaks fractional scaling.

config/hosts/imxyy-nix/home.nix

@@ -107,7 +107,7 @@
       enable = true;
       defaultApplications =
         let
-          browser = [ "chromium-browser.desktop" ];
+          browser = [ "zen-beta.desktop" ];
           editor = [ "codium.desktop" ];
           imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
         in
@@ -193,7 +193,6 @@
         ".config/dconf"
         ".config/gh"
         ".config/pulse"
-        ".config/chromium"
         ".config/go-musicfox/db"
         ".config/tmux/plugins"
         ".config/pip"

flake.lock

@@ -148,11 +148,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1748673500,
+        "lastModified": 1747392669,
-        "narHash": "sha256-gILKNw2g7eGXt1aVJM0pUdeJQX0z6kXZNoiAJPjXHTo=",
+        "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "4064670e8aeab5353001612efd17b19c7af7fde4",
+        "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb",
         "type": "github"
       },
       "original": {
@@ -501,11 +501,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748528448,
+        "lastModified": 1740479287,
-        "narHash": "sha256-Tyn+PgBm78Ibq28/WbEz8+pYJZMdbJKsyXMCpT6TjrM=",
+        "narHash": "sha256-uIyQi1XF6uKDEvDiH+V7bJtbnwhHfPGJ3f1/4uivCwQ=",
         "owner": "imxyy1soope1",
         "repo": "go-musicfox",
-        "rev": "1870fd3501631577ad4daef1489b03885abcb037",
+        "rev": "0012d41c6004fc18b9b9605b6dfaecd0460a0b0d",
         "type": "github"
       },
       "original": {
@@ -522,11 +522,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748668774,
+        "lastModified": 1747978958,
-        "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=",
+        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9",
+        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
         "type": "github"
       },
       "original": {
@@ -557,6 +557,27 @@
         "type": "github"
       }
     },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "zen",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743604125,
+        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "impermanence": {
       "locked": {
         "lastModified": 1737831083,
@@ -648,11 +669,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1748609405,
+        "lastModified": 1747980132,
-        "narHash": "sha256-tuhbZf+oQ6lvBRN7iySy9ZeY9sMVtlAzQvDBBrvwEsk=",
+        "narHash": "sha256-jdQZZDMYl9JBtWupRRneP1NLDylf2KPUu8z72tJVBJI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "73bcebf1ac79a9a31e29ffd08bcd982c7301d8fc",
+        "rev": "d5ccd8c5e6198bdac760ea65dd6c46e83a55b6f6",
         "type": "github"
       },
       "original": {
@@ -681,11 +702,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748151941,
+        "lastModified": 1747977864,
-        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
+        "narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
+        "rev": "7fdb918cd04076b173a38f026dc5c27ac830b028",
         "type": "github"
       },
       "original": {
@@ -804,11 +825,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1748676562,
+        "lastModified": 1747997506,
-        "narHash": "sha256-7kLFXK3YSwFeSB5pQ6ltrVq/w9b1WaE4fiELAajO748=",
+        "narHash": "sha256-AlmOVBYPqTU/hFfNV44U4iWYenqrJgmi4slKo9/7oRk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f21e6d28b717da40718d8240bc72827bdd4af4b6",
+        "rev": "ade73289c81c6b0e9111c81a05a9068fe6354a04",
         "type": "github"
       },
       "original": {
@@ -820,11 +841,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1748675878,
+        "lastModified": 1747985148,
-        "narHash": "sha256-fprwKEMYNrYnRRrkfX/AmhXgGfTXumab6RWikIsfXdA=",
+        "narHash": "sha256-rv9EeILhI7dVg2JfkfDv4z6VVBqpSx5ASFjRiiXSG3g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6e1f878e3e7b1e5c2efd5b6c89c24b201c3dfc28",
+        "rev": "529318cbb6be66b6903abbd33b97cedef3bb5172",
         "type": "github"
       },
       "original": {
@@ -836,11 +857,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1748585783,
+        "lastModified": 1747981804,
-        "narHash": "sha256-HEvC0V9FIB9APwDBZZQS9Z5vDZwh/YqpmT+TDIaP3zk=",
+        "narHash": "sha256-ymb1dQOfQ3HgBg1IToOYWKtmWSbnMLPkDWvjsrNMsCA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b8af95f4cf511c5f056b463c3a45d2b63c7cfb03",
+        "rev": "223d5291bc354451720a991e8ee81389ee6b73e4",
         "type": "github"
       },
       "original": {
@@ -884,11 +905,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1748460289,
+        "lastModified": 1747744144,
-        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -905,11 +926,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1748664611,
+        "lastModified": 1747992984,
-        "narHash": "sha256-jgCbIiuKJ3M7LkFaK7AlpTkATLLqa2eqeqHTMsMgYoM=",
+        "narHash": "sha256-SqUmz2JI5RHf4PrKumaFtgz9Z+Qhww1PAuiRv+FHzxA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "fa6d453c9203aa1623577ac81cb1e7b10604904d",
+        "rev": "b02a739c15b3b3df4d4590829f216714ab9c60e0",
         "type": "github"
       },
       "original": {
@@ -973,11 +994,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748598934,
+        "lastModified": 1747638064,
-        "narHash": "sha256-c8o4KJPda4HNj/jWwjrWip7QZmfnuOQxKiAadzu/Ibs=",
+        "narHash": "sha256-juEWrS6mOnlU5hva6sewhlRxTFc3cV8bV2Tt3xyTlcg=",
         "ref": "refs/heads/master",
-        "rev": "aa547bad843439615bc0a7f97a55d81058b2e9c8",
+        "rev": "02e06ea5774eeb3af982a483e5c7e949d276eafc",
-        "revCount": 565,
+        "revCount": 535,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -1006,17 +1027,18 @@
         "omz": "omz",
         "quickshell": "quickshell",
         "sops-nix": "sops-nix",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "zen": "zen"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1748636115,
+        "lastModified": 1747323949,
-        "narHash": "sha256-SUkOBIqQmdZK2/CHxkVf/v36JDBlFQl2uckz9gbCLVo=",
+        "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "987cd076e211a02542d5d82264474bb3325e8e7e",
+        "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe",
         "type": "github"
       },
       "original": {
@@ -1070,11 +1092,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1748621009,
+        "lastModified": 1747952198,
-        "narHash": "sha256-X7SqoEEHVsR01GwL9WBs3tuSXdit7YdeBdIHrl+MlZQ=",
+        "narHash": "sha256-GjxRPffuLQQx1G701fzgom+bKxCEJD9fbq44x4gl/n8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "b69e9b761ee682b722e2c9ce46637e767b50f6dc",
+        "rev": "f99fe598a68831debbf096e289296c7c7178c21f",
         "type": "github"
       },
       "original": {
@@ -1272,11 +1294,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748488455,
+        "lastModified": 1747111562,
-        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72",
         "type": "github"
       },
       "original": {
@@ -1284,6 +1306,27 @@
         "repo": "xwayland-satellite",
         "type": "github"
       }
+    },
+    "zen": {
+      "inputs": {
+        "home-manager": "home-manager_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748749284,
+        "narHash": "sha256-g5+9fY/6tDj7tUiRXuQJRPA/AB/aKguxN2B+nMGQh4A=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "ad1b6dcc9916993179a287fc06c3dc32c995a24f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -23,10 +23,6 @@
     # NUR
     nur.url = "github:nix-community/NUR";
 
-    # NeoVim nightly
-    # neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
-    # neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
-
     # OMZ
     omz.url = "github:imxyy1soope1/omz/master";
     omz.inputs.nixpkgs.follows = "nixpkgs";
@@ -56,6 +52,9 @@
     fenix.url = "github:nix-community/fenix";
     fenix.inputs.nixpkgs.follows = "nixpkgs";
 
+    zen.url = "github:0xc000022070/zen-browser-flake";
+    zen.inputs.nixpkgs.follows = "nixpkgs";
+
     infuse.url = "git+https://codeberg.org/amjoseph/infuse.nix";
     infuse.flake = false;
   };
@@ -145,6 +144,7 @@
                 inputs.sops-nix.homeManagerModules.sops
                 inputs.impermanence.nixosModules.home-manager.impermanence
                 inputs.stylix.homeModules.stylix
+                inputs.zen.homeModules.beta
                 # workaround for annoying stylix
                 (
                   { lib, ... }:

modules/desktop/browser/all.nix

@@ -12,6 +12,7 @@ lib.my.makeSwitch {
       firefox.enable = true;
       librewolf.enable = true;
       chromium.enable = true;
+      zen.enable = true;
     };
   };
 }

modules/desktop/browser/chromium.nix

@@ -50,5 +50,8 @@ lib.my.makeHomeProgramConfig {
         "--wayland-text-input-version=3"
       ];
     };
+    my.persist.homeDirs = [
+      ".config/chromium"
+    ];
   };
 }

modules/desktop/browser/default.nix

@@ -4,5 +4,6 @@
     ./firefox.nix
     ./librewolf.nix
     ./chromium.nix
+    ./zen.nix
   ];
 }

modules/desktop/browser/zen.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.my.makeHomeProgramConfig {
+  inherit config;
+  programName = "zen-browser";
+  optionPath = [
+    "desktop"
+    "browser"
+    "zen"
+  ];
+  extraConfig = {
+    my.home.programs.zen-browser = {
+      enable = true;
+      nativeMessagingHosts = [ pkgs.firefoxpwa ];
+      policies = {
+        # find more options here: https://mozilla.github.io/policy-templates/
+        DisableAppUpdate = true;
+        DisableTelemetry = true;
+      };
+    };
+    my.persist.homeDirs = [
+      ".zen"
+    ];
+  };
+}

modules/desktop/wm/niri/config.nix

@@ -66,7 +66,7 @@
         draw-border-with-background = false;
       }
       {
-        matches = [ { app-id = "kitty|foot|Alacritty|ghostty|chromium-browser|wofi"; } ];
+        matches = [ { app-id = "kitty|foot|Alacritty|ghostty|chromium-browser|zen-beta|wofi"; } ];
         opacity = 0.8;
       }
       {
@@ -125,7 +125,7 @@
           "kitty"
           "-1"
         ];
-        "Mod+G".action.spawn = [ "chromium" ];
+        "Mod+G".action.spawn = [ "zen-beta" ];
         "Mod+E".action.spawn = [ "nemo" ];
         "Mod+R".action.spawn = [
           "sh"
@@ -159,7 +159,7 @@
           action.spawn = [
             "playerctl"
             "-i"
-            "firefox,chromium"
+            "firefox,chromium,zen"
             "play-pause"
           ];
         };
@@ -168,7 +168,7 @@
           action.spawn = [
             "playerctl"
             "-i"
-            "firefox,chromium"
+            "firefox,chromium,zen"
             "next"
           ];
         };
@@ -177,7 +177,7 @@
           action.spawn = [
             "playerctl"
             "-i"
-            "firefox,chromium"
+            "firefox,chromium,zen"
             "previous"
           ];
         };
@@ -194,6 +194,9 @@
         "Mod+Ctrl+Up".action = move-window-up;
         "Mod+Ctrl+Down".action = move-window-down;
 
+        "Mod+Alt+Left".action = consume-or-expel-window-left;
+        "Mod+Alt+Right".action = consume-or-expel-window-right;
+
         "Mod+Shift+Left".action = focus-monitor-left;
         "Mod+Shift+Right".action = focus-monitor-right;
         "Mod+Shift+Up".action = focus-monitor-up;
@@ -213,9 +216,6 @@
         "Mod+Shift+Page_Up".action = move-workspace-up;
         "Mod+Shift+Page_Down".action = move-workspace-down;
 
-        "Mod+Comma".action = consume-window-into-column;
-        "Mod+Period".action = expel-window-from-column;
-
         "Mod+L".action = switch-preset-column-width;
         "Mod+Shift+L".action = reset-window-height;
         "Mod+M".action = maximize-column;