flake.lock: Update

Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) • Updated input 'home-manager': 'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24) → 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/4a8545f5e737a6338814a4676dc8e18c7f43fc57' (2023-12-01) → 'github:nix-community/home-manager/d9297efd3a1c3ebb9027dc68f9da0ac002ae94db' (2023-12-12) • Updated input 'nix-pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25) → 'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/8772491ed75f150f02552c60694e1beff9f46013' (2023-11-29) → 'github:nixos/nixos-hardware/7763c6fd1f299cb9361ff2abf755ed9619ef01d6' (2023-12-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01) → 'github:nixos/nixpkgs/781e2a9797ecf0f146e81425c822dca69fe4a348' (2023-12-10) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58' (2023-11-29) → 'github:nixos/nixpkgs/a9bf124c46ef298113270b1f84a164865987a91c' (2023-12-11) • Updated input 'sops-nix': 'github:Mic92/sops-nix/e19071f9958c8da4f4347d3d78790d97e98ba22f' (2023-12-02) → 'github:Mic92/sops-nix/d806e546f96c88cd9f7d91c1c19ebc99ba6277d9' (2023-12-10) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/dfb95385d21475da10b63da74ae96d89ab352431' (2023-11-25) → 'github:NixOS/nixpkgs/b8f33c044e51de6dde3ad80a9676945e0e4e3227' (2023-12-09)
librewolf: Init
2023-12-13 17:49:34 +01:00 · 2023-12-13 17:49:34 +01:00 · 2023-12-13 14:16:54 +01:00 · 2023-12-12 12:46:09 +01:00
7 changed files with 65 additions and 31 deletions
--- a/flake.lock
+++ b/flake.lock
@ -44,11 +44,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
        "type": "github"
      },
      "original": {
@ -85,11 +85,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1700814205,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "lastModified": 1702195709,
+        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
+        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
        "type": "github"
      },
      "original": {
@ -106,11 +106,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701433070,
-        "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=",
+        "lastModified": 1702423270,
+        "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57",
+        "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
        "type": "github"
      },
      "original": {
@ -215,11 +215,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1700922917,
-        "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
+        "lastModified": 1702456155,
+        "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
+        "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc",
        "type": "github"
      },
      "original": {
@ -231,11 +231,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1701250978,
-        "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=",
+        "lastModified": 1702453208,
+        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "8772491ed75f150f02552c60694e1beff9f46013",
+        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
        "type": "github"
      },
      "original": {
@ -247,11 +247,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1701389149,
-        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
+        "lastModified": 1702233072,
+        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
+        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
        "type": "github"
      },
      "original": {
@ -306,11 +306,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1700905716,
-        "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=",
+        "lastModified": 1702148972,
+        "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dfb95385d21475da10b63da74ae96d89ab352431",
+        "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227",
        "type": "github"
      },
      "original": {
@ -322,11 +322,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
        "type": "github"
      },
      "original": {
@ -453,11 +453,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1701518298,
-        "narHash": "sha256-5t8yqKe0oVusV4xgfA+wW58hQJXFMmq0mmaR1gKES+Y=",
+        "lastModified": 1702177193,
+        "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "e19071f9958c8da4f4347d3d78790d97e98ba22f",
+        "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9",
        "type": "github"
      },
      "original": {
--- a/machines/vueko/secrets/mail-users.nix
+++ b/machines/vueko/secrets/mail-users.nix
--- a/pkgs/bwrap-helper/bwrap-helper.py
+++ b/pkgs/bwrap-helper/bwrap-helper.py
@ -183,6 +183,7 @@ argument_groups = {
        False,
        [
            *ro_bind("/run/dbus/system_bus_socket"),
+            *ro_bind(f"/run/user/{uid}/bus"),
            *ro_bind(generate_tmp_file("machine-id", "0" * 32), "/etc/machine-id"),
        ],
    ),
@ -218,7 +219,7 @@ passthrough_args = [
    ("symlink", 2),
 ]

-for (_, arguments) in argument_groups.values():
+for _, arguments in argument_groups.values():
    for argument in arguments:
        assert type(argument) == str

@ -229,7 +230,7 @@ for name, (default, _) in argument_groups.items():
 parser.add_argument("program")
 parser.add_argument("args", nargs="*")

-for (arg, nargs) in passthrough_args:
+for arg, nargs in passthrough_args:
    parse_passthrough_arg(arg, nargs)

 args = parser.parse_args()
@ -240,7 +241,7 @@ for name, (_, arguments) in argument_groups.items():
    if getattr(args, name):
        assembled_args.extend(arguments)

-for (arg, _) in passthrough_args:
+for arg, _ in passthrough_args:
    assemble_passthrough_arg(arg)

 if args.show_cmdline:
--- a/users/simon/modules/default.nix
+++ b/users/simon/modules/default.nix
@ -10,6 +10,7 @@
    ./gpg.nix
    ./gtk.nix
    ./htop.nix
+    ./librewolf.nix
    ./logitech.nix
    ./mail
    ./makemkv.nix
--- a/users/simon/modules/librewolf.nix
+++ b/users/simon/modules/librewolf.nix
@ -0,0 +1,31 @@
+{ config, lib, nixosConfig, ... }:
+let
+  mkOverridesFile = prefs: ''
+    // Generated by Home Manager.
+    // Function taken from upstream home-manger,
+    // modified to use pref instead of defaultPref.
+
+    ${lib.concatStrings (lib.mapAttrsToList (name: value: ''
+      pref("${name}", ${builtins.toJSON value});
+    '') prefs)}
+  '';
+in
+lib.mkIf nixosConfig.sbruder.gui.enable {
+  programs.librewolf = {
+    enable = true;
+    settings = {
+      "accessibility.force_disabled" = 1;
+      "browser.uidensity" = 1; # more compact layout
+      "identity.fxaccounts.enabled" = true;
+      "middlemouse.paste" = false;
+      "network.http.referer.XOriginPolicy" = 2;
+      "privacy.clearOnShutdown.history" = false;
+      "webgl.disabled" = false; # requires installing CanvasBlocker
+
+      #"privacy.resistFingerprinting.letterboxing" = true; # quite annoying
+    };
+  };
+
+  # overrides home-manager’s definition
+  home.file.".librewolf/librewolf.overrides.cfg".text = lib.mkForce (mkOverridesFile config.programs.librewolf.settings);
+}
--- a/users/simon/modules/sway/default.nix
+++ b/users/simon/modules/sway/default.nix
@ -197,6 +197,7 @@ in
        "2" = [
          { app_id = "firefox"; }
          { app_id = "org.qutebrowser.qutebrowser"; }
+          { class = "librewolf"; }
          { class = "qutebrowser"; } # workaround for qutebrowser running under Xwayland
          #{ class="Chromium"; }
        ];
--- a/users/simon/modules/xdg.nix
+++ b/users/simon/modules/xdg.nix
@ -5,7 +5,7 @@
    enable = nixosConfig.sbruder.gui.enable;
    defaultApplications =
      let
-        browser = "org.qutebrowser.qutebrowser.desktop";
+        browser = "librewolf.desktop";
      in
      {
        "application/pdf" = "org.pwmt.zathura.desktop";
Author	SHA1	Message	Date
Simon Bruder	178513a21b	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) • Updated input 'home-manager': 'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24) → 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/4a8545f5e737a6338814a4676dc8e18c7f43fc57' (2023-12-01) → 'github:nix-community/home-manager/d9297efd3a1c3ebb9027dc68f9da0ac002ae94db' (2023-12-12) • Updated input 'nix-pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25) → 'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/8772491ed75f150f02552c60694e1beff9f46013' (2023-11-29) → 'github:nixos/nixos-hardware/7763c6fd1f299cb9361ff2abf755ed9619ef01d6' (2023-12-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01) → 'github:nixos/nixpkgs/781e2a9797ecf0f146e81425c822dca69fe4a348' (2023-12-10) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58' (2023-11-29) → 'github:nixos/nixpkgs/a9bf124c46ef298113270b1f84a164865987a91c' (2023-12-11) • Updated input 'sops-nix': 'github:Mic92/sops-nix/e19071f9958c8da4f4347d3d78790d97e98ba22f' (2023-12-02) → 'github:Mic92/sops-nix/d806e546f96c88cd9f7d91c1c19ebc99ba6277d9' (2023-12-10) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/dfb95385d21475da10b63da74ae96d89ab352431' (2023-11-25) → 'github:NixOS/nixpkgs/b8f33c044e51de6dde3ad80a9676945e0e4e3227' (2023-12-09)	2023-12-13 17:49:34 +01:00
Simon Bruder	c4b904d1af	librewolf: Init This is currently in testing, as qutebrowser has some severe drawbacks.	2023-12-13 17:49:34 +01:00
Simon Bruder	37219a1dd1	bwrap-helper: Include user bus	2023-12-13 14:16:54 +01:00
Simon Bruder	6b9e98fdd3	vueko/mail: Add alias	2023-12-12 12:46:09 +01:00