mirror of
https://gitlab.com/sagidayan/linux-config.git
synced 2024-11-21 23:05:25 +00:00
Merge branch 'updates' into 'main'
Misc updates. Long time without an updated state. See merge request sagidayan/linux-config!16
This commit is contained in:
commit
843f6f2d9d
9 changed files with 67 additions and 564 deletions
|
@ -10,7 +10,8 @@ window:
|
|||
|
||||
# Disable border and title bar
|
||||
decorations: none
|
||||
|
||||
env:
|
||||
TERM: xterm-256color
|
||||
font:
|
||||
normal:
|
||||
family: Hack Nerd Font
|
||||
|
@ -22,7 +23,7 @@ font:
|
|||
family: Hack Nerd Font
|
||||
style: Italic
|
||||
# Point size of the font
|
||||
size: 11
|
||||
size: 10
|
||||
|
||||
mouse:
|
||||
hide_when_typing: true
|
||||
|
|
51
files/dotfiles/gitui/key_bindings.ron
Normal file
51
files/dotfiles/gitui/key_bindings.ron
Normal file
|
@ -0,0 +1,51 @@
|
|||
// ************** Managed by Ansible ****************
|
||||
// src: https://github.com/extrawurst/gitui/blob/master/vim_style_key_config.ron
|
||||
// bit for modifiers
|
||||
// bits: 0 None
|
||||
// bits: 1 SHIFT
|
||||
// bits: 2 CONTROL
|
||||
//
|
||||
// Note:
|
||||
// If the default key layout is lower case,
|
||||
// and you want to use `Shift + q` to trigger the exit event,
|
||||
// the setting should like this `exit: Some(( code: Char('Q'), modifiers: ( bits: 1,),)),`
|
||||
// The Char should be upper case, and the shift modified bit should be set to 1.
|
||||
//
|
||||
// Note:
|
||||
// find `KeysList` type in src/keys/key_list.rs for all possible keys.
|
||||
// every key not overwritten via the config file will use the default specified there
|
||||
(
|
||||
focus_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
|
||||
focus_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
|
||||
focus_above: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
|
||||
focus_below: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
|
||||
|
||||
open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
|
||||
|
||||
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,),)),
|
||||
popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
|
||||
popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
|
||||
page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
|
||||
page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
|
||||
home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
|
||||
end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
|
||||
shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
|
||||
shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
|
||||
|
||||
edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
|
||||
|
||||
status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
|
||||
|
||||
diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
|
||||
diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
|
||||
|
||||
stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
|
||||
stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
|
||||
|
||||
stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
|
||||
|
||||
abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
|
||||
)
|
|
@ -1,553 +0,0 @@
|
|||
// ************** Managed by Ansible ****************
|
||||
// src: https://github.com/extrawurst/gitui/blob/master/vim_style_key_config.ron
|
||||
// bit for modifiers
|
||||
// bits: 0 None
|
||||
// bits: 1 SHIFT
|
||||
// bits: 2 CONTROL
|
||||
//
|
||||
// Note:
|
||||
// If the default key layout is lower case,
|
||||
// and you want to use `Shift + q` to trigger the exit event,
|
||||
// the setting should like this `exit: Some(( code: Char('Q'), modifiers: ( bits: 1,),)),`
|
||||
// The Char should be upper case, and the shift modified bit should be set to 1.
|
||||
//
|
||||
// Note:
|
||||
// find `KeysList` type in src/keys/key_list.rs for all possible keys.
|
||||
// every key not overwritten via the config file will use the default specified there
|
||||
(
|
||||
|
||||
tab_status: (
|
||||
|
||||
code: Char('1'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_log: (
|
||||
|
||||
code: Char('2'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_files: (
|
||||
|
||||
code: Char('3'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_stashing: (
|
||||
|
||||
code: Char('4'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_stashes: (
|
||||
|
||||
code: Char('5'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_toggle: (
|
||||
|
||||
code: Tab,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tab_toggle_reverse: (
|
||||
|
||||
code: BackTab,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
toggle_workarea: (
|
||||
|
||||
code: Char('w'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
exit: (
|
||||
|
||||
code: Char('c'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 2,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
quit: (
|
||||
|
||||
code: Char('q'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
exit_popup: (
|
||||
|
||||
code: Esc,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
open_commit: (
|
||||
|
||||
code: Char('c'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
open_commit_editor: (
|
||||
|
||||
code: Char('e'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 2,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tree_collapse_recursive: (
|
||||
|
||||
code: Left,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tree_expand_recursive: (
|
||||
|
||||
code: Right,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
enter: (
|
||||
|
||||
code: Enter,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
blame: (
|
||||
|
||||
code: Char('B'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
status_stage_all: (
|
||||
|
||||
code: Char('a'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
status_ignore_file: (
|
||||
|
||||
code: Char('i'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
stashing_toggle_untracked: (
|
||||
|
||||
code: Char('u'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
stash_apply: (
|
||||
|
||||
code: Char('a'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
stash_drop: (
|
||||
|
||||
code: Char('D'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
cmd_bar_toggle: (
|
||||
|
||||
code: Char('.'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
log_tag_commit: (
|
||||
|
||||
code: Char('t'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
commit_amend: (
|
||||
|
||||
code: Char('a'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 2,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
copy: (
|
||||
|
||||
code: Char('y'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
create_branch: (
|
||||
|
||||
code: Char('c'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
rename_branch: (
|
||||
|
||||
code: Char('r'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
select_branch: (
|
||||
|
||||
code: Char('b'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
delete_branch: (
|
||||
|
||||
code: Char('D'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
merge_branch: (
|
||||
|
||||
code: Char('m'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
tags: (
|
||||
|
||||
code: Char('T'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
delete_tag: (
|
||||
|
||||
code: Char('D'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
select_tag: (
|
||||
|
||||
code: Enter,
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
push: (
|
||||
|
||||
code: Char('p'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
open_file_tree: (
|
||||
|
||||
code: Char('F'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
force_push: (
|
||||
|
||||
code: Char('P'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
pull: (
|
||||
|
||||
code: Char('f'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 0,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
undo_commit: (
|
||||
|
||||
code: Char('U'),
|
||||
|
||||
modifiers: (
|
||||
|
||||
bits: 1,
|
||||
|
||||
),
|
||||
|
||||
),
|
||||
|
||||
focus_right: ( code: Char('l'), modifiers: ( bits: 0,),),
|
||||
|
||||
focus_left: ( code: Char('h'), modifiers: ( bits: 0,),),
|
||||
|
||||
focus_above: ( code: Char('k'), modifiers: ( bits: 0,),),
|
||||
|
||||
focus_below: ( code: Char('j'), modifiers: ( bits: 0,),),
|
||||
|
||||
|
||||
|
||||
open_help: ( code: F(1), modifiers: ( bits: 0,),),
|
||||
|
||||
|
||||
|
||||
move_left: ( code: Char('h'), modifiers: ( bits: 0,),),
|
||||
|
||||
move_right: ( code: Char('l'), modifiers: ( bits: 0,),),
|
||||
|
||||
move_up: ( code: Char('k'), modifiers: ( bits: 0,),),
|
||||
|
||||
move_down: ( code: Char('j'), modifiers: ( bits: 0,),),
|
||||
|
||||
popup_up: ( code: Char('p'), modifiers: ( bits: 2,),),
|
||||
|
||||
popup_down: ( code: Char('n'), modifiers: ( bits: 2,),),
|
||||
|
||||
page_up: ( code: Char('b'), modifiers: ( bits: 2,),),
|
||||
|
||||
page_down: ( code: Char('f'), modifiers: ( bits: 2,),),
|
||||
|
||||
home: ( code: Char('g'), modifiers: ( bits: 0,),),
|
||||
|
||||
end: ( code: Char('G'), modifiers: ( bits: 1,),),
|
||||
|
||||
shift_up: ( code: Char('K'), modifiers: ( bits: 1,),),
|
||||
|
||||
shift_down: ( code: Char('J'), modifiers: ( bits: 1,),),
|
||||
|
||||
|
||||
|
||||
edit_file: ( code: Char('I'), modifiers: ( bits: 1,),),
|
||||
|
||||
|
||||
|
||||
status_reset_item: ( code: Char('U'), modifiers: ( bits: 1,),),
|
||||
|
||||
|
||||
|
||||
diff_reset_lines: ( code: Char('u'), modifiers: ( bits: 0,),),
|
||||
|
||||
diff_stage_lines: ( code: Char('s'), modifiers: ( bits: 0,),),
|
||||
|
||||
|
||||
|
||||
stashing_save: ( code: Char('w'), modifiers: ( bits: 0,),),
|
||||
|
||||
stashing_toggle_index: ( code: Char('m'), modifiers: ( bits: 0,),),
|
||||
|
||||
|
||||
|
||||
stash_open: ( code: Char('l'), modifiers: ( bits: 0,),),
|
||||
|
||||
|
||||
|
||||
abort_merge: ( code: Char('M'), modifiers: ( bits: 1,),),
|
||||
|
||||
)
|
|
@ -4,7 +4,7 @@ JSON_PATH=~/.shellconfig/workspaces/workspaces.json
|
|||
|
||||
WSP=$(cat ${JSON_PATH} \
|
||||
| jq -r 'keys[]' \
|
||||
| fzf --reverse --header "Select a Project to open"
|
||||
| fzf --reverse --header "🖥 Select a Workspace to open:"
|
||||
)
|
||||
|
||||
if [ -z "$WSP" ]; then
|
||||
|
|
|
@ -3,6 +3,9 @@ set-option -g prefix C-a
|
|||
unbind-key C-a
|
||||
bind-key C-a send-prefix
|
||||
|
||||
# Esc fast
|
||||
set -s escape-time 0
|
||||
|
||||
# For gapless window numbers
|
||||
set-option -g renumber-windows on
|
||||
|
||||
|
@ -71,8 +74,6 @@ bind-key \! run-shell "tmux neww -n '🌡️ Weather Peek' '(echo \"Fetching Wea
|
|||
############################
|
||||
# Plugins
|
||||
###########################
|
||||
# Open links from output
|
||||
set -g @plugin 'tmux-plugins/tmux-open'
|
||||
# Tmux yank (For clipboard integration)
|
||||
set -g @plugin 'tmux-plugins/tmux-yank'
|
||||
# Mouse select to clipboard
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
" plugins list
|
||||
call plug#begin('~/.vim/plugged')
|
||||
Plug 'sheerun/vim-polyglot' " A ton of language syntax
|
||||
Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' } " Markdown Preview
|
||||
Plug 'morhetz/gruvbox' " Gruvbox theme
|
||||
Plug 'chriskempson/base16-vim' " Base 16 Themes - https://github.com/chriskempson/base16-vim
|
||||
Plug 'sickill/vim-monokai' " Monokai Theme
|
||||
|
@ -29,6 +30,8 @@
|
|||
Plug 'ryanoasis/vim-devicons' " File Icons - Always load last
|
||||
call plug#end()
|
||||
|
||||
" Eliminate delay for esc insert->normal
|
||||
set timeoutlen=1000 ttimeoutlen=0
|
||||
" Set encoding to utf8
|
||||
set encoding=UTF-8
|
||||
" Set no compatible
|
||||
|
@ -86,7 +89,7 @@ augroup highlight_current_word
|
|||
au!
|
||||
au CursorHold *
|
||||
\ if ( expand("%") != 'NERD_tree_1' )
|
||||
\ | :exec 'match Search /\V\<' . expand('<cword>') . '\>/'
|
||||
\ | :silent! :exec 'match Search /\V\<' . expand('<cword>') . '\>/'
|
||||
\ | endif
|
||||
augroup END
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
- com.github.alexr4535.siglo
|
||||
- com.nextcloud.desktopclient.nextcloud
|
||||
- com.github.unrud.VideoDownloader
|
||||
- fyi.zoey.Boop-GTK
|
||||
- com.github.liferooter.textpieces
|
||||
- nl.hjdskes.gcolor3
|
||||
- re.sonny.Junction
|
||||
- org.gnome.DejaDup
|
||||
|
|
|
@ -60,8 +60,8 @@
|
|||
|
||||
- name: Copy gitui keybindings
|
||||
copy:
|
||||
src: dotfiles/gitui/key_config.ron
|
||||
dest: ~/.config/gitui/key_config.ron
|
||||
src: dotfiles/gitui/key_bindings.ron
|
||||
dest: ~/.config/gitui/key_bindings.ron
|
||||
force: yes
|
||||
mode: preserve
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
become: true
|
||||
package:
|
||||
name:
|
||||
- vim-X11
|
||||
- vim
|
||||
- the_silver_searcher
|
||||
state: present
|
||||
when: ansible_facts['os_family'] == "RedHat"
|
||||
|
@ -11,7 +11,7 @@
|
|||
become: true
|
||||
package:
|
||||
name:
|
||||
- vim-gtk
|
||||
- vim
|
||||
- silversearcher-ag
|
||||
state: present
|
||||
when: ansible_facts['os_family'] == "Debian"
|
||||
|
|
Loading…
Reference in a new issue