diff --git a/home-manager/becky-dingleberry.nix b/home-manager/becky-dingleberry.nix index 53a81de..4c61c18 100644 --- a/home-manager/becky-dingleberry.nix +++ b/home-manager/becky-dingleberry.nix @@ -76,10 +76,9 @@ in { "ghostty/config" = { text = '' - font-size = 10 - theme = catppuccin-mocha - window-height = 9999 - window-width = 9999 + ${builtins.readFile ./shared/ghostty.config} + + font-size = 11 ''; }; } @@ -91,7 +90,7 @@ in file = "share/bat/syntaxes/ghostty.sublime-syntax"; }; - programs.vim.plugins = lib.mkMerge [ pkgs.ghostty.vim ]; + programs.vim.plugins = [ pkgs.ghostty.vim ]; programs.direnv = { enable = true; @@ -192,7 +191,7 @@ in enableZshIntegration = true; keyScheme = "vim"; # TODO: Test - fuzzySearchFactor = 2; + fuzzySearchFactor = 1; settings = { colors = { diff --git a/home-manager/lcech-mac-veracode.nix b/home-manager/lcech-mac-veracode.nix index 0848f2d..233d778 100644 --- a/home-manager/lcech-mac-veracode.nix +++ b/home-manager/lcech-mac-veracode.nix @@ -42,38 +42,9 @@ in home.file = { "${homedir}/Library/Application Support/com.mitchellh.ghostty/config" = { text = '' - theme = "catppuccin-mocha" + ${builtins.readFile ./shared/ghostty.config} + font-size = 14 - window-width = 9999 - window-height = 9999 - - # unbind resize split - keybind = super+ctrl+down=unbind - keybind = super+ctrl+left=unbind - keybind = super+ctrl+up=unbind - keybind = super+ctrl+right=unbind - - # unbind clear_window - keybind = super+k=unbind - - # unbind goto split - keybind = super+alt+right=unbind - keybind = super+alt+down=unbind - keybind = super+alt+left=unbind - keybind = super+alt+up=unbind - - keybind = super+k=new_split:down - keybind = super+l=new_split:right - - keybind = super+ctrl+j=goto_split:top - keybind = super+ctrl+k=goto_split:bottom - keybind = super+ctrl+h=goto_split:left - keybind = super+ctrl+l=goto_split:right - - keybind = super+shift+j=resize_split:up,10 - keybind = super+shift+k=resize_split:down,10 - keybind = super+shift+h=resize_split:left,10 - keybind = super+shift+l=resize_split:right,10 ''; }; "${homedir}/.hammerspoon/init.lua" = { @@ -191,7 +162,7 @@ in enableZshIntegration = true; keyScheme = "vim"; # TODO: Test - fuzzySearchFactor = 2; + fuzzySearchFactor = 1; settings = { colors = { diff --git a/home-manager/shared/ghostty.config b/home-manager/shared/ghostty.config new file mode 100644 index 0000000..d9681d1 --- /dev/null +++ b/home-manager/shared/ghostty.config @@ -0,0 +1,31 @@ +theme = "catppuccin-mocha" +window-width = 9999 +window-height = 9999 + +# unbind resize split +keybind = super+ctrl+down=unbind +keybind = super+ctrl+left=unbind +keybind = super+ctrl+up=unbind +keybind = super+ctrl+right=unbind + +# unbind clear_window +keybind = super+k=unbind + +# unbind goto split +keybind = super+alt+right=unbind +keybind = super+alt+down=unbind +keybind = super+alt+left=unbind +keybind = super+alt+up=unbind + +keybind = super+k=new_split:down +keybind = super+l=new_split:right + +keybind = super+alt+j=goto_split:top +keybind = super+alt+k=goto_split:bottom +keybind = super+alt+h=goto_split:left +keybind = super+alt+l=goto_split:right + +keybind = super+shift+j=resize_split:up,10 +keybind = super+shift+k=resize_split:down,10 +keybind = super+shift+h=resize_split:left,10 +keybind = super+shift+l=resize_split:right,10