From a1725639d6702d1fb77a379446fb5a017a02a2bb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 21 Nov 2024 12:36:59 +0100 Subject: [PATCH] Update things & finally switch to ghostty --- flake.lock | 68 +++++++++++++++++++------------------- modules/gui/default.nix | 3 +- modules/gui/ghostty.config | 24 +++----------- modules/wm/home.nix | 9 ----- 4 files changed, 39 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index c0e5f33..e40ce3b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1731372391, - "narHash": "sha256-lLq8dmsprt0Z6Ck/5DewQc2kx6jAmV0s+IQWCoZNj90=", + "lastModified": 1732108588, + "narHash": "sha256-14WgIZbSquzyAXWtBwYPl9SFHcaBYZCPstI0Qv1N8cE=", "owner": "aylur", "repo": "astal", - "rev": "2a9bb96f056f25c95b330984cfe7ac484db6c9c6", + "rev": "4fcf3c9e49dfd9cc54f2669297ea6dd9c5771476", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1731382085, - "narHash": "sha256-LsodhMaIkXdlAalv/t1xNA3xAnJ5ukclMDNM779/n2E=", + "lastModified": 1732159111, + "narHash": "sha256-dIHQDtvPXsuv0z6DVgK6GvTh/jJn14B7Q9J0gT38Pl4=", "ref": "refs/heads/main", - "rev": "2661792cf7e322ef165271db71e8977fa2188cab", - "revCount": 7944, + "rev": "63bf16ff00ccac2f730519b4f0dd14cde857792d", + "revCount": 8050, "type": "git", "url": "ssh://git@github.com/mitchellh/ghostty" }, @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1720601909, - "narHash": "sha256-G6MgCUWjJAonm9vgd1zR0rOF7A0YxN83gcXyEs/tWzY=", + "lastModified": 1732178333, + "narHash": "sha256-AtWOjD0hmJx7EmMrXgsYb8bhfG2voByXpfew9P78pjw=", "owner": "zoriya", "repo": "home-manager", - "rev": "421039337062171eb83a03f790bcb0657ca93a5c", + "rev": "86d35b6fd92bdd141972a1856a9ee8ed7c98239b", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1731284192, - "narHash": "sha256-+j6clqTmoM05sGkoSUFg2yMYJqmQhJkgLD3MBy7/S/A=", + "lastModified": 1732173780, + "narHash": "sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6844f66deb364e804f9b875db3fc87ee14b52141", + "rev": "151fab1aa35e1cbc6f5caad1e175e3d621d67951", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1731246444, - "narHash": "sha256-j7Ls3SaF8JzbaM2aU6ZqcHfyzqC+0F9pLiwZ+fwXgpo=", + "lastModified": 1732143030, + "narHash": "sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1+Awbi8tjQU=", "owner": "neovim", "repo": "neovim", - "rev": "0e54931b99530cd58af0434e12c58fe6243acb64", + "rev": "07db909eb5ae2a559771068be64439eba394cd61", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1731153869, - "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", + "lastModified": 1732016537, + "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", + "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1730453870, - "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "adb6bc4b661a43328752b4575be4968a4990c033", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 1ce6d30..3440f8f 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -33,8 +33,7 @@ in { ]; home.sessionVariables = rec { - # Waiting for https://github.com/mitchellh/ghostty/issues/809 before switching to ghostty - TERMINAL = "kitty"; + TERMINAL = "ghostty"; BROWSER = "firefox"; DEFAULT_BROWSER = BROWSER; # For rider diff --git a/modules/gui/ghostty.config b/modules/gui/ghostty.config index 57b205a..3580450 100644 --- a/modules/gui/ghostty.config +++ b/modules/gui/ghostty.config @@ -1,15 +1,9 @@ -# font-family = monospace -font-size = 11 - # disable ligatures font-feature = -calt -font-feature = -liga -font-feature = -dlig -minimum-contrast = 0 -cursor-style = bar +theme = light:catppuccin-latte,dark:catppuccin-mocha + cursor-style-blink = false -mouse-hide-while-typing = true unfocused-split-opacity = 1 keybind = clear @@ -30,33 +24,23 @@ keybind = ctrl+shift+i=inspector:toggle keybind = alt+o=jump_to_prompt:1 keybind = alt+i=jump_to_prompt:-1 -# keybind = super+ctrl+left_bracket=goto_split:previous -# keybind = ctrl+shift+j=write_scrollback_file - window-padding-x = 0 window-padding-y = 0 window-padding-balance = true window-decoration = false -window-theme = system clipboard-read = allow clipboard-write = allow clipboard-trim-trailing-spaces = true -clipboard-paste-protection = true -clipboard-paste-bracketed-safe = true copy-on-select = false confirm-close-surface = false quit-after-last-window-closed = true +resize-overlay = never auto-update = off -shell-integration = detect -shell-integration-features = cursor,sudo,title - -theme = catppuccin-latte -# theme = catppuccin-mocha -config-file = ?theme.config +shell-integration-features = true # vim: ft=conf diff --git a/modules/wm/home.nix b/modules/wm/home.nix index 24f06b6..7237490 100644 --- a/modules/wm/home.nix +++ b/modules/wm/home.nix @@ -30,15 +30,6 @@ in { ${pkgs.coreutils}/bin/ln -sf $XDG_CONFIG_HOME/kitty/${theme}.conf $XDG_CONFIG_HOME/kitty/theme.conf ${pkgs.procps}/bin/pkill -USR1 kitty ''; - ghostty = let - variant = - if theme == "light" - then "latte" - else "mocha"; - in '' - echo "theme = catppuccin-${variant}" > ~/.config/ghostty/theme.config - # ghostty +reload_config - ''; }; in { enable = true;