From be98bcad26008139b4dd056454ef0c4a05b84239 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 23:31:58 +0100
Subject: [PATCH] Move qutebrowser configuration

---
 home-manager/opdavies/t480.nix                |  2 -
 modules/home-manager/browsers/qutebrowser.nix | 49 -------------------
 modules/home-manager/default.nix              |  1 -
 modules2/browsers/qutebrowser/enable.nix      |  3 ++
 .../browsers/qutebrowser/key-bindings.nix     | 14 ++++++
 modules2/browsers/qutebrowser/package.nix     |  7 +++
 .../browsers/qutebrowser/search-engines.nix   | 10 ++++
 modules2/browsers/qutebrowser/settings.nix    |  5 ++
 8 files changed, 39 insertions(+), 52 deletions(-)
 delete mode 100644 modules/home-manager/browsers/qutebrowser.nix
 create mode 100644 modules2/browsers/qutebrowser/enable.nix
 create mode 100644 modules2/browsers/qutebrowser/key-bindings.nix
 create mode 100644 modules2/browsers/qutebrowser/package.nix
 create mode 100644 modules2/browsers/qutebrowser/search-engines.nix
 create mode 100644 modules2/browsers/qutebrowser/settings.nix

diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 8ba49972..bd8fd079 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -20,8 +20,6 @@
 
         firefox.enable = true;
         firefox.homepageUrl = "https://nixedo.oliverdavies.uk";
-
-        qutebrowser.enable = true;
       };
 
       gtk.enable = true;
diff --git a/modules/home-manager/browsers/qutebrowser.nix b/modules/home-manager/browsers/qutebrowser.nix
deleted file mode 100644
index 407424bf..00000000
--- a/modules/home-manager/browsers/qutebrowser.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.browsers.qutebrowser;
-in
-{
-  options.features.desktop.browsers.qutebrowser.enable = mkEnableOption "Enable qutebrowser";
-
-  config = mkIf cfg.enable {
-    programs.qutebrowser = {
-      enable = true;
-
-      package = pkgs.stable.qutebrowser;
-
-      searchEngines = {
-        dp = "https://www.drupal.org/project/{}";
-        du = "https://www.drupal.org/u/{}";
-        gh = "https://github.com/search?q={}";
-        mn = "https://mynixos.com/search?q={}";
-        nx = "https://search.nixos.org/packages?query={}";
-        yt = "https://www.youtube.com/results?search_query={}";
-      };
-
-      settings = {
-        colors.webpage.darkmode.enabled = true;
-      };
-
-      keyBindings = {
-        normal = {
-          "<Ctrl-d>" = "config-cycle colors.webpage.darkmode.enabled true false";
-
-          "xb" = "config-cycle statusbar.show always never";
-          "xt" = "config-cycle tabs.show always never";
-          "xx" = mkMerge [
-            "config-cycle statusbar.show always never"
-            "config-cycle tabs.show always never"
-          ];
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 7fe7ca72..2bb5c2e6 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -3,7 +3,6 @@
     ./bookmarkthis.nix
     ./browsers/chromium.nix
     ./browsers/firefox.nix
-    ./browsers/qutebrowser.nix
     ./dev-commit.nix
     ./gtk.nix
     ./media/handbrake.nix
diff --git a/modules2/browsers/qutebrowser/enable.nix b/modules2/browsers/qutebrowser/enable.nix
new file mode 100644
index 00000000..a36898ab
--- /dev/null
+++ b/modules2/browsers/qutebrowser/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.enable = true;
+}
diff --git a/modules2/browsers/qutebrowser/key-bindings.nix b/modules2/browsers/qutebrowser/key-bindings.nix
new file mode 100644
index 00000000..f825b833
--- /dev/null
+++ b/modules2/browsers/qutebrowser/key-bindings.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.keyBindings.normal = {
+    "<Ctrl-d>" = "config-cycle colors.webpage.darkmode.enabled true false";
+
+    "xb" = "config-cycle statusbar.show always never";
+    "xt" = "config-cycle tabs.show always never";
+    "xx" = lib.mkMerge [
+      "config-cycle statusbar.show always never"
+      "config-cycle tabs.show always never"
+    ];
+  };
+}
diff --git a/modules2/browsers/qutebrowser/package.nix b/modules2/browsers/qutebrowser/package.nix
new file mode 100644
index 00000000..c44f8487
--- /dev/null
+++ b/modules2/browsers/qutebrowser/package.nix
@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      programs.qutebrowser.package = pkgs.stable.qutebrowser;
+    };
+}
diff --git a/modules2/browsers/qutebrowser/search-engines.nix b/modules2/browsers/qutebrowser/search-engines.nix
new file mode 100644
index 00000000..5b15d91b
--- /dev/null
+++ b/modules2/browsers/qutebrowser/search-engines.nix
@@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.searchEngines = {
+    dp = "https://www.drupal.org/project/{}";
+    du = "https://www.drupal.org/u/{}";
+    gh = "https://github.com/search?q={}";
+    mn = "https://mynixos.com/search?q={}";
+    nx = "https://search.nixos.org/packages?query={}";
+    yt = "https://www.youtube.com/results?search_query={}";
+  };
+}
diff --git a/modules2/browsers/qutebrowser/settings.nix b/modules2/browsers/qutebrowser/settings.nix
new file mode 100644
index 00000000..f14cf732
--- /dev/null
+++ b/modules2/browsers/qutebrowser/settings.nix
@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.settings = {
+    colors.webpage.darkmode.enabled = true;
+  };
+}