Skip to content

Commit

Permalink
refactor(apps): use ghostty config from upstream home-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
zakuciael committed Jan 2, 2025
1 parent a3fc2d6 commit c872ac0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 29 deletions.
1 change: 0 additions & 1 deletion configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ with lib.my;
inputs.sops-nix.homeManagerModule
inputs.catppuccin.homeManagerModule
inputs.vscode-server.homeManagerModule
inputs.ghostty-hm.homeManagerModule
];
useUserPackages = true;
useGlobalPkgs = true;
Expand Down
22 changes: 3 additions & 19 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
# TODO: Replace when nixpkgs and home-manager will fully support Ghostty
# TODO: Replace after updating nixpkgs
ghostty = {
url = "github:ghostty-org/ghostty";
inputs.nixpkgs-unstable.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
};
ghostty-hm.url = "github:clo4/ghostty-hm-module";
};

outputs =
Expand Down Expand Up @@ -91,14 +90,11 @@
vscode-server = flakeInputs.vscode-server // {
homeManagerModule = flakeInputs.vscode-server.homeModules.default;
};
ghostty-hm = flakeInputs.ghostty-hm // {
homeManagerModule = flakeInputs.ghostty-hm.homeModules.default;
};
ghostty = flakeInputs.ghostty.packages.${system};
};

lib = nixpkgs.lib.extend (
self: super: {
_: _: {
hm = home-manager.lib.hm;
my = import ./lib {
inherit
Expand Down
8 changes: 5 additions & 3 deletions modules/desktop/apps/terminals/ghostty.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ in
programs = {
ghostty = {
enable = true;
package = inputs.ghostty.default; # TODO: Replace when nixpkgs will fully support Ghostty
shellIntegration.enable = true;
package = inputs.ghostty.default; # TODO: Remove after updating nixpkgs
enableBashIntegration = true; # By default enable at least bash integration.
enableFishIntegration = config.modules.shell.fish.enable;

settings = {
# Font settings
font-size = 11;
font-family = "JetBrains Mono";

# Color theme
theme = "catppuccin-mocha"; # TODO: Replace when nixpkgs, home-manager and catppuccin/nix will fully support Ghostty
theme = "catppuccin-mocha"; # TODO: Replace when catppuccin/nix will add support for Ghostty

# Other
window-decoration = false;
Expand Down

0 comments on commit c872ac0

Please sign in to comment.