From 750ca2f3a8625fa14f1d25f5b53a80234ac7c587 Mon Sep 17 00:00:00 2001
From: Jan-Bulthuis <git@bulthuis.dev>
Date: Tue, 11 Feb 2025 12:24:10 +0100
Subject: [PATCH] Added GDM

---
 modules/base/default.nix                     |  3 ++-
 modules/default.nix                          |  1 +
 modules/greeter/gdm/default.nix              | 25 ++++++++++++++++++++
 user-modules/browser/firefox/default.nix     |  3 ++-
 user-modules/browser/qutebrowser/default.nix |  2 +-
 users/jan.nix                                |  2 +-
 6 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 modules/greeter/gdm/default.nix

diff --git a/modules/base/default.nix b/modules/base/default.nix
index 4a40374..db65d92 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -60,7 +60,8 @@ in
       fontconfig.enable = true;
       neovim.enable = true;
       systemd-boot.enable = true;
-      tuigreet.enable = true; # TODO: Re-enable
+      gdm.enable = true;
+      tuigreet.enable = false; # TODO: Re-enable
     };
 
     # TODO: Remove everything below, it is here out of convenience and should be elsewhere
diff --git a/modules/default.nix b/modules/default.nix
index d2894d3..d2ebaaf 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -17,6 +17,7 @@ with lib;
     ./brightnessctl/default.nix
     ./fontconfig/default.nix
     ./graphics/default.nix
+    ./greeter/gdm/default.nix
     ./greeter/greetd/default.nix
     ./greeter/greetd/tuigreet.nix
     ./locale/default.nix
diff --git a/modules/greeter/gdm/default.nix b/modules/greeter/gdm/default.nix
new file mode 100644
index 0000000..e165fe8
--- /dev/null
+++ b/modules/greeter/gdm/default.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.gdm;
+in
+{
+  options.modules.gdm = {
+    enable = mkEnableOption "gdm";
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver = {
+      enable = true;
+      displayManager.gdm.enable = true;
+      displayManager.gdm.wayland = true;
+      libinput.enable = true;
+    };
+  };
+}
diff --git a/user-modules/browser/firefox/default.nix b/user-modules/browser/firefox/default.nix
index 37cf0a6..435d1a0 100644
--- a/user-modules/browser/firefox/default.nix
+++ b/user-modules/browser/firefox/default.nix
@@ -23,7 +23,7 @@ in
 
       policies = {
         AppAutoUpdate = false;
-        BlockAboutAddons = true;
+        BlockAboutAddons = false;
         BlockAboutConfig = true;
         BlockAboutProfiles = true;
         DisableAppUpdate = true;
@@ -50,6 +50,7 @@ in
 
         extensions = with pkgs.nur.repos.rycee.firefox-addons; [
           ublock-origin
+          tridactyl # TODO: Add toggle for this extension?
         ];
 
         # Theming
diff --git a/user-modules/browser/qutebrowser/default.nix b/user-modules/browser/qutebrowser/default.nix
index 3e3064e..3e7220d 100644
--- a/user-modules/browser/qutebrowser/default.nix
+++ b/user-modules/browser/qutebrowser/default.nix
@@ -23,7 +23,7 @@ in
       enable = true;
 
       extraConfig = ''
-        # config.set("completion.web_history.max_items", 30)
+        config.set("completion.web_history.max_items", 256)
         config.set("colors.webpage.darkmode.enabled", False)
         config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
         config.set("fonts.default_family", "${theme.fonts.interface.name}")
diff --git a/users/jan.nix b/users/jan.nix
index f20812e..118391a 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -41,7 +41,7 @@
       theming.enable = true;
 
       # Window manager
-      i3.enable = true;
+      i3.enable = false;
       river.enable = true;
       waylock.enable = true;
       waybar.enable = true;