From cdeff50bd49c943271c6de1621a8a9e7b205a949 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Fri, 27 Dec 2024 10:10:27 -0500 Subject: [PATCH] ghostty: use hm module --- flake.lock | 84 ++++++++++++++++++++++++++++++++++-- flake.nix | 3 +- modules/home/all/ghostty.nix | 14 +++++- 3 files changed, 94 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 957ac46..4032f08 100644 --- a/flake.lock +++ b/flake.lock @@ -451,6 +451,21 @@ "type": "github" } }, + "ghostty-hm": { + "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" + } + }, "git-hooks": { "flake": false, "locked": { @@ -678,11 +693,42 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -692,16 +738,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732052838, - "narHash": "sha256-ENsVNUEvJp7/7f6x7MVqtiVkFKkGy0Ux/ZqQM3Sb4CQ=", + "lastModified": 1734636407, + "narHash": "sha256-HF5shWnOv5uJJSKJnnbLvE+lqCTCTKY2JlKs14kVKOo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a", + "rev": "0bd541f2fd902dbfa04c3ea2ccf679395e316887", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.45.2", + "ref": "v0.46.2", "repo": "Hyprland", "type": "github" } @@ -731,6 +777,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -1361,6 +1436,7 @@ "disko": "disko", "flake-parts": "flake-parts_2", "ghostty": "ghostty", + "ghostty-hm": "ghostty-hm", "git-hooks": "git-hooks", "github-nix-ci": "github-nix-ci", "home-manager": "home-manager_2", diff --git a/flake.nix b/flake.nix index 68eba38..51925e9 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,9 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; actualism-app.url = "github:srid/actualism-app"; omnix.url = "github:juspay/omnix"; - hyprland.url = "github:hyprwm/Hyprland/v0.45.2"; + hyprland.url = "github:hyprwm/Hyprland/v0.46.2"; ghostty.url = "github:ghostty-org/ghostty"; + ghostty-hm.url = "github:clo4/ghostty-hm-module"; # Neovim nixvim.url = "github:nix-community/nixvim"; diff --git a/modules/home/all/ghostty.nix b/modules/home/all/ghostty.nix index 7b6a02f..21181fb 100644 --- a/modules/home/all/ghostty.nix +++ b/modules/home/all/ghostty.nix @@ -1,4 +1,14 @@ -{ pkgs, ... }: +{ flake, pkgs, ... }: { - home.packages = [ pkgs.ghostty ]; + imports = [ + flake.inputs.ghostty-hm.homeModules.default + ]; + programs.ghostty = { + enable = true; + package = pkgs.ghostty; + settings = { + gtk-titlebar = false; # better on tiling wm + font-size = 10; + }; + }; }