This commit is contained in:
Anthony Cicchetti 2024-05-20 19:03:14 -04:00
parent 42f2184ae6
commit 53dc368edd
4 changed files with 159 additions and 142 deletions

View file

@ -4,13 +4,13 @@
# environment variables. Some entries may override variables # environment variables. Some entries may override variables
# set by alacritty itself. # set by alacritty itself.
#env: #env:
# TERM variable # TERM variable
# #
# This value is used to set the `$TERM` environment variable for # This value is used to set the `$TERM` environment variable for
# each instance of Alacritty. If it is not present, alacritty will # each instance of Alacritty. If it is not present, alacritty will
# check the local terminfo database and use 'alacritty' if it is # check the local terminfo database and use 'alacritty' if it is
# available, otherwise 'xterm-256color' is used. # available, otherwise 'xterm-256color' is used.
#TERM: xterm-256color #TERM: xterm-256color
window: window:
# Window dimensions (changes require restart) # Window dimensions (changes require restart)
@ -120,43 +120,43 @@ debug:
colors: colors:
# Default colors # Default colors
primary: primary:
background: '0x1b2b34' background: "0x1b2b34"
foreground: '0xc0c5ce' foreground: "0xc0c5ce"
# Colors the cursor will use if `custom_cursor_colors` is true # Colors the cursor will use if `custom_cursor_colors` is true
cursor: cursor:
text: '0x1b2b34' text: "0x1b2b34"
cursor: '0xc0c5ce' cursor: "0xc0c5ce"
# Normal colors # Normal colors
normal: normal:
black: '0x1b2b34' black: "0x1b2b34"
red: '0xec5f67' red: "0xec5f67"
green: '0x99c794' green: "0x99c794"
yellow: '0xfac863' yellow: "0xfac863"
blue: '0x6699cc' blue: "0x6699cc"
magenta: '0xc594c5' magenta: "0xc594c5"
cyan: '0x5fb3b3' cyan: "0x5fb3b3"
white: '0xc0c5ce' white: "0xc0c5ce"
# Bright colors # Bright colors
bright: bright:
black: '0x65737e' black: "0x65737e"
red: '0xec5f67' red: "0xec5f67"
green: '0x99c794' green: "0x99c794"
yellow: '0xfac863' yellow: "0xfac863"
blue: '0x6699cc' blue: "0x6699cc"
magenta: '0xc594c5' magenta: "0xc594c5"
cyan: '0x5fb3b3' cyan: "0x5fb3b3"
white: '0xd8dee9' white: "0xd8dee9"
indexed_colors: indexed_colors:
- { index: 16, color: '0xf99157' } - { index: 16, color: "0xf99157" }
- { index: 17, color: '0xab7967' } - { index: 17, color: "0xab7967" }
- { index: 18, color: '0x343d46' } - { index: 18, color: "0x343d46" }
- { index: 19, color: '0x4f5b66' } - { index: 19, color: "0x4f5b66" }
- { index: 20, color: '0xa7adba' } - { index: 20, color: "0xa7adba" }
- { index: 21, color: '0xcdd3de' } - { index: 21, color: "0xcdd3de" }
# Visual Bell # Visual Bell
# #
@ -233,14 +233,13 @@ mouse:
#modifiers: Control|Shift #modifiers: Control|Shift
selection: selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>" semantic_escape_chars: ',│`|:"'' ()[]{}<>'
# When set to `true`, selected text will be copied to both the primary and # When set to `true`, selected text will be copied to both the primary and
# the selection clipboard. Otherwise, it will only be copied to the selection # the selection clipboard. Otherwise, it will only be copied to the selection
# clipboard. # clipboard.
save_to_clipboard: false save_to_clipboard: false
cursor: cursor:
# Cursor style # Cursor style
# #
@ -346,110 +345,110 @@ shell:
# - ~AppKeypad # - ~AppKeypad
# - AppKeypad # - AppKeypad
key_bindings: key_bindings:
- { key: V, mods: Command|Shift, action: Paste } - { key: V, mods: Command|Shift, action: Paste }
- { key: C, mods: Command|Shift, action: Copy } - { key: C, mods: Command|Shift, action: Copy }
- { key: Paste, action: Paste } - { key: Paste, action: Paste }
- { key: Copy, action: Copy } - { key: Copy, action: Copy }
- { key: Q, mods: Command, action: Quit } - { key: Q, mods: Command, action: Quit }
- { key: W, mods: Command, action: Quit } - { key: W, mods: Command, action: Quit }
- { key: Insert, mods: Shift, action: PasteSelection } - { key: Insert, mods: Shift, action: PasteSelection }
- { key: Key0, mods: Control, action: ResetFontSize } - { key: Key0, mods: Control, action: ResetFontSize }
- { key: Equals, mods: Control, action: IncreaseFontSize } - { key: Equals, mods: Control, action: IncreaseFontSize }
- { key: Subtract, mods: Control, action: DecreaseFontSize } - { key: Subtract, mods: Control, action: DecreaseFontSize }
- { key: L, mods: Control, action: ClearLogNotice } - { key: L, mods: Control, action: ClearLogNotice }
- { key: L, mods: Control, chars: "\x0c" } - { key: L, mods: Control, chars: "\x0c" }
- { key: Home, chars: "\x1bOH", mode: AppCursor } - { key: Home, chars: "\x1bOH", mode: AppCursor }
- { key: Home, chars: "\x1b[H", mode: ~AppCursor } - { key: Home, chars: "\x1b[H", mode: ~AppCursor }
- { key: End, chars: "\x1bOF", mode: AppCursor } - { key: End, chars: "\x1bOF", mode: AppCursor }
- { key: End, chars: "\x1b[F", mode: ~AppCursor } - { key: End, chars: "\x1b[F", mode: ~AppCursor }
- { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" }
- { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
- { key: PageUp, chars: "\x1b[5~" } - { key: PageUp, chars: "\x1b[5~" }
- { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" }
- { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
- { key: PageDown, chars: "\x1b[6~" } - { key: PageDown, chars: "\x1b[6~" }
- { key: Tab, mods: Shift, chars: "\x1b[Z" } - { key: Tab, mods: Shift, chars: "\x1b[Z" }
- { key: Back, chars: "\x7f" } - { key: Back, chars: "\x7f" }
- { key: Back, mods: Alt, chars: "\x1b\x7f" } - { key: Back, mods: Alt, chars: "\x1b\x7f" }
- { key: Insert, chars: "\x1b[2~" } - { key: Insert, chars: "\x1b[2~" }
- { key: Delete, chars: "\x1b[3~" } - { key: Delete, chars: "\x1b[3~" }
- { key: Left, mods: Shift, chars: "\x1b[1;2D" } - { key: Left, mods: Shift, chars: "\x1b[1;2D" }
- { key: Left, mods: Control, chars: "\x1b[1;5D" } - { key: Left, mods: Control, chars: "\x1b[1;5D" }
- { key: Left, mods: Alt, chars: "\x1b[1;3D" } - { key: Left, mods: Alt, chars: "\x1b[1;3D" }
- { key: Left, chars: "\x1b[D", mode: ~AppCursor } - { key: Left, chars: "\x1b[D", mode: ~AppCursor }
- { key: Left, chars: "\x1bOD", mode: AppCursor } - { key: Left, chars: "\x1bOD", mode: AppCursor }
- { key: Right, mods: Shift, chars: "\x1b[1;2C" } - { key: Right, mods: Shift, chars: "\x1b[1;2C" }
- { key: Right, mods: Control, chars: "\x1b[1;5C" } - { key: Right, mods: Control, chars: "\x1b[1;5C" }
- { key: Right, mods: Alt, chars: "\x1b[1;3C" } - { key: Right, mods: Alt, chars: "\x1b[1;3C" }
- { key: Right, chars: "\x1b[C", mode: ~AppCursor } - { key: Right, chars: "\x1b[C", mode: ~AppCursor }
- { key: Right, chars: "\x1bOC", mode: AppCursor } - { key: Right, chars: "\x1bOC", mode: AppCursor }
- { key: Up, mods: Shift, chars: "\x1b[1;2A" } - { key: Up, mods: Shift, chars: "\x1b[1;2A" }
- { key: Up, mods: Control, chars: "\x1b[1;5A" } - { key: Up, mods: Control, chars: "\x1b[1;5A" }
- { key: Up, mods: Alt, chars: "\x1b[1;3A" } - { key: Up, mods: Alt, chars: "\x1b[1;3A" }
- { key: Up, chars: "\x1b[A", mode: ~AppCursor } - { key: Up, chars: "\x1b[A", mode: ~AppCursor }
- { key: Up, chars: "\x1bOA", mode: AppCursor } - { key: Up, chars: "\x1bOA", mode: AppCursor }
- { key: Down, mods: Shift, chars: "\x1b[1;2B" } - { key: Down, mods: Shift, chars: "\x1b[1;2B" }
- { key: Down, mods: Control, chars: "\x1b[1;5B" } - { key: Down, mods: Control, chars: "\x1b[1;5B" }
- { key: Down, mods: Alt, chars: "\x1b[1;3B" } - { key: Down, mods: Alt, chars: "\x1b[1;3B" }
- { key: Down, chars: "\x1b[B", mode: ~AppCursor } - { key: Down, chars: "\x1b[B", mode: ~AppCursor }
- { key: Down, chars: "\x1bOB", mode: AppCursor } - { key: Down, chars: "\x1bOB", mode: AppCursor }
- { key: F1, chars: "\x1bOP" } - { key: F1, chars: "\x1bOP" }
- { key: F2, chars: "\x1bOQ" } - { key: F2, chars: "\x1bOQ" }
- { key: F3, chars: "\x1bOR" } - { key: F3, chars: "\x1bOR" }
- { key: F4, chars: "\x1bOS" } - { key: F4, chars: "\x1bOS" }
- { key: F5, chars: "\x1b[15~" } - { key: F5, chars: "\x1b[15~" }
- { key: F6, chars: "\x1b[17~" } - { key: F6, chars: "\x1b[17~" }
- { key: F7, chars: "\x1b[18~" } - { key: F7, chars: "\x1b[18~" }
- { key: F8, chars: "\x1b[19~" } - { key: F8, chars: "\x1b[19~" }
- { key: F9, chars: "\x1b[20~" } - { key: F9, chars: "\x1b[20~" }
- { key: F10, chars: "\x1b[21~" } - { key: F10, chars: "\x1b[21~" }
- { key: F11, chars: "\x1b[23~" } - { key: F11, chars: "\x1b[23~" }
- { key: F12, chars: "\x1b[24~" } - { key: F12, chars: "\x1b[24~" }
- { key: F1, mods: Shift, chars: "\x1b[1;2P" } - { key: F1, mods: Shift, chars: "\x1b[1;2P" }
- { key: F2, mods: Shift, chars: "\x1b[1;2Q" } - { key: F2, mods: Shift, chars: "\x1b[1;2Q" }
- { key: F3, mods: Shift, chars: "\x1b[1;2R" } - { key: F3, mods: Shift, chars: "\x1b[1;2R" }
- { key: F4, mods: Shift, chars: "\x1b[1;2S" } - { key: F4, mods: Shift, chars: "\x1b[1;2S" }
- { key: F5, mods: Shift, chars: "\x1b[15;2~" } - { key: F5, mods: Shift, chars: "\x1b[15;2~" }
- { key: F6, mods: Shift, chars: "\x1b[17;2~" } - { key: F6, mods: Shift, chars: "\x1b[17;2~" }
- { key: F7, mods: Shift, chars: "\x1b[18;2~" } - { key: F7, mods: Shift, chars: "\x1b[18;2~" }
- { key: F8, mods: Shift, chars: "\x1b[19;2~" } - { key: F8, mods: Shift, chars: "\x1b[19;2~" }
- { key: F9, mods: Shift, chars: "\x1b[20;2~" } - { key: F9, mods: Shift, chars: "\x1b[20;2~" }
- { key: F10, mods: Shift, chars: "\x1b[21;2~" } - { key: F10, mods: Shift, chars: "\x1b[21;2~" }
- { key: F11, mods: Shift, chars: "\x1b[23;2~" } - { key: F11, mods: Shift, chars: "\x1b[23;2~" }
- { key: F12, mods: Shift, chars: "\x1b[24;2~" } - { key: F12, mods: Shift, chars: "\x1b[24;2~" }
- { key: F1, mods: Control, chars: "\x1b[1;5P" } - { key: F1, mods: Control, chars: "\x1b[1;5P" }
- { key: F2, mods: Control, chars: "\x1b[1;5Q" } - { key: F2, mods: Control, chars: "\x1b[1;5Q" }
- { key: F3, mods: Control, chars: "\x1b[1;5R" } - { key: F3, mods: Control, chars: "\x1b[1;5R" }
- { key: F4, mods: Control, chars: "\x1b[1;5S" } - { key: F4, mods: Control, chars: "\x1b[1;5S" }
- { key: F5, mods: Control, chars: "\x1b[15;5~" } - { key: F5, mods: Control, chars: "\x1b[15;5~" }
- { key: F6, mods: Control, chars: "\x1b[17;5~" } - { key: F6, mods: Control, chars: "\x1b[17;5~" }
- { key: F7, mods: Control, chars: "\x1b[18;5~" } - { key: F7, mods: Control, chars: "\x1b[18;5~" }
- { key: F8, mods: Control, chars: "\x1b[19;5~" } - { key: F8, mods: Control, chars: "\x1b[19;5~" }
- { key: F9, mods: Control, chars: "\x1b[20;5~" } - { key: F9, mods: Control, chars: "\x1b[20;5~" }
- { key: F10, mods: Control, chars: "\x1b[21;5~" } - { key: F10, mods: Control, chars: "\x1b[21;5~" }
- { key: F11, mods: Control, chars: "\x1b[23;5~" } - { key: F11, mods: Control, chars: "\x1b[23;5~" }
- { key: F12, mods: Control, chars: "\x1b[24;5~" } - { key: F12, mods: Control, chars: "\x1b[24;5~" }
- { key: F1, mods: Alt, chars: "\x1b[1;6P" } - { key: F1, mods: Alt, chars: "\x1b[1;6P" }
- { key: F2, mods: Alt, chars: "\x1b[1;6Q" } - { key: F2, mods: Alt, chars: "\x1b[1;6Q" }
- { key: F3, mods: Alt, chars: "\x1b[1;6R" } - { key: F3, mods: Alt, chars: "\x1b[1;6R" }
- { key: F4, mods: Alt, chars: "\x1b[1;6S" } - { key: F4, mods: Alt, chars: "\x1b[1;6S" }
- { key: F5, mods: Alt, chars: "\x1b[15;6~" } - { key: F5, mods: Alt, chars: "\x1b[15;6~" }
- { key: F6, mods: Alt, chars: "\x1b[17;6~" } - { key: F6, mods: Alt, chars: "\x1b[17;6~" }
- { key: F7, mods: Alt, chars: "\x1b[18;6~" } - { key: F7, mods: Alt, chars: "\x1b[18;6~" }
- { key: F8, mods: Alt, chars: "\x1b[19;6~" } - { key: F8, mods: Alt, chars: "\x1b[19;6~" }
- { key: F9, mods: Alt, chars: "\x1b[20;6~" } - { key: F9, mods: Alt, chars: "\x1b[20;6~" }
- { key: F10, mods: Alt, chars: "\x1b[21;6~" } - { key: F10, mods: Alt, chars: "\x1b[21;6~" }
- { key: F11, mods: Alt, chars: "\x1b[23;6~" } - { key: F11, mods: Alt, chars: "\x1b[23;6~" }
- { key: F12, mods: Alt, chars: "\x1b[24;6~" } - { key: F12, mods: Alt, chars: "\x1b[24;6~" }
- { key: F1, mods: Super, chars: "\x1b[1;3P" } - { key: F1, mods: Super, chars: "\x1b[1;3P" }
- { key: F2, mods: Super, chars: "\x1b[1;3Q" } - { key: F2, mods: Super, chars: "\x1b[1;3Q" }
- { key: F3, mods: Super, chars: "\x1b[1;3R" } - { key: F3, mods: Super, chars: "\x1b[1;3R" }
- { key: F4, mods: Super, chars: "\x1b[1;3S" } - { key: F4, mods: Super, chars: "\x1b[1;3S" }
- { key: F5, mods: Super, chars: "\x1b[15;3~" } - { key: F5, mods: Super, chars: "\x1b[15;3~" }
- { key: F6, mods: Super, chars: "\x1b[17;3~" } - { key: F6, mods: Super, chars: "\x1b[17;3~" }
- { key: F7, mods: Super, chars: "\x1b[18;3~" } - { key: F7, mods: Super, chars: "\x1b[18;3~" }
- { key: F8, mods: Super, chars: "\x1b[19;3~" } - { key: F8, mods: Super, chars: "\x1b[19;3~" }
- { key: F9, mods: Super, chars: "\x1b[20;3~" } - { key: F9, mods: Super, chars: "\x1b[20;3~" }
- { key: F10, mods: Super, chars: "\x1b[21;3~" } - { key: F10, mods: Super, chars: "\x1b[21;3~" }
- { key: F11, mods: Super, chars: "\x1b[23;3~" } - { key: F11, mods: Super, chars: "\x1b[23;3~" }
- { key: F12, mods: Super, chars: "\x1b[24;3~" } - { key: F12, mods: Super, chars: "\x1b[24;3~" }

View file

@ -41,6 +41,10 @@ in {
}; };
}; };
".ideavimrc".source = ./${repo_root}/ideavim/ideavimrc; ".ideavimrc".source = ./${repo_root}/ideavim/ideavimrc;
"/bin/run_ollama" = {
source = ./${repo_root}/zsh/bin/run_ollama;
executable = true;
};
}; };
xdg.configFile = { xdg.configFile = {
"1Password/ssh/agent.toml".text = '' "1Password/ssh/agent.toml".text = ''

View file

@ -12,6 +12,10 @@
"ui_font_size": 16, "ui_font_size": 16,
"buffer_font_family": "Fantasque Sans Mono", "buffer_font_family": "Fantasque Sans Mono",
"buffer_font_size": 16, "buffer_font_size": 16,
"assistant_v2": {
"enabled": true
},
// Love this, but it's faked (see run_ollama)
"assistant": { "assistant": {
"version": "1", "version": "1",
"provider": { "provider": {

10
zsh/bin/run_ollama Normal file
View file

@ -0,0 +1,10 @@
#!/usr/bin/env zsh
if ! command -v ollama; then
echo "Go install ollama"
fi
env GIN_MODE=release ollama serve &|
sleep 2
ollama pull llama3
ollama cp llama3 gpt-4-turbo-preview