From 6aba91e1377f2967d1d28bef1a7e1d0987a6cbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 7 Jan 2025 21:31:28 +0100 Subject: [PATCH] ghostty --- home-manager/common.nix | 63 ++++++++++++++++++++++++++++++++-- home-manager/neovim.nix | 7 ++-- home-manager/sway.nix | 4 +-- nixos/common-configuration.nix | 8 ++--- 4 files changed, 70 insertions(+), 12 deletions(-) diff --git a/home-manager/common.nix b/home-manager/common.nix index eca4e04..cfb9255 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -42,7 +42,8 @@ in home.packages = with pkgs; [ - inputs.githud.packages."${system}".default + # inputs.githud.packages."${system}".default + # inputs.ghostty.packages.${system}.default caddy clipman deadbeef # ??? @@ -155,7 +156,7 @@ in kondo gh httpie - httping + # httping httplab httpstat hurl @@ -542,6 +543,64 @@ in }; }; + programs.ghostty = { + enable = true; + enableFishIntegration = true; + settings = { + + shell-integration = "fish"; + command = "fish"; + font-family = "Hack"; + font-size = 12; + adjust-underline-position = 4; + + mouse-hide-while-typing = true; + + gtk-single-instance = true; + gtk-tabs-location = "bottom"; + gtk-wide-tabs = false; + window-padding-y = "2,0"; + window-padding-balance = true; + window-decoration = false; + + copy-on-select = "clipboard"; + shell-integration-features = "no-cursor,sudo,no-title"; + cursor-style = "block"; + link-url = true; + + keybind = [ + "alt+t=new_tab" + "ctrl+q=new_window" + "alt+v=new_split:right" + "alt+x=new_split:down" + "alt+w=goto_split:next" + "alt+m=toggle_split_zoom" + ]; + + # Colors + foreground = "d8d8d8"; + background = "0f1419"; + palette = [ + "0=#181818" + "1=#ab4642" + "2=#a1b56c" + "3=#f7ca88" + "4=#7cafc2" + "5=#ba8baf" + "6=#86c1b9" + "7=#d8d8d8" + "8=#585858" + "9=#ab4642" + "10=#a1b56c" + "11=#f7ca88" + "12=#7cafc2" + "13=#ba8baf" + "14=#86c1b9" + "15=#d8d8d8" + ]; + }; + }; + programs.broot = { enable = true; }; diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix index e05868b..0057ca9 100644 --- a/home-manager/neovim.nix +++ b/home-manager/neovim.nix @@ -175,6 +175,7 @@ in pkgs.clojure-lsp pkgs.emmet-language-server pkgs.gopls + pkgs.harper # Grammar checker pkgs.jdt-ls pkgs.pyright pkgs.rust-analyzer @@ -230,6 +231,7 @@ in plenary-nvim # sqlite-lua aniseed + # nfnl nui-nvim # Telescope @@ -300,10 +302,11 @@ in vim-gnupg harpoon2 - # nterm-nvim - custom-vim-plugs.nterm-nvim + nterm-nvim + # custom-vim-plugs.nterm-nvim baleia-nvim # (h.neovim.localVimPlugin (vimPluginsDir + /nterm.nvim)) + # kulala-nvim # TODO Add to nixpkgs # Git fugitive diff --git a/home-manager/sway.nix b/home-manager/sway.nix index f13b57f..2c24771 100644 --- a/home-manager/sway.nix +++ b/home-manager/sway.nix @@ -161,7 +161,7 @@ in config.floating.titlebar = true; config.workspaceAutoBackAndForth = true; config.workspaceLayout = "tabbed"; # one of "default", "stacked", "tabbed" - config.terminal = "${pkgs.wezterm}/bin/wezterm"; + config.terminal = "${pkgs.ghostty}/bin/ghostty"; config.input = { "type:keyboard" = { xkb_layout = customKeyboardName; }; }; @@ -189,7 +189,7 @@ in modifier = config.wayland.windowManager.sway.config.modifier; in lib.mkOptionDefault { - "${modifier}+space" = "exec ${pkgs.wezterm}/bin/wezterm"; + "${modifier}+space" = "exec ${pkgs.ghostty}/bin/ghostty"; "${modifier}+Shift+space" = "exec ${pkgs.alacritty}/bin/alacritty"; "${modifier}+0" = "workspace 10"; "${modifier}+Shift+0" = "move container to workspace number 10"; diff --git a/nixos/common-configuration.nix b/nixos/common-configuration.nix index 3d234b4..c81e46c 100644 --- a/nixos/common-configuration.nix +++ b/nixos/common-configuration.nix @@ -91,8 +91,8 @@ in ncurses.dev # infocmp and more utils rsync alacritty + ghostty neovim - ] ++ (with pkgs.gitAndTools; [ delta @@ -266,11 +266,7 @@ in freefont_ttf hack-font inconsolata - (nerdfonts.override { - fonts = [ - "Hack" - ]; - }) + nerd-fonts.hack noto-fonts noto-fonts-cjk-sans noto-fonts-emoji