From fd0595fb4aba99a39939667056e4e5aac3b9308b Mon Sep 17 00:00:00 2001 From: igor Date: Fri, 17 Apr 2026 01:11:54 -0700 Subject: [PATCH] Various changes. --- .vimrc | 2 +- focus-editor/global.focus-config | 188 ++++++++++-------- .../projects/HandmadeHero.focus-config | 58 ++++++ ghostty/config | 2 +- 4 files changed, 160 insertions(+), 90 deletions(-) create mode 100644 focus-editor/projects/HandmadeHero.focus-config diff --git a/.vimrc b/.vimrc index 840243d..17abcd8 100644 --- a/.vimrc +++ b/.vimrc @@ -1,5 +1,5 @@ filetype plugin indent on -syntax off +syntax on "colorscheme wildcharm colorscheme habamax diff --git a/focus-editor/global.focus-config b/focus-editor/global.focus-config index 4933235..509cb47 100644 --- a/focus-editor/global.focus-config +++ b/focus-editor/global.focus-config @@ -156,7 +156,7 @@ draw_indent_guides: false # Key combination Action Alt-F4 quit -Ctrl-Alt-D select_word_or_create_another_cursor +Alt-D select_word_or_create_another_cursor Ctrl-R revert_select_word_or_create_another_cursor Ctrl-Y move_selection_to_next_word # Ctrl-Shift-A select_all_occurrences @@ -169,7 +169,9 @@ Ctrl-Shift-D duplicate_lines Ctrl-Shift-K delete_line Alt-ArrowUp move_selected_lines_up +Alt-P move_selected_lines_up Alt-ArrowDown move_selected_lines_down +Alt-N move_selected_lines_down Ctrl-J join_lines Ctrl-Shift-J join_lines_no_spaces_in_between @@ -194,14 +196,14 @@ Ctrl-PageDown move_to_next_buffer Ctrl-/ toggle_comment Ctrl-L select_line -Alt-K scroll_viewport_up -Alt-E scroll_viewport_up_fast # for some reason Alt-U didn't reach the window at all, so using Alt-E instead -Alt-PageUp scroll_viewport_up_fast -Alt-J scroll_viewport_down -Alt-D scroll_viewport_down_fast -Alt-PageDown scroll_viewport_down_fast -Alt-H scroll_viewport_left -Alt-L scroll_viewport_right +# Alt-K scroll_viewport_up +# Alt-E scroll_viewport_up_fast # for some reason Alt-U didn't reach the window at all, so using Alt-E instead +# Alt-PageUp scroll_viewport_up_fast +# Alt-J scroll_viewport_down +# Alt-D scroll_viewport_down_fast +# Alt-PageDown scroll_viewport_down_fast +# Alt-H scroll_viewport_left +# Alt-L scroll_viewport_right Ctrl-Alt-ArrowUp scroll_viewport_up Ctrl-Alt-ArrowDown scroll_viewport_down @@ -211,7 +213,9 @@ Ctrl-Alt-ArrowRight scroll_viewport_right Alt-V move_cursor_to_viewport_center {Shift}-Ctrl-ArrowUp move_up_to_empty_line +{Shift}-Ctrl-Alt-P move_up_to_empty_line {Shift}-Ctrl-ArrowDown move_down_to_empty_line +{Shift}-Ctrl-Alt-N move_down_to_empty_line Alt-Shift-I add_cursors_to_line_ends Alt-Shift-Ctrl-I add_cursors_to_line_starts @@ -233,18 +237,20 @@ Ctrl-Shift-, duplicate_editor Ctrl-Alt-Shift-ArrowLeft move_editor_to_the_left Ctrl-Alt-Shift-ArrowRight move_editor_to_the_right -Alt-N create_new_file -Alt-Shift-N create_new_file_on_the_side +# Alt-N create_new_file +# Alt-Shift-N create_new_file_on_the_side Alt-Shift-ArrowUp create_cursor_above +Alt-K create_cursor_above Alt-Shift-ArrowDown create_cursor_below +Alt-J create_cursor_below Alt-A align_cursors Alt-Z toggle_line_wrap -Alt-Shift-L toggle_line_numbers +# Alt-Shift-L toggle_line_numbers -Ctrl-Shift-Alt-N open_another_editor_instance +# Ctrl-Shift-Alt-N open_another_editor_instance [open file dialog] @@ -276,17 +282,17 @@ Alt-R toggle_regex_search # Common key combos may be used as a fallback if they are not defined in more specific sections. # For example, if "move_up" is not defined in [editors], the one in the [common] section will be matched. -Alt-X show_commands +Shift-Alt-L show_commands Alt-Shift-P show_commands -Ctrl-Alt-P switch_to_project +# Ctrl-Alt-P switch_to_project # Ctrl-F search_in_buffer Alt-F search_in_buffer_dropdown_mode # Ctrl-Shift-F search_in_project Alt-Shift-F search_in_project -Alt-P open_file_by_name +Alt-L open_file_by_name Alt-O navigate_to_file Alt-Shift-O navigate_to_file_from_root # Ctrl-Tab switch_between_open_files @@ -366,6 +372,8 @@ Ctrl-D delete_right_char {Shift}-Meta-Backspace delete_left_through_word {Shift}-Meta-Delete delete_right_through_word Ctrl-Backspace delete_left_by_character_type_fast +Ctrl-Alt-H delete_left_by_character_type_fast +Ctrl-Alt-D delete_right_by_character_type_fast Ctrl-Delete delete_right_by_character_type_fast Ctrl-Plus increase_font_size @@ -451,90 +459,94 @@ build_panel_title_bar: 1C303AFF code_default: BFC9DBFF code_invalid: FF0000FF -#code_string_literal: D4BC7DFF -#code_multiline_string: D4BC7DFF -#code_raw_string: D4BC7DFF -#code_char_literal: D4BC7DFF - -#code_identifier: BFC9DBFF -#code_note: E0AD82FF -#code_number: D699B5FF - -#code_error: FF0000FF -#code_warning: E4D97DFF -#code_highlight: E4D97DFF - -#code_comment: 87919DFF -#code_multiline_comment: 87919DFF - -#code_operation: E0AD82FF -#code_punctuation: BFC9DBFF - -#code_keyword: E67D74FF -#code_type: 82AAA3FF -#code_value: D699B5FF -#code_modifier: E67D74FF -#code_attribute: E67D74FF -#code_enum_variant: BFC9DBFF -#code_macro: E0AD82FF -#code_function: D0C5A9FF - -#code_builtin_variable: D699B5FF -#code_builtin_function: E0AD82FF -#code_builtin_exception: E0AD82FF - -#code_directive: E67D74FF -#code_directive_modifier: E67D74FF - -#code_header: E67D74FF -#code_header2: E0AD82FF -#code_header3: E0AD82FF -#code_header4: E0AD82FF -#code_header5: E0AD82FF -#code_header6: E0AD82FF - -code_string_literal: BFC9DBFF -code_multiline_string: BFC9DBFF -code_raw_string: BFC9DBFF -code_char_literal: BFC9DBFF +code_string_literal: D4BC7DFF +code_multiline_string: D4BC7DFF +code_raw_string: D4BC7DFF +code_char_literal: D4BC7DFF code_identifier: BFC9DBFF -code_note: BFC9DBFF -code_number: BFC9DBFF +code_note: E0AD82FF +code_number: D699B5FF -code_error: BFC9DBFF -code_warning: BFC9DBFF -code_highlight: BFC9DBFF +code_error: FF0000FF +code_warning: E4D97DFF +code_highlight: E4D97DFF -code_comment: 82AAA3FF -code_multiline_comment: 82AAA3FF +code_comment: 87919DFF +code_multiline_comment: 87919DFF -code_operation: BFC9DBFF +code_operation: E0AD82FF code_punctuation: BFC9DBFF -code_keyword: BFC9DBFF -code_type: BFC9DBFF -code_value: BFC9DBFF -code_modifier: BFC9DBFF -code_attribute: BFC9DBFF +code_keyword: E67D74FF +code_type: 82AAA3FF +code_value: D699B5FF +code_modifier: E67D74FF +code_attribute: E67D74FF code_enum_variant: BFC9DBFF -code_macro: BFC9DBFF -code_function: BFC9DBFF +code_macro: E0AD82FF +code_function: D0C5A9FF -code_builtin_variable: BFC9DBFF -code_builtin_function: BFC9DBFF -code_builtin_exception: BFC9DBFF +code_builtin_variable: D699B5FF +code_builtin_function: E0AD82FF +code_builtin_exception: E0AD82FF -code_directive: BFC9DBFF -code_directive_modifier: BFC9DBFF +code_directive: E67D74FF +code_directive_modifier: E67D74FF -code_header: BFC9DBFF -code_header2: BFC9DBFF -code_header3: BFC9DBFF -code_header4: BFC9DBFF -code_header5: BFC9DBFF -code_header6: BFC9DBFF \ No newline at end of file +code_header: E67D74FF +code_header2: E0AD82FF +code_header3: E0AD82FF +code_header4: E0AD82FF +code_header5: E0AD82FF +code_header6: E0AD82FF + + + + + +# code_string_literal: BFC9DBFF +# code_multiline_string: BFC9DBFF +# code_raw_string: BFC9DBFF +# code_char_literal: BFC9DBFF + +# code_identifier: BFC9DBFF +# code_note: BFC9DBFF +# code_number: BFC9DBFF + +# code_error: BFC9DBFF +# code_warning: BFC9DBFF +# code_highlight: BFC9DBFF + +# code_comment: 82AAA3FF +# code_multiline_comment: 82AAA3FF + +# code_operation: BFC9DBFF +# code_punctuation: BFC9DBFF + +# code_keyword: BFC9DBFF +# code_type: BFC9DBFF +# code_value: BFC9DBFF +# code_modifier: BFC9DBFF +# code_attribute: BFC9DBFF +# code_enum_variant: BFC9DBFF +# code_macro: BFC9DBFF +# code_function: BFC9DBFF + +# code_builtin_variable: BFC9DBFF +# code_builtin_function: BFC9DBFF +# code_builtin_exception: BFC9DBFF + +# code_directive: BFC9DBFF +# code_directive_modifier: BFC9DBFF + +# code_header: BFC9DBFF +# code_header2: BFC9DBFF +# code_header3: BFC9DBFF +# code_header4: BFC9DBFF +# code_header5: BFC9DBFF +# code_header6: BFC9DBFF \ No newline at end of file diff --git a/focus-editor/projects/HandmadeHero.focus-config b/focus-editor/projects/HandmadeHero.focus-config new file mode 100644 index 0000000..8a1d7fb --- /dev/null +++ b/focus-editor/projects/HandmadeHero.focus-config @@ -0,0 +1,58 @@ +[16] # Version number. Do not delete. + +[[workspace]] +# These directories and files will be scanned when a workspace is opened so that search etc. works. +# Example: +# C:/projects/my-project +# C:/jai +/home/igor/Developer/handmade + +[[build commands]] +build_working_dir: /home/igor/Developer/handmade +open_panel_on_build: true +close_panel_on_success: false +clear_build_output_before_running: true +error_regex: ^(?P.*):(?P\d+): (?Perror|warning): (?P.*)$ +# auto_jump_to_error: false + +[Debug Build And Run] # <- command name. Can be arbitrary +build_command: /usr/bin/make +build_working_dir: /home/igor/Developer/handmade +# timeout_in_seconds: 5 # if you don't want a timeout, don't specify it +# run_command: test.exe # will be run if build succeeds +# run_working_dir: W:/focus # working dir for the run command +key_binding: F5 + +[Run] # <- You could have commands that don't build anything and just run something +run_command: /usr/bin/make run +run_working_dir: /home/igor/Developer/handmade +key_binding: F6 + +# [Release] +# build_command: jai first.jai - release +# key_binding: F9 + + +# Example error regexes: +# For jai: ^(?P.*):(?P\d+),(?P\d+): (?PError|Warning|Info|...):* (?P.*)|^(?P.*error LNK.*) +# For msvc: ^(?P.*)\((?P\d+),?(?P\d+)?\)[ ]?: (?Perror|warning) (?P.*)$ +# For golang: ^(?P.*):(?P\d+):(?P\d+): (?P.*)$ +# For gcc: ^(?P.*):(?P\d+):(?P\d+): (?Perror|warning): (?P.*) (\[(?P.*)\])?$ +# ... let us know what regex works for you and we'll add it here + +# NOTE: +# You can use the following variables in build_command or run_command: +# %FILE% - full path to currenly active file +# %FILE_DIR% - the directory of the currently active file +# %FILE_NAME% - current file name, with extension +# %FILE_NAME_NO_EXTENSION% - current file name, without extension +# %BUILD_WORKING_DIR% - working dir of the build command +# %RUN_WORKING_DIR% - working dir of the run command +# %PROJECT_CONFIG_DIR% - path of the directory containing the active project config file + + + +# NOTE: You can override any section from the global config in your project and it will be used when your project is active. +# Some sections, such as [[workspace]] or [[build commands]], will completely replace those in the global config, +# while other sections such as [[keymap]] or [[style]] will try to merge with the corresponding sections in the global +# config, allowing to override only some of the keys or colors. diff --git a/ghostty/config b/ghostty/config index ed0a590..28272ed 100644 --- a/ghostty/config +++ b/ghostty/config @@ -2,7 +2,7 @@ auto-update = off app-notifications = no-clipboard-copy #font-family = Source Code Pro -font-family = Courier Prime Code +font-family = Courier Prime font-size = 11 # theme = "3024 Night"