From c7eb3df1d040aaf21775f80b4237428e003be407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 23 Aug 2023 14:14:13 +0200 Subject: [PATCH] Add gitui config and update vim settings --- gitui/key_bindings.ron | 8 ++++++++ gitui/theme.ron | 23 +++++++++++++++++++++++ nvim/lua/plugins.lua | 2 -- nvim/lua/settings.lua | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gitui/key_bindings.ron create mode 100644 gitui/theme.ron diff --git a/gitui/key_bindings.ron b/gitui/key_bindings.ron new file mode 100644 index 0000000..1168e4f --- /dev/null +++ b/gitui/key_bindings.ron @@ -0,0 +1,8 @@ +( + move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), + move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)), + move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)), + stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + open_help: Some(( code: F(1), modifiers: ( bits: 0,),)), +) diff --git a/gitui/theme.ron b/gitui/theme.ron new file mode 100644 index 0000000..54b61c9 --- /dev/null +++ b/gitui/theme.ron @@ -0,0 +1,23 @@ +( + selected_tab: Reset, + command_fg: White, + selection_bg: Blue, + selection_fg: White, + cmdbar_bg: Blue, + cmdbar_extra_lines_bg: Blue, + disabled_fg: DarkGray, + diff_line_add: Green, + diff_line_delete: Red, + diff_file_added: LightGreen, + diff_file_removed: LightRed, + diff_file_moved: LightMagenta, + diff_file_modified: Yellow, + commit_hash: Magenta, + commit_time: LightCyan, + commit_author: Green, + danger_fg: Red, + push_gauge_bg: Blue, + push_gauge_fg: Reset, + tag_fg: LightMagenta, + branch_fg: LightYellow, +) \ No newline at end of file diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index ea6b42f..247e1d2 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -15,10 +15,8 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup({ "rafamadriz/friendly-snippets", 'ConradIrwin/vim-bracketed-paste', - 'Vimjas/vim-python-pep8-indent', 'airblade/vim-rooter', 'cappyzawa/trim.nvim', - 'ervandew/supertab', 'ggandor/leap.nvim', 'mhartington/formatter.nvim', 'gpanders/editorconfig.nvim', diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 9a15e2d..1d4b555 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -33,6 +33,7 @@ vim.opt.wildmode = {"longest", "list"} vim.g.mapleader = "," vim.g.python_highlight_all = 1 vim.wo.signcolumn = "number" +vim.wo.relativenumber = true vim.g.rooter_patterns = {".git", "Makefile", "CMakeLists.txt", "build/"} vim.g.rooter_silent_chdir = 1