From ca8c1124cadf6be9a831d8d5fb2fd8873fedc14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Tue, 20 May 2025 18:17:18 +0200
Subject: [PATCH] refactor: use hm ghostty module

---
 modules/moritz/profiles/desktop.nix | 10 ++--------
 modules/moritz/programs/ghostty.nix | 19 +++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/modules/moritz/profiles/desktop.nix b/modules/moritz/profiles/desktop.nix
index 0ae56b2..88a837d 100644
--- a/modules/moritz/profiles/desktop.nix
+++ b/modules/moritz/profiles/desktop.nix
@@ -19,7 +19,6 @@ in {
         chromium.enable = mkDefault true;
         firefox.enable = mkDefault true;
         gpg.enable = mkDefault true;
-        ghostty.settings.window-decoration = false;
         niri.enable = mkDefault true;
         nvim.enable = mkDefault true;
         python.versions."311".enable = mkDefault true;
@@ -78,17 +77,12 @@ in {
       vlc
     ];
 
-    fonts = {
-      enableDefaultPackages = true;
-      packages = [
-        pkgs.nerd-fonts.fira-code
-        pkgs.nerd-fonts.intone-mono
-      ];
-    };
+    fonts.enableDefaultPackages = true;
 
     programs.nix-ld.enable = true;
 
     home-manager.users.moritz = {
+      programs.ghostty.settings.window-decoration = false;
       services.nextcloud-client = {
         enable = true;
         startInBackground = true;
diff --git a/modules/moritz/programs/ghostty.nix b/modules/moritz/programs/ghostty.nix
index 67b1408..01426a2 100644
--- a/modules/moritz/programs/ghostty.nix
+++ b/modules/moritz/programs/ghostty.nix
@@ -6,25 +6,16 @@
 }:
 with lib; let
   cfg = config.my.programs.ghostty;
-  format = pkgs.formats.keyValue {
-    listsAsDuplicateKeys = true;
-  };
 in {
-  options.my.programs.ghostty.enable = mkEnableOption "Ghostty";
-  options.my.programs.ghostty.package = mkPackageOption pkgs "ghostty" {};
-  options.my.programs.ghostty.settings = mkOption {
-    inherit (format) type;
-    description = ''
-      Configuration written to {file}`$XDG_CONFIG_HOME/ghostty/config`.
-    '';
-    default = {};
+  options.my.programs.ghostty = {
+    enable = mkEnableOption "Ghostty";
+    package = mkPackageOption pkgs "ghostty" {};
   };
 
   config = mkIf cfg.enable {
     my.terminal.package = cfg.package;
-    home-manager.users.moritz = {
-      home.packages = [cfg.package];
-      xdg.configFile."ghostty/config".source = format.generate "ghostty-config" cfg.settings;
+    home-manager.users.moritz.programs.ghostty = {
+      inherit (cfg) enable package;
     };
   };
 }