From 672f7350b2b3d71b5e9e4686cf1f641510fe6f63 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 15 Jun 2025 15:38:43 -0400 Subject: [PATCH] fixing keyboard in wezterm, adding ghostty as backup term, locales, etc --- flake.lock | 54 ++++++++++----------- hosts/eddie/configuration.nix | 9 +++- modules/home/shell-conf.nix | 22 +++++++-- modules/home/shell-conf/wezterm/wezterm.lua | 6 ++- 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 501edda..a4c6b46 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749954440, - "narHash": "sha256-/Abdch4cOk5XIJ3icv30FPmB/Lw7XLeLBFXarL0wml0=", + "lastModified": 1750007756, + "narHash": "sha256-ubcXh/a2YWJlsnW2XomABgRzBuIRigz3YwHzB5WBTfM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "77d295df371cf9c716c54759dc19900b2bb3a161", + "rev": "c545e874be1fa5453ad4f365e90e9b3dcf6f81ee", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1749944797, - "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", + "lastModified": 1749999552, + "narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5f345153397f62170c18ded1ae1f0875201d49a", + "rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", "type": "github" }, "original": { @@ -866,11 +866,11 @@ ] }, "locked": { - "lastModified": 1749896124, - "narHash": "sha256-+jwRKYksHw/XpLClxpSYQzEadsC0X3EHcIhtBD3p1AE=", + "lastModified": 1750012662, + "narHash": "sha256-oqwScFXSJavR16ffd090wnUkoHn9t28C3gRkTn2///4=", "owner": "nix-community", "repo": "nh", - "rev": "6000f87a413bb91b7a546b95f303766bf659ac30", + "rev": "f5aa53599ab28f83f5e45b88ed6fef531e747cde", "type": "github" }, "original": { @@ -891,11 +891,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749890123, - "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", + "lastModified": 1749991461, + "narHash": "sha256-6wXRZuUe5JmIVLiyP0NQ+2Rv4TOITtUxnhKhAvT6ep8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", + "rev": "3f3f1573fcd823a45c7fbb21110fdadb9563fa27", "type": "github" }, "original": { @@ -1112,11 +1112,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749668643, - "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", + "lastModified": 1749834526, + "narHash": "sha256-izgPGLeUeFB9loC+n2X6TO2n8pOGvVcR3jKqxTGOwgc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", + "rev": "db8414903dd6b3042e1ac471eafc18ca4ccb54a4", "type": "github" }, "original": { @@ -1128,11 +1128,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1749857119, + "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1749668643, - "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", + "lastModified": 1749834526, + "narHash": "sha256-izgPGLeUeFB9loC+n2X6TO2n8pOGvVcR3jKqxTGOwgc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", + "rev": "db8414903dd6b3042e1ac471eafc18ca4ccb54a4", "type": "github" }, "original": { @@ -1698,11 +1698,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1749042117, - "narHash": "sha256-wFIbuFKDsgUvIzFO+e4y5zL7wSGh8upBRq2vOWauNfI=", + "lastModified": 1750014871, + "narHash": "sha256-2P4YKeMy9LXy0totnWIWzgW3A0UwB7HY0CfdCt8OOBU=", "owner": "wez", "repo": "wezterm", - "rev": "5106c8c1f799457719ca04f5bd73e7eddaf1de9c", + "rev": "d6c178f961d3de351ad72b8176f5d05e8ad8e8c6", "type": "github" }, "original": { @@ -1797,11 +1797,11 @@ ] }, "locked": { - "lastModified": 1749957860, - "narHash": "sha256-jfPA8TbvOMhINxWjIOcQDtimJCeGEqLWQlgVL1AlNhc=", + "lastModified": 1749991041, + "narHash": "sha256-+jss4bkSbzURttaspRke/LVtrthBRDoafJmn/xem5f0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b44b9e9b54211da2780e41430a44c0a40c112d89", + "rev": "ff841ca63c73796117f298c730d9f1dc2b18e7e7", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 49b36bb..471df52 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -92,7 +92,14 @@ time.timeZone = "America/Toronto"; # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; + i18n = { + defaultLocale = "en_CA.UTF-8"; + extraLocales = [ "en_US.UTF-8/UTF-8" ]; + extraLocaleSettings = { + LC_ALL = "en_CA.UTF-8"; + }; + }; + console = { earlySetup = true; diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 63786ec..0165856 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -90,9 +90,9 @@ ]; programs = { - bash = { - enable = true; - }; + # bash = { + # enable = true; + # }; nix-index = { enable = true; enableFishIntegration = true; @@ -114,10 +114,13 @@ "gt" = "gtrash"; "rm" = "gtrash put"; }; + + # change fzf variable search to C-M-v interactiveShellInit = '' bind --erase \ct fzf_configure_bindings --variables=\e\cv ''; + plugins = [ { name = "upto"; @@ -132,18 +135,27 @@ }; zoxide = { enableFishIntegration = true; + enableBashIntegration = true; enable = true; }; starship = { enableFishIntegration = true; + enableBashIntegration = true; enable = true; }; ripgrep = { enable = true; package = (pkgs.ripgrep.override {withPCRE2 = true;}); }; + ghostty = { + enable = true; + # settings = { + # theme = ""; + # }; + }; wezterm = { enable = true; + enableBashIntegration = true; package = inputs.wezterm.packages.${pkgs.system}.default; }; bat = { @@ -152,6 +164,7 @@ eza = { enable = true; enableFishIntegration = true; + enableBashIntegration = true; git = true; icons = "auto"; colors = "auto"; @@ -161,7 +174,8 @@ }; fzf = { enable = true; - enableFishIntegration = false; + # enableFishIntegration = false; + # enableBashIntegration = true; }; broot = { enable = true; diff --git a/modules/home/shell-conf/wezterm/wezterm.lua b/modules/home/shell-conf/wezterm/wezterm.lua index 14f2955..9539c1e 100644 --- a/modules/home/shell-conf/wezterm/wezterm.lua +++ b/modules/home/shell-conf/wezterm/wezterm.lua @@ -53,6 +53,8 @@ config.font = wezterm.font { -- weight = '' } +config.use_ime = false + config.freetype_load_flags = 'NO_HINTING' -- config.color_scheme = 'One Dark (Gogh)' @@ -91,7 +93,7 @@ config.default_cursor_style = 'SteadyBar' config.use_fancy_tab_bar = false config.tab_bar_at_bottom = true -config.enable_kitty_keyboard = true +-- config.enable_kitty_keyboard = true config.unzoom_on_switch_pane = true @@ -103,7 +105,7 @@ config.mouse_bindings = { }, } -config.leader = { key = 'Space', mods = 'SHIFT', timeout_milliseconds = 1000 } +-- config.leader = { key = 'Space', mods = 'SHIFT', timeout_milliseconds = 1000 } config.keys = { {