diff --git a/hosts/nixos/home-default.nix b/hosts/nixos/home-default.nix index faa6bb2..45097de 100644 --- a/hosts/nixos/home-default.nix +++ b/hosts/nixos/home-default.nix @@ -62,10 +62,6 @@ fastfetch coreutils # GNU core utilities (base64, etc.) - # Clipboard utilities for tmux integration - wl-clipboard # Wayland clipboard (wl-copy/wl-paste) - xclip # X11 clipboard fallback - # Development and build tools python312 uv diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix index 2dc402d..f58cb76 100644 --- a/hosts/nixos/thinkpad/home.nix +++ b/hosts/nixos/thinkpad/home.nix @@ -11,6 +11,7 @@ ../../../modules/tex.nix ../../../modules/gnome.nix ../../../modules/firefox.nix + ../../../modules/ghostty.nix ]; # Enable GNOME configuration @@ -18,6 +19,14 @@ enable = true; }; + # Enable Ghostty terminal with OSC-52 clipboard support + programs.ghostty-custom = { + enable = true; + package = pkgs.ghostty; + fontSize = 12; + windowMode = "maximized"; + }; + # Enable Firefox browser programs.firefox-custom = { enable = true; diff --git a/modules/gnome.nix b/modules/gnome.nix index f3e46c6..4477263 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -53,7 +53,7 @@ in "org.gnome.Nautilus.desktop" "firefox.desktop" "obsidian.desktop" - "org.gnome.Console.desktop" + "com.mitchellh.ghostty.desktop" "org.keepassxc.KeePassXC.desktop" ]; }; @@ -66,14 +66,6 @@ in mouse-sensitive-fullscreen-window = false; }; - - # GNOME Console configuration - "org/gnome/Console" = { - audible-bell = false; - custom-font = "JetBrainsMono Nerd Font Mono 12"; - use-system-font = false; - }; - # Nautilus (GNOME Files) configuration "org/gnome/nautilus/preferences" = { show-hidden-files = true; diff --git a/modules/tmux.nix b/modules/tmux.nix index 421c81b..050e27e 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -13,6 +13,9 @@ # Terminal settings set -g default-terminal "screen-256color" set -ga terminal-overrides ",xterm-256color:Tc" + + # Enable OSC-52 clipboard integration (works with Ghostty) + set -g set-clipboard on # Gruvbox Dark Theme (Truecolor) # Status bar colors @@ -73,14 +76,9 @@ # Reload config file bind r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded!" - # Better copy mode + # Better copy mode with OSC-52 clipboard bind-key -T copy-mode-vi v send-keys -X begin-selection - # Platform-aware clipboard: pbcopy (macOS) | wl-copy (Wayland) | xclip (X11) - bind-key -T copy-mode-vi y if-shell 'command -v pbcopy' \ - 'send-keys -X copy-pipe-and-cancel "pbcopy"' \ - 'if-shell "test -n \"$WAYLAND_DISPLAY\"" \ - "send-keys -X copy-pipe-and-cancel \"wl-copy --foreground\"" \ - "send-keys -X copy-pipe-and-cancel \"xclip -selection clipboard\""' + bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel bind-key -T copy-mode-vi r send-keys -X rectangle-toggle # New window with current path