feat: Add ghostty terminfo to all hosts

2025-12-09 19:35:52 -05:00
parent cc92c4a1af
commit 4e40968284
5 changed files with 146 additions and 19 deletions
--- a/README.md
+++ b/README.md
@@ -92,6 +92,11 @@ hdh20267 = {

 The external flake must provide a `nixosModules.default` output. This module is imported into the system configuration, allowing the user to override their own system settings (like `shell`, `extraGroups`) and define their Home Manager configuration.

+You can also opt-out of the default system configurations for Zsh and Neovim if you prefer to manage them entirely yourself:
+
+*   `useZshTheme` (default: `true`): Set to `false` to disable the system-wide Zsh theme and configuration.
+*   `useNvimPlugins` (default: `true`): Set to `false` to disable the system-wide Neovim plugins and configuration.
+
 ### Using External Flakes for System Configuration

 You can also override the system-level configuration for a specific host using an external flake. This is useful for adding system services (like Docker), changing boot parameters, installing system-wide packages, or even overriding hardware settings (like swap size) without modifying `inventory.nix`.
@@ -136,6 +141,10 @@ Note that `inputs` are omitted. This ensures the flake uses the exact same `nixp
      modules.users.accounts.hdh20267 = {
        shell = pkgs.fish;
        extraGroups = [ "docker" ];
+        
+        # Optional: Disable system defaults if you manage your own
+        useZshTheme = false;
+        useNvimPlugins = false;
      };
      
      # Enable programs needed for the shell
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764627417,
-        "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
+        "lastModified": 1765326679,
+        "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
+        "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",
        "type": "github"
      },
      "original": {
@@ -158,11 +158,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764776959,
-        "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
+        "lastModified": 1765170903,
+        "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
+        "rev": "20561be440a11ec57a89715480717baf19fe6343",
        "type": "github"
      },
      "original": {
@@ -300,11 +300,11 @@
    },
    "nixpkgs-old-kernel": {
      "locked": {
-        "lastModified": 1764560356,
-        "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
+        "lastModified": 1764939437,
+        "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
+        "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae",
        "type": "github"
      },
      "original": {
@@ -316,11 +316,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1764522689,
-        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
+        "lastModified": 1764983851,
+        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
+        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
        "type": "github"
      },
      "original": {
--- a/hosts/user-config.nix
+++ b/hosts/user-config.nix
@@ -22,6 +22,8 @@ let
      flakeUrl = lib.mkOption { type = lib.types.str; default = ""; description = "URL of a flake to import Home Manager configuration from (e.g. github:user/dotfiles)."; };
      opensshKeys = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; description = "List of SSH public keys for the user."; };
      shell = lib.mkOption { type = lib.types.nullOr lib.types.package; default = null; description = "The shell for this user."; };
+      useZshTheme = lib.mkOption { type = lib.types.bool; default = true; description = "Whether to apply the system Zsh theme."; };
+      useNvimPlugins = lib.mkOption { type = lib.types.bool; default = true; description = "Whether to apply the system Neovim configuration."; };
    };
  };
 in
@@ -78,13 +80,28 @@ in
        let
          enabledAccounts = lib.filterAttrs (name: _: lib.elem name config.modules.users.enabledUsers) config.modules.users.accounts;
        in
-        lib.mapAttrs (name: user: { ... }: {
-          imports = user.extraImports ++ [ ../sw/theme.nix ../sw/nvim.nix ];
-          home.username = name;
-          home.homeDirectory = if name == "root" then "/root" else "/home/${name}";
-          home.stateVersion = "25.11";
-          home.packages = user.homePackages;
-        }) enabledAccounts;
+        lib.mapAttrs (name: user: { ... }: 
+          let
+            isExternal = user.flakeUrl != "";
+            
+            # Common imports based on flags
+            commonImports = 
+                 lib.optional user.useZshTheme ../sw/theme.nix 
+                 ++ lib.optional user.useNvimPlugins ../sw/nvim.nix;
+          in
+          if isExternal then {
+            # External users: Only apply requested system modules.
+            # The external flake is responsible for home.username, home.packages, etc.
+            imports = commonImports;
+          } else {
+            # Local users: Apply full configuration.
+            imports = user.extraImports ++ commonImports;
+            home.username = name;
+            home.homeDirectory = if name == "root" then "/root" else "/home/${name}";
+            home.stateVersion = "25.11";
+            home.packages = user.homePackages;
+          }
+        ) enabledAccounts;
    };
  };
 }
--- a/sw/default.nix
+++ b/sw/default.nix
@@ -15,6 +15,7 @@ in
 {
  imports = [
    ./python.nix
+    ./ghostty.nix
  ];

  options.modules.sw = {
--- a/sw/ghostty.nix
+++ b/sw/ghostty.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+# ============================================================================
+# Ghostty Terminfo Module
+# ============================================================================
+# This module installs the terminfo entry for the Ghostty terminal emulator.
+# It reconstructs the terminfo database from the provided definition and
+# adds it to the system packages.
+
+let
+  ghostty-terminfo = pkgs.runCommand "ghostty-terminfo" {} ''
+    mkdir -p $out/share/terminfo
+    cat > ghostty.info <<'EOF'
+    xterm-ghostty|ghostty|Ghostty,
+            am, bce, ccc, hs, km, mc5i, mir, msgr, npc, xenl, AX, Su, Tc, XT, fullkbd,
+            colors#256, cols#80, it#8, lines#24, pairs#32767,
+            acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+            bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+            clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=^M,
+            csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+            cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+            cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+            cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+            dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\007, ech=\E[%p1%dX,
+            ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+            fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+            ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J,
+            indn=\E[%p1%dS,
+            initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
+            invis=\E[8m, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
+            kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
+            kRIT=\E[1;2C, kbs=\177, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+            kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kent=\EOM,
+            kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+            kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
+            kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
+            kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
+            kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
+            kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
+            kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
+            kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
+            kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R,
+            kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
+            kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
+            kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
+            kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
+            kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+            kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
+            kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
+            kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
+            kf8=\E[19~, kf9=\E[20~, khome=\EOH, kich1=\E[2~,
+            kind=\E[1;2B, kmous=\E[<, knp=\E[6~, kpp=\E[5~,
+            kri=\E[1;2A, oc=\E]104\007, op=\E[39;49m, rc=\E8,
+            rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
+            rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l,
+            rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+            rmul=\E[24m, rs1=\E]\E\\\Ec, sc=\E7,
+            setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
+            setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
+            sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+            sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h,
+            smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m,
+            smul=\E[4m, tbc=\E[3g, tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n,
+            u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd,
+            BD=\E[?2004l, BE=\E[?2004h, Clmg=\E[s,
+            Cmg=\E[%i%p1%d;%p2%ds, Dsmg=\E[?69l, E3=\E[3J,
+            Enmg=\E[?69h, Ms=\E]52;%p1%s;%p2%s\007, PE=\E[201~,
+            PS=\E[200~, RV=\E[>c, Se=\E[2 q,
+            Setulc=\E[58\:2\:\:%p1%{65536}%/%d\:%p1%{256}%/%{255}%&%d\:%p1%{255}%&%d%;m,
+            Smulx=\E[4\:%p1%dm, Ss=\E[%p1%d q,
+            Sync=\E[?2026%?%p1%{1}%-%tl%eh%;,
+            XM=\E[?1006;1000%?%p1%{1}%=%th%el%;, XR=\E[>0q,
+            fd=\E[?1004l, fe=\E[?1004h, kDC3=\E[3;3~, kDC4=\E[3;4~,
+            kDC5=\E[3;5~, kDC6=\E[3;6~, kDC7=\E[3;7~, kDN=\E[1;2B,
+            kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B, kDN6=\E[1;6B,
+            kDN7=\E[1;7B, kEND3=\E[1;3F, kEND4=\E[1;4F,
+            kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F,
+            kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H,
+            kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~,
+            kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kLFT3=\E[1;3D,
+            kLFT4=\E[1;4D, kLFT5=\E[1;5D, kLFT6=\E[1;6D,
+            kLFT7=\E[1;7D, kNXT3=\E[6;3~, kNXT4=\E[6;4~,
+            kNXT5=\E[6;5~, kNXT6=\E[6;6~, kNXT7=\E[6;7~,
+            kPRV3=\E[5;3~, kPRV4=\E[5;4~, kPRV5=\E[5;5~,
+            kPRV6=\E[5;6~, kPRV7=\E[5;7~, kRIT3=\E[1;3C,
+            kRIT4=\E[1;4C, kRIT5=\E[1;5C, kRIT6=\E[1;6C,
+            kRIT7=\E[1;7C, kUP=\E[1;2A, kUP3=\E[1;3A, kUP4=\E[1;4A,
+            kUP5=\E[1;5A, kUP6=\E[1;6A, kUP7=\E[1;7A, kxIN=\E[I,
+            kxOUT=\E[O, rmxx=\E[29m, rv=\E\\[[0-9]+;[0-9]+;[0-9]+c,
+            setrgbb=\E[48\:2\:%p1%d\:%p2%d\:%p3%dm,
+            setrgbf=\E[38\:2\:%p1%d\:%p2%d\:%p3%dm, smxx=\E[9m,
+            xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;,
+            xr=\EP>\\|[ -~]+a\E\\,
+    EOF
+    ${pkgs.ncurses}/bin/tic -x -o $out/share/terminfo ghostty.info
+  '';
+in
+{
+  environment.systemPackages = [ ghostty-terminfo ];
+}