Switch to qutebrowser

modules/programs/dropbox/default.nix

@@ -15,7 +15,7 @@
       ];
     };
 
-    # Avoids a double firefox install, see https://github.com/NixOS/nixpkgs/pull/31772
+    # `firefox-bin` is unfree, and unnecessary
     nixpkgs.overlays = [ (self: super: { firefox-bin = self.firefox; }) ];
 
     home-manager.users.charlotte = { pkgs, ... }: {

modules/programs/eid/default.nix

@@ -8,11 +8,6 @@
 
   config = lib.mkIf config.chvp.programs.eid.enable {
     environment.systemPackages = [ pkgs.eid-mw ];
-    nixpkgs.overlays = [
-      (self: super: {
-        firefox = super.firefox.override { pkcs11Modules = [ self.eid-mw ]; };
-      })
-    ];
     services.pcscd = {
       enable = true;
       plugins = [ pkgs.ccid ];

modules/programs/hledger/default.nix

@@ -33,13 +33,15 @@ in
     ];
 
     home-manager.users.charlotte = { ... }: {
-      home.packages = [ (pkgs.haskell.lib.justStaticExecutables (pkgs.haskellPackages.override {
+      home.packages = [
+        (pkgs.haskell.lib.justStaticExecutables (pkgs.haskellPackages.override {
           overrides = hself: hsuper: rec {
             hledger = hsuper.callCabal2nixWithOptions "hledger" hledger-repo "--subpath hledger" { };
             hledger-lib = hsuper.callCabal2nixWithOptions "hledger-lib" hledger-repo "--subpath hledger-lib" { };
             doctest = hsuper.doctest_0_18_1;
           };
-      }).hledger) ];
+        }).hledger)
+      ];
     };
   };
 }