From fe7407a859e43fc3c9a6e8761ce810131c6ac492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?= Date: Sat, 20 Feb 2021 01:01:48 +0300 Subject: [PATCH] More vim, added termite config --- install.sh | 3 +- misc/termite/config | 78 ++++++++++++++++++++++++++++++++++ misc/termite/config.user | 69 ++++++++++++++++++++++++++++++ scripts/status-bar/spotify-bar | 2 +- tmux/tmux.conf | 7 +++ vim/vim/plugin/vimux.vim | 9 ++++ vim/vimrc | 1 - zsh/zshrc | 5 +++ 8 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 misc/termite/config create mode 100644 misc/termite/config.user create mode 100644 vim/vim/plugin/vimux.vim diff --git a/install.sh b/install.sh index cfcc8e9c..56026f7d 100755 --- a/install.sh +++ b/install.sh @@ -13,7 +13,8 @@ ln -s ~/.dotfiles/gtk/gtk-4.0 ~/.config/gtk-4.0 ln -s ~/.dotfiles/misc/dunst ~/.config/dunst ln -s ~/.dotfiles/misc/rofi ~/.config/rofi ln -s ~/.dotfiles/misc/zathura ~/.config/zathura -ln -s ~/.dotfiles/misc/systemd .config/systemd +ln -s ~/.dotfiles/misc/termite/ ~/.config/termite +ln -s ~/.dotfiles/misc/systemd ~/.config/systemd # Scripts diff --git a/misc/termite/config b/misc/termite/config new file mode 100644 index 00000000..5da4b477 --- /dev/null +++ b/misc/termite/config @@ -0,0 +1,78 @@ +[options] +allow_bold = true +#audible_bell = false +#bold_is_bright = true +#cell_height_scale = 1.0 +#cell_width_scale = 1.0 +clickable_url = true +dynamic_title = true +font = CaskaydiaCove Nerd Font 12 +#fullscreen = true +#icon_name = terminal +#mouse_autohide = false +#scroll_on_output = false +#scroll_on_keystroke = true +# Length of the scrollback buffer, 0 disabled the scrollback buffer +# and setting it to a negative value means "infinite scrollback" +scrollback_lines = 10000 +#search_wrap = true +#urgent_on_bell = true +#hyperlinks = false + +# $BROWSER is used by default if set, with xdg-open as a fallback +browser = xdg-open + +# "system", "on" or "off" +cursor_blink = system + +# "block", "underline" or "ibeam" +cursor_shape = block + +# Hide links that are no longer valid in url select overlay mode +#filter_unmatched_urls = true + +# Emit escape sequences for extra modified keys +#modify_other_keys = false + +# set size hints for the window +#size_hints = false + +# "off", "left" or "right" +#scrollbar = off + +# ==================================== +[colors] + +# http://www.xcolors.net/dl/gnometerm + +# Black +color0= #000000 +color8= #555753 + +# Red +color1= #cc0000 +color9= #ef2929 + +# Green +color2= #4e9a06 +color10= #8ae234 + +# Yellow +color3= #c4a000 +color11= #fce94f + +# Blue +color4= #3465a4 +color12= #729fcf + +# Magenta +color5= #75507b +color13= #ad7fa8 + +# Cyan +color6= #06989a +color14= #34e2e2 + +# White +color7= #d3d7cf +color15= #eeeeec diff --git a/misc/termite/config.user b/misc/termite/config.user new file mode 100644 index 00000000..fb04e4da --- /dev/null +++ b/misc/termite/config.user @@ -0,0 +1,69 @@ +[options] +allow_bold = true +#audible_bell = false +#bold_is_bright = true +#cell_height_scale = 1.0 +#cell_width_scale = 1.0 +clickable_url = true +dynamic_title = true +font = Cascadia Mono 12 +#fullscreen = true +#icon_name = terminal +#mouse_autohide = false +#scroll_on_output = false +#scroll_on_keystroke = true +# Length of the scrollback buffer, 0 disabled the scrollback buffer +# and setting it to a negative value means "infinite scrollback" +scrollback_lines = 10000 +#search_wrap = true +#urgent_on_bell = true +#hyperlinks = false + +# $BROWSER is used by default if set, with xdg-open as a fallback +browser = xdg-open + +# "system", "on" or "off" +cursor_blink = system + +# "block", "underline" or "ibeam" +cursor_shape = block + +# Hide links that are no longer valid in url select overlay mode +#filter_unmatched_urls = true + +# Emit escape sequences for extra modified keys +#modify_other_keys = false + +# set size hints for the window +#size_hints = false + +# "off", "left" or "right" +#scrollbar = off + +# ==================================== +[colors] +cursor = #d8dee9 +cursor_foreground = #2e3440 + +foreground = #d8dee9 +foreground_bold = #d8dee9 +background = #0F111A + +highlight = #4c566a + +color0 = #3b4252 +color1 = #bf616a +color2 = #a3be8c +color3 = #ebcb8b +color4 = #81a1c1 +color5 = #b48ead +color6 = #88c0d0 +color7 = #e5e9f0 +color8 = #4c566a +color9 = #bf616a +color10 = #a3be8c +color11 = #ebcb8b +color12 = #81a1c1 +color13 = #b48ead +color14 = #8fbcbb +color15 = #eceff4 diff --git a/scripts/status-bar/spotify-bar b/scripts/status-bar/spotify-bar index b0cbacd0..60d1cf17 100755 --- a/scripts/status-bar/spotify-bar +++ b/scripts/status-bar/spotify-bar @@ -1,6 +1,6 @@ #! /bin/sh -icon=" 󰓇" +icon=" " #status=$(~/.local/bin/status-bar/spotify_status.py -f '{artist} - {song}') status=$(playerctl metadata --format '{{artist}} - {{title}}' | cut -c 1-50) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 8a84d285..bc6dd904 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -115,3 +115,10 @@ bind -n C-Left resize-pane -L 10 bind -n C-Right resize-pane -R 10 bind -n C-Down resize-pane -D 5 bind -n C-Up resize-pane -U 5 + +unbind % +unbind '"' +# Split panes +bind | split-window -h -c "#{pane_current_path}" +bind _ split-window -v -c "#{pane_current_path}" + diff --git a/vim/vim/plugin/vimux.vim b/vim/vim/plugin/vimux.vim new file mode 100644 index 00000000..f91180e5 --- /dev/null +++ b/vim/vim/plugin/vimux.vim @@ -0,0 +1,9 @@ +function! RunCommand() + call inputsave() + let replacement = input('Enter Command: ') + call inputrestore() + execute 'call VimuxRunCommand("'.replacement.'")' +endfunction + +nnoremap :call RunCommand() +nnoremap :VimuxRunLastCommand diff --git a/vim/vimrc b/vim/vimrc index dac81bea..1a173fab 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -11,7 +11,6 @@ source ~/.vim/plugin/plugins.vim let mapleader = "," " Leader Mappings -map map w :update map q :qall map gs :Gstatus diff --git a/zsh/zshrc b/zsh/zshrc index b7a14b96..460292bd 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,3 +1,4 @@ +if [ "$TMUX" = "" ]; then tmux; fi ~/.scripts/welcome.sh eval "$(direnv hook zsh)" >> /tmp/direnv # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. @@ -59,3 +60,7 @@ export PATH=$PATH:$FLUTTER_HOME/bin export BORG_KEYS_DIR=~/.keys/borg [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + +#zle-line-init() { zle -K vicmd; } +#zle -N zle-line-init +