Update home-manager The reason I kept its version is they introduced shitty Ghostty config due to rushed release. Time passed and their Ghostty config is now usable so migrated to theirs.

Changes

4 changed files (+43/-68)

• features/gui/ghostty.nix
  • @@ -4,6 +4,8 @@ config = lib.mkIf config.features.gui.enable {
    programs.ghostty = { enable = true; + enableZshIntegration = true; + package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty
  • @@ -27,22 +29,22 @@ # Enabled by default.
    font-feature = [ "calt" "-dlig" ]; copy-on-select = false; - }; - keybindings = { - "ctrl+shift+t" = "new_tab"; - "ctrl+shift+n" = "new_split:down"; - "ctrl+shift+m" = "new_split:right"; + keybind = [ + "ctrl+shift+t=new_tab" + "ctrl+shift+n=new_split:down" + "ctrl+shift+m=new_split:right" - "super+shift+k" = "resize_split:up,20"; - "super+shift+h" = "resize_split:left,20"; - "super+shift+j" = "resize_split:down,20"; - "super+shift+l" = "resize_split:right,20"; + "super+shift+k=resize_split:up,20" + "super+shift+h=resize_split:left,20" + "super+shift+j=resize_split:down,20" + "super+shift+l=resize_split:right,20" - "ctrl+shift+k" = "goto_split:up"; - "ctrl+shift+h" = "goto_split:left"; - "ctrl+shift+j" = "goto_split:down"; - "ctrl+shift+l" = "goto_split:right"; + "ctrl+shift+k=goto_split:up" + "ctrl+shift+h=goto_split:left" + "ctrl+shift+j=goto_split:down" + "ctrl+shift+l=goto_split:right" + ]; }; }; };
• flake.lock
  • @@ -88,21 +88,6 @@ "repo": "flake-utils",
    "type": "github" } }, - "hm-ghostty": { - "locked": { - "lastModified": 1702368251, - "narHash": "sha256-hafrDmzGplzm+vdIo+LkOjRfA4qRcy5JmpGGksnht5c=", - "owner": "clo4", - "repo": "ghostty-hm-module", - "rev": "887e13a6e7acf5ffaab0119d96e476d84db90904", - "type": "github" - }, - "original": { - "owner": "clo4", - "repo": "ghostty-hm-module", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [
  • @@ -110,11 +95,11 @@ "nixpkgs"
    ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1743438213, + "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "ccd7df836e1f42ea84806760f25b77b586370259", "type": "github" }, "original": {
  • @@ -235,7 +220,6 @@ }
    }, "root": { "inputs": { - "hm-ghostty": "hm-ghostty", "home-manager": "home-manager", "mac-app-util": "mac-app-util", "nixgl": "nixgl",
• flake.nix
  • @@ -18,10 +18,6 @@ mac-app-util = {
    url = "github:hraban/mac-app-util"; }; - hm-ghostty = { - url = "github:clo4/ghostty-hm-module"; - }; - nixgl = { url = "github:nix-community/nixGL"; };
  • @@ -33,7 +29,6 @@ , nixpkgs
    , home-manager , nur , mac-app-util - , hm-ghostty , nixgl , }:
  • @@ -61,7 +56,6 @@ [
    # Fix Home-Manager on MacOS cannot register GUI applications and Spotlight # won't find those applications. mac-app-util.homeManagerModules.default - hm-ghostty.homeModules.default ./features ({ config, ... }: rec { # Turn off Home Manager news bs
• themes/catppuccin/default.nix
  • @@ -277,37 +277,32 @@ {
    settings = { theme = "light:catppuccin-latte-corrected,dark:catppuccin-${darkFlavor}"; }; - }; - # The default palette is not correctly inverted. - xdg.configFile."ghostty/themes/catppuccin-latte-corrected" = - let - latte = json.latte; - in - lib.mkIf config.programs.ghostty.enable { - text = '' - palette = 0=${latte.crust.hex} - palette = 1=${latte.red.hex} - palette = 2=${latte.green.hex} - palette = 3=${latte.yellow.hex} - palette = 4=${latte.blue.hex} - palette = 5=${latte.pink.hex} - palette = 6=${latte.teal.hex} - palette = 7=${latte.subtext0.hex} - palette = 8=${latte.surface2.hex} - palette = 9=#de293e - palette = 10=#49af3d - palette = 11=#eea02d - palette = 12=#456eff - palette = 13=#fe85d8 - palette = 14=#2d9fa8 - palette = 15=${latte.text.hex} - background = ${stripSharp latte.base.hex} - foreground = ${stripSharp latte.text.hex} - cursor-color = ${stripSharp latte.rosewater.hex} - selection-background = ${stripSharp latte.surface2.hex} - selection-foreground = ${stripSharp latte.text.hex} - ''; + themes.catppuccin-latte-corrected = { + palette = [ + "0=${json.latte.crust.hex}" + "1=${json.latte.red.hex}" + "2=${json.latte.green.hex}" + "3=${json.latte.yellow.hex}" + "4=${json.latte.blue.hex}" + "5=${json.latte.pink.hex}" + "6=${json.latte.teal.hex}" + "7=${json.latte.subtext0.hex}" + "8=${json.latte.surface2.hex}" + "9=#de293e" + "10=#49af3d" + "11=#eea02d" + "12=#456eff" + "13=#fe85d8" + "14=#2d9fa8" + "15=${json.latte.text.hex}" + ]; + background = stripSharp json.latte.base.hex; + foreground = stripSharp json.latte.text.hex; + cursor-color = stripSharp json.latte.rosewater.hex; + selection-background = stripSharp json.latte.surface2.hex; + selection-foreground = stripSharp json.latte.text.hex; + }; }; }; }