1
0
Просмотр исходного кода

feat(desktop): re-added zen browser thanks to 0xc000022070/zen-browser-flake

Zander Hawke 6 месяцев назад
Родитель
Сommit
a5c7e3df23
3 измененных файлов с 61 добавлено и 22 удалено
  1. 23 0
      flake.lock
  2. 3 0
      flake.nix
  3. 35 22
      home/features/desktop/zen-browser.nix

+ 23 - 0
flake.lock

@@ -144,6 +144,28 @@
         "type": "github"
         "type": "github"
       }
       }
     },
     },
+    "firefox-addons": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1765425862,
+        "narHash": "sha256-HQcdXuF2hG0O9WnDn6PieqBAwueTQ48ae92H7bRiS0I=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "f695233e74322af84dc17af16f7e2ad419d309a8",
+        "type": "gitlab"
+      },
+      "original": {
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
+      }
+    },
     "flake-compat": {
     "flake-compat": {
       "flake": false,
       "flake": false,
       "locked": {
       "locked": {
@@ -568,6 +590,7 @@
         "darwin": "darwin_2",
         "darwin": "darwin_2",
         "devenv": "devenv",
         "devenv": "devenv",
         "disko": "disko",
         "disko": "disko",
+        "firefox-addons": "firefox-addons",
         "git-hooks": "git-hooks_2",
         "git-hooks": "git-hooks_2",
         "home-manager": "home-manager_2",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "impermanence": "impermanence",

+ 3 - 0
flake.nix

@@ -36,6 +36,9 @@
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     zen-browser.inputs.nixpkgs.follows = "nixpkgs";
     zen-browser.inputs.nixpkgs.follows = "nixpkgs";
     zen-browser.inputs.home-manager.follows = "home-manager";
     zen-browser.inputs.home-manager.follows = "home-manager";
+
+    firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+    firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
   };
   };
 
 
   outputs =
   outputs =

+ 35 - 22
home/features/desktop/zen-browser.nix

@@ -1,15 +1,9 @@
 { inputs
 { inputs
 , config
 , config
+, pkgs
 , ...
 , ...
 }:
 }:
 
 
-let
-  mkExtensionSettings = builtins.mapAttrs (_: pluginId: {
-    install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi";
-    installation_mode = "force_installed";
-  });
-in
-
 {
 {
   imports = [
   imports = [
     inputs.zen-browser.homeModules.beta
     inputs.zen-browser.homeModules.beta
@@ -32,20 +26,23 @@ in
       Cryptomining = true;
       Cryptomining = true;
       Fingerprinting = true;
       Fingerprinting = true;
     };
     };
-
-    ExtensionSettings = mkExtensionSettings {
-      "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
-      "[email protected]" = "ublock-origin";
-      "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}" = "videospeed";
-      "addon@simplelogin" = "simplelogin";
-      "[email protected]" = "alby";
-      "[email protected]" = "darkreader";
-    };
   };
   };
 
 
   programs.zen-browser = {
   programs.zen-browser = {
     enable = true;
     enable = true;
     profiles."default" = {
     profiles."default" = {
+      extensions.packages =
+        with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system};
+        [
+          vimium
+          ublock-origin
+          videospeed
+          simplelogin
+          alby
+          darkreader
+          bitwarden
+        ];
+
       containersForce = true;
       containersForce = true;
       containers = {
       containers = {
         Personal = {
         Personal = {
@@ -62,35 +59,51 @@ in
 
 
         Shopping = {
         Shopping = {
           color = "yellow";
           color = "yellow";
-          icon = "dollarsign";
+          icon = "gift";
           id = 3;
           id = 3;
         };
         };
+
+        Video = {
+          color = "red";
+          icon = "chill";
+          id = 4;
+        };
       };
       };
 
 
-      spacesForce = true;
+      # TODO: Figure out how to enable this.
+      # spacesForce = true;
       spaces =
       spaces =
         let
         let
           containers = config.programs.zen-browser.profiles."default".containers;
           containers = config.programs.zen-browser.profiles."default".containers;
         in
         in
         {
         {
-          "Space" = {
-            id = "c6de089c-410d-4206-961d-ab11f988d40a";
+          "Personal" = {
+            id = "{c6de089c-410d-4206-961d-ab11f988d40a}";
             icon = "🏠";
             icon = "🏠";
             container = containers.Personal.id;
             container = containers.Personal.id;
             position = 1000;
             position = 1000;
           };
           };
+
           "Work" = {
           "Work" = {
-            id = "cdd10fab-4fc5-494b-9041-325e5759195b";
+            id = "{cdd10fab-4fc5-494b-9041-325e5759195b}";
             icon = "🚀";
             icon = "🚀";
             container = containers.Development.id;
             container = containers.Development.id;
             position = 2000;
             position = 2000;
           };
           };
+
           "Shopping" = {
           "Shopping" = {
-            id = "78aabdad-8aae-4fe0-8ff0-2a0c6c4ccc24";
+            id = "{78aabdad-8aae-4fe0-8ff0-2a0c6c4ccc24}";
             icon = "💸";
             icon = "💸";
             container = containers.Shopping.id;
             container = containers.Shopping.id;
             position = 3000;
             position = 3000;
           };
           };
+
+          "YouTube" = {
+            id = "{7cb56859-3be7-47de-9136-0faac58c5336}";
+            icon = "https://upload.wikimedia.org/wikipedia/commons/0/09/YouTube_full-color_icon_%282017%29.svg";
+            container = containers.Video.id;
+            position = 4000;
+          };
         };
         };
     };
     };
   };
   };