From 3e5cb479c7e76d003f06438a22ab379eab2f1368 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 4 Feb 2019 10:06:14 -0600 Subject: [PATCH 1/3] Light theme by default due to fluorescent lights --- apps/git/config | 2 +- de/gtk/2rc | 2 +- de/gtk/3settings.ini | 2 +- readme.md | 6 +++ .../colors/generator/schemes/holodized.yml | 4 +- scripts/colors/shell | 54 +++++++++---------- scripts/colors/vconsole | 22 ++++---- scripts/colors/vim | 38 ++++++------- scripts/colors/xresources | 34 ++++++------ 9 files changed, 85 insertions(+), 79 deletions(-) diff --git a/apps/git/config b/apps/git/config index 911ca3f..be48971 100644 --- a/apps/git/config +++ b/apps/git/config @@ -3,7 +3,7 @@ [user] name = Daniel Flanagan - email = daniel@lytedev.io + email = daniel.flanagan@mixonhill.com [filter "lfs"] clean = git-lfs clean -- %f diff --git a/de/gtk/2rc b/de/gtk/2rc index 0edf52b..aa00554 100644 --- a/de/gtk/2rc +++ b/de/gtk/2rc @@ -1,3 +1,3 @@ gtk-icon-theme-name = "elementary" -gtk-theme-name = "Arc-Dark" +gtk-theme-name = "Arc-Light" gtk-font-name = "Iosevka 9" diff --git a/de/gtk/3settings.ini b/de/gtk/3settings.ini index 010c652..3385988 100644 --- a/de/gtk/3settings.ini +++ b/de/gtk/3settings.ini @@ -1,5 +1,5 @@ [Settings] gtk-icon-theme-name = elementary -gtk-theme-name = Arc-Dark +gtk-theme-name = Arc-Light gtk-font-name = Iosevka 9 gtk-application-prefer-dark-theme = true diff --git a/readme.md b/readme.md index 7f92fc9..cdeb334 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,9 @@ +# Note + +This is a Mixon Hill Inc. employee specific version of my dotfiles from here: + +* https://github.com/lytedev/dotfiles + # My Dotfiles This repository contains the majority of application or OS configuration files diff --git a/scripts/colors/generator/schemes/holodized.yml b/scripts/colors/generator/schemes/holodized.yml index bdaded9..3d1c8f8 100644 --- a/scripts/colors/generator/schemes/holodized.yml +++ b/scripts/colors/generator/schemes/holodized.yml @@ -1,6 +1,6 @@ scheme: "Holodized" author: "Daniel Flanagan(https://lytedev.io)" -base00: "fdf6e3" # background, light cream +base00: "eeeeee" # background, light cream base01: "ddd6c3" # darker cream base02: "ada693" # darker cream base03: "8d8673" # greyish yellow (peuce) @@ -9,7 +9,7 @@ base05: "111111" # foreground dark grey base06: "333333" # foreground 2 dark grey base07: "555555" # foreground 3 dark grey base08: "990833" # magenta -base09: "fd971f" # orange +base09: "8d370f" # orange base0A: "947010" # yellow base0B: "06623e" # green base0C: "006677" # cyan diff --git a/scripts/colors/shell b/scripts/colors/shell index ebeb6fc..146eca4 100755 --- a/scripts/colors/shell +++ b/scripts/colors/shell @@ -1,5 +1,5 @@ #!/bin/sh -# Base16 Donokai - Shell color setup script +# Base16 Holodized - Shell color setup script # Daniel Flanagan(https://lytedev.io) if [ "${TERM%%-*}" = 'linux' ]; then @@ -7,31 +7,31 @@ if [ "${TERM%%-*}" = 'linux' ]; then return 2>/dev/null || exit 0 fi -color00="11/11/11" # Base 00 - Black -color01="f9/26/72" # Base 08 - Red -color02="a6/e2/2e" # Base 0B - Green -color03="f4/bf/75" # Base 0A - Yellow -color04="66/d9/ef" # Base 0D - Blue -color05="ae/81/ff" # Base 0E - Magenta -color06="a1/ef/e4" # Base 0C - Cyan -color07="f8/f8/f2" # Base 05 - White -color08="75/71/5e" # Base 03 - Bright Black +color00="ee/ee/ee" # Base 00 - Black +color01="99/08/33" # Base 08 - Red +color02="06/62/3e" # Base 0B - Green +color03="94/70/10" # Base 0A - Yellow +color04="00/44/88" # Base 0D - Blue +color05="4e/11/7f" # Base 0E - Magenta +color06="00/66/77" # Base 0C - Cyan +color07="11/11/11" # Base 05 - White +color08="8d/86/73" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="f9/f8/f5" # Base 07 - Bright White -color16="fd/97/1f" # Base 09 -color17="cc/66/33" # Base 0F -color18="38/38/30" # Base 01 -color19="49/48/3e" # Base 02 -color20="a5/9f/85" # Base 04 -color21="f5/f4/f1" # Base 06 -color_foreground="f8/f8/f2" # Base 05 -color_background="11/11/11" # Base 00 -color_cursor="f8/f8/f2" # Base 05 +color15="55/55/55" # Base 07 - Bright White +color16="8d/37/0f" # Base 09 +color17="88/33/11" # Base 0F +color18="dd/d6/c3" # Base 01 +color19="ad/a6/93" # Base 02 +color20="55/4f/45" # Base 04 +color21="33/33/33" # Base 06 +color_foreground="11/11/11" # Base 05 +color_background="ee/ee/ee" # Base 00 +color_cursor="11/11/11" # Base 05 if [ -n "$TMUX" ]; then # tell tmux to pass the escape sequences through @@ -82,13 +82,13 @@ printf $printf_template 21 $color21 # foreground / background / cursor color if [ -n "$ITERM_SESSION_ID" ]; then # iTerm2 proprietary escape codes - printf $printf_template_custom Pg f8f8f2 # forground - printf $printf_template_custom Ph 111111 # background - printf $printf_template_custom Pi f8f8f2 # bold color - printf $printf_template_custom Pj 49483e # selection color - printf $printf_template_custom Pk f8f8f2 # selected text color - printf $printf_template_custom Pl f8f8f2 # cursor - printf $printf_template_custom Pm 111111 # cursor text + printf $printf_template_custom Pg 111111 # forground + printf $printf_template_custom Ph eeeeee # background + printf $printf_template_custom Pi 111111 # bold color + printf $printf_template_custom Pj ada693 # selection color + printf $printf_template_custom Pk 111111 # selected text color + printf $printf_template_custom Pl 111111 # cursor + printf $printf_template_custom Pm eeeeee # cursor text else printf $printf_template_var 10 $color_foreground printf $printf_template_var 11 $color_background diff --git a/scripts/colors/vconsole b/scripts/colors/vconsole index f742227..3e83346 100755 --- a/scripts/colors/vconsole +++ b/scripts/colors/vconsole @@ -1,23 +1,23 @@ #!/bin/sh -# Base16 Donokai - Virtual console color setup script +# Base16 Holodized - Virtual console color setup script # Daniel Flanagan(https://lytedev.io) -color00="111111" # Base 00 - Black -color01="f92672" # Base 08 - Red -color02="a6e22e" # Base 0B - Green -color03="f4bf75" # Base 0A - Yellow -color04="66d9ef" # Base 0D - Blue -color05="ae81ff" # Base 0E - Magenta -color06="a1efe4" # Base 0C - Cyan -color07="f8f8f2" # Base 05 - White -color08="75715e" # Base 03 - Bright Black +color00="eeeeee" # Base 00 - Black +color01="990833" # Base 08 - Red +color02="06623e" # Base 0B - Green +color03="947010" # Base 0A - Yellow +color04="004488" # Base 0D - Blue +color05="4e117f" # Base 0E - Magenta +color06="006677" # Base 0C - Cyan +color07="111111" # Base 05 - White +color08="8d8673" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="f9f8f5" # Base 07 - Bright White +color15="555555" # Base 07 - Bright White # 16 color space echo -e "\e]P0$color00" diff --git a/scripts/colors/vim b/scripts/colors/vim index 7fbf468..e4a7037 100644 --- a/scripts/colors/vim +++ b/scripts/colors/vim @@ -1,4 +1,4 @@ -" Base16 Donokai (https://github.com/chriskempson/base16) +" Base16 Holodized (https://github.com/chriskempson/base16) " Scheme: Daniel Flanagan(https://lytedev.io) " This enables the coresponding base16-shell script to run so that @@ -7,27 +7,27 @@ " let g:base16_shell_path=base16-builder/output/shell/ if !has('gui_running') if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-holodized.".&background.".sh" endif endif " GUI color definitions -let s:gui00 = "111111" -let s:gui01 = "383830" -let s:gui02 = "49483e" -let s:gui03 = "75715e" -let s:gui04 = "a59f85" -let s:gui05 = "f8f8f2" -let s:gui06 = "f5f4f1" -let s:gui07 = "f9f8f5" -let s:gui08 = "f92672" -let s:gui09 = "fd971f" -let s:gui0A = "f4bf75" -let s:gui0B = "a6e22e" -let s:gui0C = "a1efe4" -let s:gui0D = "66d9ef" -let s:gui0E = "ae81ff" -let s:gui0F = "cc6633" +let s:gui00 = "eeeeee" +let s:gui01 = "ddd6c3" +let s:gui02 = "ada693" +let s:gui03 = "8d8673" +let s:gui04 = "554f45" +let s:gui05 = "111111" +let s:gui06 = "333333" +let s:gui07 = "555555" +let s:gui08 = "990833" +let s:gui09 = "8d370f" +let s:gui0A = "947010" +let s:gui0B = "06623e" +let s:gui0C = "006677" +let s:gui0D = "004488" +let s:gui0E = "4e117f" +let s:gui0F = "883311" " Terminal color definitions let s:cterm00 = "00" @@ -59,7 +59,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-donokai" +let g:colors_name = "base16-holodized" " Highlighting function fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) diff --git a/scripts/colors/xresources b/scripts/colors/xresources index 45d6593..0bcee00 100644 --- a/scripts/colors/xresources +++ b/scripts/colors/xresources @@ -1,22 +1,22 @@ -! Base16 Donokai +! Base16 Holodized ! Scheme: Daniel Flanagan(https://lytedev.io) -#define base00 #111111 -#define base01 #383830 -#define base02 #49483e -#define base03 #75715e -#define base04 #a59f85 -#define base05 #f8f8f2 -#define base06 #f5f4f1 -#define base07 #f9f8f5 -#define base08 #f92672 -#define base09 #fd971f -#define base0A #f4bf75 -#define base0B #a6e22e -#define base0C #a1efe4 -#define base0D #66d9ef -#define base0E #ae81ff -#define base0F #cc6633 +#define base00 #eeeeee +#define base01 #ddd6c3 +#define base02 #ada693 +#define base03 #8d8673 +#define base04 #554f45 +#define base05 #111111 +#define base06 #333333 +#define base07 #555555 +#define base08 #990833 +#define base09 #8d370f +#define base0A #947010 +#define base0B #06623e +#define base0C #006677 +#define base0D #004488 +#define base0E #4e117f +#define base0F #883311 *foreground: base05 *background: base00 From f4ec1397a4f997de8e8b73bbb620159dfc9f79f9 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 4 Feb 2019 10:17:20 -0600 Subject: [PATCH 2/3] Back to dark --- de/gtk/2rc | 2 +- de/gtk/3settings.ini | 2 +- .../colors/generator/schemes/holodized.yml | 4 +- scripts/colors/shell | 54 +++++++++---------- scripts/colors/vconsole | 22 ++++---- scripts/colors/vim | 38 ++++++------- scripts/colors/xresources | 34 ++++++------ 7 files changed, 78 insertions(+), 78 deletions(-) diff --git a/de/gtk/2rc b/de/gtk/2rc index aa00554..0edf52b 100644 --- a/de/gtk/2rc +++ b/de/gtk/2rc @@ -1,3 +1,3 @@ gtk-icon-theme-name = "elementary" -gtk-theme-name = "Arc-Light" +gtk-theme-name = "Arc-Dark" gtk-font-name = "Iosevka 9" diff --git a/de/gtk/3settings.ini b/de/gtk/3settings.ini index 3385988..010c652 100644 --- a/de/gtk/3settings.ini +++ b/de/gtk/3settings.ini @@ -1,5 +1,5 @@ [Settings] gtk-icon-theme-name = elementary -gtk-theme-name = Arc-Light +gtk-theme-name = Arc-Dark gtk-font-name = Iosevka 9 gtk-application-prefer-dark-theme = true diff --git a/scripts/colors/generator/schemes/holodized.yml b/scripts/colors/generator/schemes/holodized.yml index 3d1c8f8..8d1ffa3 100644 --- a/scripts/colors/generator/schemes/holodized.yml +++ b/scripts/colors/generator/schemes/holodized.yml @@ -6,8 +6,8 @@ base02: "ada693" # darker cream base03: "8d8673" # greyish yellow (peuce) base04: "554f45" # darker peuce base05: "111111" # foreground dark grey -base06: "333333" # foreground 2 dark grey -base07: "555555" # foreground 3 dark grey +base06: "555555" # foreground 2 dark grey +base07: "888888" # foreground 3 dark grey base08: "990833" # magenta base09: "8d370f" # orange base0A: "947010" # yellow diff --git a/scripts/colors/shell b/scripts/colors/shell index 146eca4..ebeb6fc 100755 --- a/scripts/colors/shell +++ b/scripts/colors/shell @@ -1,5 +1,5 @@ #!/bin/sh -# Base16 Holodized - Shell color setup script +# Base16 Donokai - Shell color setup script # Daniel Flanagan(https://lytedev.io) if [ "${TERM%%-*}" = 'linux' ]; then @@ -7,31 +7,31 @@ if [ "${TERM%%-*}" = 'linux' ]; then return 2>/dev/null || exit 0 fi -color00="ee/ee/ee" # Base 00 - Black -color01="99/08/33" # Base 08 - Red -color02="06/62/3e" # Base 0B - Green -color03="94/70/10" # Base 0A - Yellow -color04="00/44/88" # Base 0D - Blue -color05="4e/11/7f" # Base 0E - Magenta -color06="00/66/77" # Base 0C - Cyan -color07="11/11/11" # Base 05 - White -color08="8d/86/73" # Base 03 - Bright Black +color00="11/11/11" # Base 00 - Black +color01="f9/26/72" # Base 08 - Red +color02="a6/e2/2e" # Base 0B - Green +color03="f4/bf/75" # Base 0A - Yellow +color04="66/d9/ef" # Base 0D - Blue +color05="ae/81/ff" # Base 0E - Magenta +color06="a1/ef/e4" # Base 0C - Cyan +color07="f8/f8/f2" # Base 05 - White +color08="75/71/5e" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="55/55/55" # Base 07 - Bright White -color16="8d/37/0f" # Base 09 -color17="88/33/11" # Base 0F -color18="dd/d6/c3" # Base 01 -color19="ad/a6/93" # Base 02 -color20="55/4f/45" # Base 04 -color21="33/33/33" # Base 06 -color_foreground="11/11/11" # Base 05 -color_background="ee/ee/ee" # Base 00 -color_cursor="11/11/11" # Base 05 +color15="f9/f8/f5" # Base 07 - Bright White +color16="fd/97/1f" # Base 09 +color17="cc/66/33" # Base 0F +color18="38/38/30" # Base 01 +color19="49/48/3e" # Base 02 +color20="a5/9f/85" # Base 04 +color21="f5/f4/f1" # Base 06 +color_foreground="f8/f8/f2" # Base 05 +color_background="11/11/11" # Base 00 +color_cursor="f8/f8/f2" # Base 05 if [ -n "$TMUX" ]; then # tell tmux to pass the escape sequences through @@ -82,13 +82,13 @@ printf $printf_template 21 $color21 # foreground / background / cursor color if [ -n "$ITERM_SESSION_ID" ]; then # iTerm2 proprietary escape codes - printf $printf_template_custom Pg 111111 # forground - printf $printf_template_custom Ph eeeeee # background - printf $printf_template_custom Pi 111111 # bold color - printf $printf_template_custom Pj ada693 # selection color - printf $printf_template_custom Pk 111111 # selected text color - printf $printf_template_custom Pl 111111 # cursor - printf $printf_template_custom Pm eeeeee # cursor text + printf $printf_template_custom Pg f8f8f2 # forground + printf $printf_template_custom Ph 111111 # background + printf $printf_template_custom Pi f8f8f2 # bold color + printf $printf_template_custom Pj 49483e # selection color + printf $printf_template_custom Pk f8f8f2 # selected text color + printf $printf_template_custom Pl f8f8f2 # cursor + printf $printf_template_custom Pm 111111 # cursor text else printf $printf_template_var 10 $color_foreground printf $printf_template_var 11 $color_background diff --git a/scripts/colors/vconsole b/scripts/colors/vconsole index 3e83346..f742227 100755 --- a/scripts/colors/vconsole +++ b/scripts/colors/vconsole @@ -1,23 +1,23 @@ #!/bin/sh -# Base16 Holodized - Virtual console color setup script +# Base16 Donokai - Virtual console color setup script # Daniel Flanagan(https://lytedev.io) -color00="eeeeee" # Base 00 - Black -color01="990833" # Base 08 - Red -color02="06623e" # Base 0B - Green -color03="947010" # Base 0A - Yellow -color04="004488" # Base 0D - Blue -color05="4e117f" # Base 0E - Magenta -color06="006677" # Base 0C - Cyan -color07="111111" # Base 05 - White -color08="8d8673" # Base 03 - Bright Black +color00="111111" # Base 00 - Black +color01="f92672" # Base 08 - Red +color02="a6e22e" # Base 0B - Green +color03="f4bf75" # Base 0A - Yellow +color04="66d9ef" # Base 0D - Blue +color05="ae81ff" # Base 0E - Magenta +color06="a1efe4" # Base 0C - Cyan +color07="f8f8f2" # Base 05 - White +color08="75715e" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="555555" # Base 07 - Bright White +color15="f9f8f5" # Base 07 - Bright White # 16 color space echo -e "\e]P0$color00" diff --git a/scripts/colors/vim b/scripts/colors/vim index e4a7037..7fbf468 100644 --- a/scripts/colors/vim +++ b/scripts/colors/vim @@ -1,4 +1,4 @@ -" Base16 Holodized (https://github.com/chriskempson/base16) +" Base16 Donokai (https://github.com/chriskempson/base16) " Scheme: Daniel Flanagan(https://lytedev.io) " This enables the coresponding base16-shell script to run so that @@ -7,27 +7,27 @@ " let g:base16_shell_path=base16-builder/output/shell/ if !has('gui_running') if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-holodized.".&background.".sh" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" endif endif " GUI color definitions -let s:gui00 = "eeeeee" -let s:gui01 = "ddd6c3" -let s:gui02 = "ada693" -let s:gui03 = "8d8673" -let s:gui04 = "554f45" -let s:gui05 = "111111" -let s:gui06 = "333333" -let s:gui07 = "555555" -let s:gui08 = "990833" -let s:gui09 = "8d370f" -let s:gui0A = "947010" -let s:gui0B = "06623e" -let s:gui0C = "006677" -let s:gui0D = "004488" -let s:gui0E = "4e117f" -let s:gui0F = "883311" +let s:gui00 = "111111" +let s:gui01 = "383830" +let s:gui02 = "49483e" +let s:gui03 = "75715e" +let s:gui04 = "a59f85" +let s:gui05 = "f8f8f2" +let s:gui06 = "f5f4f1" +let s:gui07 = "f9f8f5" +let s:gui08 = "f92672" +let s:gui09 = "fd971f" +let s:gui0A = "f4bf75" +let s:gui0B = "a6e22e" +let s:gui0C = "a1efe4" +let s:gui0D = "66d9ef" +let s:gui0E = "ae81ff" +let s:gui0F = "cc6633" " Terminal color definitions let s:cterm00 = "00" @@ -59,7 +59,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-holodized" +let g:colors_name = "base16-donokai" " Highlighting function fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) diff --git a/scripts/colors/xresources b/scripts/colors/xresources index 0bcee00..45d6593 100644 --- a/scripts/colors/xresources +++ b/scripts/colors/xresources @@ -1,22 +1,22 @@ -! Base16 Holodized +! Base16 Donokai ! Scheme: Daniel Flanagan(https://lytedev.io) -#define base00 #eeeeee -#define base01 #ddd6c3 -#define base02 #ada693 -#define base03 #8d8673 -#define base04 #554f45 -#define base05 #111111 -#define base06 #333333 -#define base07 #555555 -#define base08 #990833 -#define base09 #8d370f -#define base0A #947010 -#define base0B #06623e -#define base0C #006677 -#define base0D #004488 -#define base0E #4e117f -#define base0F #883311 +#define base00 #111111 +#define base01 #383830 +#define base02 #49483e +#define base03 #75715e +#define base04 #a59f85 +#define base05 #f8f8f2 +#define base06 #f5f4f1 +#define base07 #f9f8f5 +#define base08 #f92672 +#define base09 #fd971f +#define base0A #f4bf75 +#define base0B #a6e22e +#define base0C #a1efe4 +#define base0D #66d9ef +#define base0E #ae81ff +#define base0F #cc6633 *foreground: base05 *background: base00 From 22ea30ff4c05db1d4780ce61a05c210227251c0a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 13 Mar 2019 07:36:53 -0500 Subject: [PATCH 3/3] Various changes --- apps/alacritty/alacritty.yml | 641 +++++++++++++++++++++------- apps/neovim/ftplugin/typescript.vim | 1 + apps/neovim/plugins.vim | 7 +- apps/neovim/settings.vim | 2 +- de/bspwm/bspwmrc | 6 +- de/fontconfig/conf.d/01-emoji.conf | 9 - de/x/loadresources | 7 + de/x/profile | 6 +- de/x/resources | 45 +- scripts/bin/app-launcher | 24 +- scripts/bin/bspwm_load_state | 9 + scripts/bin/bspwm_load_state_canvas | 27 ++ scripts/bin/bspwm_load_state_rules | 26 ++ scripts/bin/bspwm_save_state | 5 + shell/bash/bashrc | 3 + shell/bash/paths | 1 + 16 files changed, 609 insertions(+), 210 deletions(-) delete mode 100644 de/fontconfig/conf.d/01-emoji.conf create mode 100755 scripts/bin/bspwm_load_state create mode 100755 scripts/bin/bspwm_load_state_canvas create mode 100755 scripts/bin/bspwm_load_state_rules create mode 100755 scripts/bin/bspwm_save_state diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml index 6314d65..20777cc 100644 --- a/apps/alacritty/alacritty.yml +++ b/apps/alacritty/alacritty.yml @@ -1,91 +1,181 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator +# Configuration for Alacritty, the GPU enhanced terminal emulator. # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables -# set by alacritty it self. -env: - # TERM env customization. +# set by alacritty itself. +#env: + # TERM variable # - # If this property is not set, alacritty will set it to xterm-256color. + # This value is used to set the `$TERM` environment variable for + # each instance of Alacritty. If it is not present, alacritty will + # check the local terminfo database and use `alacritty` if it is + # available, otherwise `xterm-256color` is used. + #TERM: xterm-256color + +window: + # Window dimensions (changes require restart) # - # Note that some xterm terminfo databases don't declare support for italics. - # You can verify this by checking for the presence of `smso` and `sitm` in - # `infocmp xterm-256color`. - TERM: xterm-256color + # Specified in number of columns/lines, not pixels. + # If both are `0`, this setting is ignored. + dimensions: + columns: 0 + lines: 0 -# Window dimensions in character columns and lines -# (changes require restart) -dimensions: - columns: 80 - lines: 24 + # Window padding (changes require restart) + # + # Blank space added around the window in pixels. This padding is scaled + # by DPI and the specified value is always added at both opposing sides. + padding: + x: 10 + y: 10 -# The FreeType rasterizer needs to know the device DPI for best results -# (changes require restart) -dpi: - x: 180.0 - y: 180.0 + # Spread additional padding evenly around the terminal content. + dynamic_padding: false -padding: - x: 24.0 - y: 24.0 + # Window decorations + # + # Values for `decorations`: + # - full: Borders and title bar + # - none: Neither borders nor title bar + # + # Values for `decorations` (macOS only): + # - transparent: Title bar, transparent background and title bar buttons + # - buttonless: Title bar, transparent background, but no title bar buttons + decorations: full -# Display tabs using this many cells (changes require restart) + # When true, alacritty starts maximized. + start_maximized: false + +scrolling: + # Maximum number of lines in the scrollback buffer. + # Specifying '0' will disable scrolling. + history: 10000 + + # Number of lines the viewport will move for every line scrolled when + # scrollback is enabled (history > 0). + multiplier: 3 + + # Faux Scrolling + # + # The `faux_multiplier` setting controls the number of lines the terminal + # should scroll when the alternate screen buffer is active. This is used + # to allow mouse scrolling for applications like `man`. + # + # Specifying `0` will disable faux scrolling. + faux_multiplier: 3 + + # Scroll to the bottom when new text is written to the terminal. + auto_scroll: false + +# Spaces per Tab (changes require restart) +# +# This setting defines the width of a tab in cells. +# +# Some applications, like Emacs, rely on knowing about the width of a tab. +# To prevent unexpected behavior in these applications, it's also required to +# change the `it` value in terminfo when altering this setting. tabspaces: 2 -# When true, bold text is drawn using the bright variant of colors. -draw_bold_text_with_bright_colors: true - # Font configuration (changes require restart) font: - # The normal (roman) font face to use. + # Normal (roman) font face normal: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Regular + # Font family + # + # Default: + # - (macOS) Menlo + # - (Linux) monospace + # - (Windows) Consolas + family: Iosevka - # The bold font face + # The `style` can be specified to pick a specific face. + #style: Regular + + # Bold font face bold: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Bold + # Font family + # + # If the bold family is not specified, it will fall back to the + # value specified for the normal font. + family: Iosevka - # The italic font face + # The `style` can be specified to pick a specific face. + #style: Bold + + # Italic font face italic: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Italic + # Font family + # + # If the italic family is not specified, it will fall back to the + # value specified for the normal font. + family: Iosevka - # Point size of the font - size: 10.0 - # Offset is the extra space around each character. offset.y can be thought of - # as modifying the linespacing, and offset.x as modifying the letter spacing. + # The `style` can be specified to pick a specific face. + #style: Italic + + # Point size + size: 9.0 + + # Offset is the extra space around each character. `offset.y` can be thought of + # as modifying the line spacing, and `offset.x` as modifying the letter spacing. offset: - x: -37.0 - y: 0.0 + x: 0 + y: 0 - # OS X only: use thin stroke font rendering. Thin strokes are suitable - # for retina displays, but for non-retina you probably want this set to - # false. + # Glyph offset determines the locations of the glyphs within their cells with + # the default being at the bottom. Increasing `x` moves the glyph to the right, + # increasing `y` moves the glyph upwards. + glyph_offset: + x: 0 + y: 0 + + # Thin stroke font rendering (macOS only) + # + # Thin strokes are suitable for retina displays, but for non-retina screens + # it is recommended to set `use_thin_strokes` to `false` + # + # macOS >= 10.14.x: + # + # If the font quality on non-retina display looks bad then set + # `use_thin_strokes` to `true` and enable font smoothing by running the + # following command: + # `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO` + # + # This is a global setting and will require a log out or restart to take + # effect. use_thin_strokes: true -# Should display the render timer +# Display the time it takes to redraw each frame. render_timer: false -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: false +# Keep the log file after quitting Alacritty. +persistent_logging: false + +# If `true`, bold text is drawn using the bright color variants. +draw_bold_text_with_bright_colors: true # Colors (Tomorrow Night Bright) colors: # Default colors primary: - background: '0x111111' + background: '0x000000' foreground: '0xeaeaea' - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0x000000' - cursor: '0xffffff' + # Bright and dim foreground colors + # + # The dimmed foreground color is calculated automatically if it is not present. + # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` + # is `false`, the normal foreground color will be used. + #dim_foreground: '0x9a9a9a' + #bright_foreground: '0xffffff' + + # Cursor colors + # + # Colors which should be used to draw the terminal cursor. If these are unset, + # the cursor color will be the inverse of the cell color. + #cursor: + # text: '0x000000' + # cursor: '0xffffff' # Normal colors normal: @@ -96,7 +186,7 @@ colors: blue: '0x7aa6da' magenta: '0xc397d8' cyan: '0x70c0ba' - white: '0x424242' + white: '0xeaeaea' # Bright colors bright: @@ -107,7 +197,31 @@ colors: blue: '0x7aa6da' magenta: '0xb77ee0' cyan: '0x54ced6' - white: '0x2a2a2a' + white: '0xffffff' + + # Dim colors + # + # If the dim colors are not set, they will be calculated automatically based + # on the `normal` colors. + #dim: + # black: '0x000000' + # red: '0x8c3336' + # green: '0x7a8530' + # yellow: '0x97822e' + # blue: '0x506d8f' + # magenta: '0x80638e' + # cyan: '0x497e7a' + # white: '0x9a9a9a' + + # Indexed Colors + # + # The indexed colors include all colors from 16 to 256. + # When these are not set, they're filled with sensible defaults. + # + # Example: + # `- { index: 16, color: '0xff00ff' }` + # + indexed_colors: [] # Visual Bell # @@ -117,138 +231,337 @@ colors: # setting the `duration` property (represented in milliseconds). You can also # configure the transition function by setting the `animation` property. # -# Possible values for `animation` -# `Ease` -# `EaseOut` -# `EaseOutSine` -# `EaseOutQuad` -# `EaseOutCubic` -# `EaseOutQuart` -# `EaseOutQuint` -# `EaseOutExpo` -# `EaseOutCirc` -# `Linear` -# -# To completely disable the visual bell, set its duration to 0. +# Values for `animation`: +# - Ease +# - EaseOut +# - EaseOutSine +# - EaseOutQuad +# - EaseOutCubic +# - EaseOutQuart +# - EaseOutQuint +# - EaseOutExpo +# - EaseOutCirc +# - Linear # +# Specifying a `duration` of `0` will disable the visual bell. visual_bell: animation: EaseOutExpo duration: 0 + color: '0xffffff' -# Key bindings +# Background opacity # -# Each binding is defined as an object with some properties. Most of the -# properties are optional. All of the alphabetical keys should have a letter for -# the `key` value such as `V`. Function keys are probably what you would expect -# as well (F1, F2, ..). The number keys above the main keyboard are encoded as -# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`, -# etc. These all match the glutin::VirtualKeyCode variants. -# -# Possible values for `mods` -# `Command`, `Super` refer to the super/command/windows key -# `Control` for the control key -# `Shift` for the Shift key -# `Alt` and `Option` refer to alt/option -# -# mods may be combined with a `|`. For example, requiring control and shift -# looks like: -# -# mods: Control|Shift -# -# The parser is currently quite sensitive to whitespace and capitalization - -# capitalization must match exactly, and piped items must not have whitespace -# around them. -# -# Either an `action` or `chars` field must be present. `chars` writes the -# specified string every time that binding is activated. These should generally -# be escape sequences, but they can be configured to send arbitrary strings of -# bytes. Possible values of `action` include `Paste` and `PasteSelection`. -# -# Want to add a binding (e.g. "PageUp") but are unsure what the X sequence -# (e.g. "\x1b[5~") is? Open another terminal (like xterm) without tmux, -# then run `showkey -a` to get the sequence associated to a key combination. -key_bindings: - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: W, mods: Command, action: Quit } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[1~", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[4~", mode: ~AppCursor } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } +# Window opacity as a floating point number from `0.0` to `1.0`. +# The value `0.0` is completely transparent and `1.0` is opaque. +background_opacity: 1.0 # Mouse bindings # -# Currently doesn't support modifiers. Both the `mouse` and `action` fields must -# be specified. +# Available fields: +# - mouse +# - action +# - mods (optional) # # Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` +# - Middle +# - Left +# - Right +# - Numeric identifier such as `5` # -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy (TODO) +# All available `mods` and `action` values are documented in the key binding +# section. mouse_bindings: - { mouse: Middle, action: PasteSelection } mouse: + # Click settings + # + # The `double_click` and `triple_click` settings control the time + # alacritty should wait for accepting multiple clicks as one double + # or triple click. double_click: { threshold: 300 } triple_click: { threshold: 300 } + # If this is `true`, the cursor is temporarily hidden when typing. + hide_when_typing: false + + url: + # URL launcher + # + # This program is executed when clicking on a text which is recognized as a URL. + # The URL is always added to the command as the last parameter. + # + # When set to `None`, URL launching will be disabled completely. + # + # Default: + # - (macOS) open + # - (Linux) xdg-open + # - (Windows) explorer + #launcher: xdg-open + + # URL modifiers + # + # These are the modifiers that need to be held down for opening URLs when clicking + # on them. The available modifiers are documented in the key binding section. + modifiers: None + selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" -hide_cursor_when_typing: false + # When set to `true`, selected text will be copied to the primary clipboard. + save_to_clipboard: false + +# Allow terminal applications to change Alacritty's window title. +dynamic_title: true + +cursor: + # Cursor style + # + # Values for `style`: + # - ▇ Block + # - _ Underline + # - | Beam + style: Block + + # If this is `true`, the cursor will be rendered as a hollow box when the + # window is not focused. + unfocused_hollow: true + +# Live config reload (changes require restart) +live_config_reload: true # Shell # -# You can set shell.program to the path of your favorite shell, e.g. /bin/fish. -# Entries in shell.args are passed unmodified as arguments to the shell. +# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`. +# Entries in `shell.args` are passed unmodified as arguments to the shell. +# +# Default: +# - (Linux/macOS) /bin/bash --login +# - (Windows) powershell #shell: # program: /bin/bash # args: # - --login + +# Windows 10 ConPTY backend (Windows only) +# +# This will enable better color support and may resolve other issues, +# however this API and its implementation is still young and so is +# disabled by default, as stability may not be as good as the winpty +# backend. +# +# Alacritty will fall back to the WinPTY automatically if the ConPTY +# backend cannot be initialized. +enable_experimental_conpty_backend: false + +# Send ESC (\x1b) before characters when alt is pressed. +alt_send_esc: true + +# Key bindings +# +# Key bindings are specified as a list of objects. Each binding will specify a +# key and modifiers required to trigger it, terminal modes where the binding is +# applicable, and what should be done when the key binding fires. It can either +# send a byte sequence to the running application (`chars`), execute a +# predefined action (`action`) or fork and execute a specified command plus +# arguments (`command`). +# +# Bindings are always filled by default, but will be replaced when a new binding +# with the same triggers is defined. To unset a default binding, it can be +# mapped to the `None` action. +# +# Example: +# `- { key: V, mods: Control|Shift, action: Paste }` +# +# Available fields: +# - key +# - mods (optional) +# - chars | action | command (exactly one required) +# - mode (optional) +# +# Values for `key`: +# - `A` -> `Z` +# - `F1` -> `F12` +# - `Key1` -> `Key0` +# +# A full list with available key codes can be found here: +# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants +# +# Instead of using the name of the keys, the `key` field also supports using +# the scancode of the desired key. Scancodes have to be specified as a +# decimal number. +# This command will allow you to display the hex scancodes for certain keys: +# `showkey --scancodes` +# +# Values for `mods`: +# - Command +# - Control +# - Super +# - Shift +# - Alt +# +# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. +# Whitespace and capitalization is relevant and must match the example. +# +# Values for `chars`: +# The `chars` field writes the specified string to the terminal. This makes +# it possible to pass escape sequences. +# To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run +# the command `showkey -a` outside of tmux. +# Note that applications use terminfo to map escape sequences back to +# keys. It is therefore required to update the terminfo when +# changing an escape sequence. +# +# Values for `action`: +# - Paste +# - PasteSelection +# - Copy +# - IncreaseFontSize +# - DecreaseFontSize +# - ResetFontSize +# - ScrollPageUp +# - ScrollPageDown +# - ScrollToTop +# - ScrollToBottom +# - ClearHistory +# - Hide +# - Quit +# - ClearLogNotice +# - SpawnNewInstance +# - None +# +# Values for `command`: +# The `command` field must be a map containing a `program` string and +# an `args` array of command line parameter strings. +# +# Example: +# `command: { program: "alacritty", args: ["-e", "vttest"] }` +# +# Values for `mode`: +# - ~AppCursor +# - AppCursor +# - ~AppKeypad +# - AppKeypad +key_bindings: + # (Windows/Linux only) + #- { key: V, mods: Control|Shift, action: Paste } + #- { key: C, mods: Control|Shift, action: Copy } + #- { key: Insert, mods: Shift, action: PasteSelection } + #- { key: Key0, mods: Control, action: ResetFontSize } + #- { key: Equals, mods: Control, action: IncreaseFontSize } + #- { key: Subtract, mods: Control, action: DecreaseFontSize } + + # (macOS only) + #- { key: Key0, mods: Command, action: ResetFontSize } + #- { key: Equals, mods: Command, action: IncreaseFontSize } + #- { key: Minus, mods: Command, action: DecreaseFontSize } + #- { key: K, mods: Command, action: ClearHistory } + #- { key: K, mods: Command, chars: "\x0c" } + #- { key: V, mods: Command, action: Paste } + #- { key: C, mods: Command, action: Copy } + #- { key: H, mods: Command, action: Hide } + #- { key: Q, mods: Command, action: Quit } + #- { key: W, mods: Command, action: Quit } + + - { key: Paste, action: Paste } + - { key: Copy, action: Copy } + - { key: L, mods: Control, action: ClearLogNotice } + - { key: L, mods: Control, chars: "\x0c" } + - { key: Home, chars: "\x1bOH", mode: AppCursor } + - { key: Home, chars: "\x1b[H", mode: ~AppCursor } + - { key: End, chars: "\x1bOF", mode: AppCursor } + - { key: End, chars: "\x1b[F", mode: ~AppCursor } + - { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt } + - { key: PageUp, mods: Shift, chars: "\x1b[5;2~", mode: Alt } + - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } + - { key: PageUp, chars: "\x1b[5~" } + - { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt } + - { key: PageDown, mods: Shift, chars: "\x1b[6;2~", mode: Alt } + - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } + - { key: PageDown, chars: "\x1b[6~" } + - { key: Tab, mods: Shift, chars: "\x1b[Z" } + - { key: Back, chars: "\x7f" } + - { key: Back, mods: Alt, chars: "\x1b\x7f" } + - { key: Insert, chars: "\x1b[2~" } + - { key: Delete, chars: "\x1b[3~" } + - { key: Left, mods: Shift, chars: "\x1b[1;2D" } + - { key: Left, mods: Control, chars: "\x1b[1;5D" } + - { key: Left, mods: Alt, chars: "\x1b[1;3D" } + - { key: Left, chars: "\x1b[D", mode: ~AppCursor } + - { key: Left, chars: "\x1bOD", mode: AppCursor } + - { key: Right, mods: Shift, chars: "\x1b[1;2C" } + - { key: Right, mods: Control, chars: "\x1b[1;5C" } + - { key: Right, mods: Alt, chars: "\x1b[1;3C" } + - { key: Right, chars: "\x1b[C", mode: ~AppCursor } + - { key: Right, chars: "\x1bOC", mode: AppCursor } + - { key: Up, mods: Shift, chars: "\x1b[1;2A" } + - { key: Up, mods: Control, chars: "\x1b[1;5A" } + - { key: Up, mods: Alt, chars: "\x1b[1;3A" } + - { key: Up, chars: "\x1b[A", mode: ~AppCursor } + - { key: Up, chars: "\x1bOA", mode: AppCursor } + - { key: Down, mods: Shift, chars: "\x1b[1;2B" } + - { key: Down, mods: Control, chars: "\x1b[1;5B" } + - { key: Down, mods: Alt, chars: "\x1b[1;3B" } + - { key: Down, chars: "\x1b[B", mode: ~AppCursor } + - { key: Down, chars: "\x1bOB", mode: AppCursor } + - { key: F1, chars: "\x1bOP" } + - { key: F2, chars: "\x1bOQ" } + - { key: F3, chars: "\x1bOR" } + - { key: F4, chars: "\x1bOS" } + - { key: F5, chars: "\x1b[15~" } + - { key: F6, chars: "\x1b[17~" } + - { key: F7, chars: "\x1b[18~" } + - { key: F8, chars: "\x1b[19~" } + - { key: F9, chars: "\x1b[20~" } + - { key: F10, chars: "\x1b[21~" } + - { key: F11, chars: "\x1b[23~" } + - { key: F12, chars: "\x1b[24~" } + - { key: F1, mods: Shift, chars: "\x1b[1;2P" } + - { key: F2, mods: Shift, chars: "\x1b[1;2Q" } + - { key: F3, mods: Shift, chars: "\x1b[1;2R" } + - { key: F4, mods: Shift, chars: "\x1b[1;2S" } + - { key: F5, mods: Shift, chars: "\x1b[15;2~" } + - { key: F6, mods: Shift, chars: "\x1b[17;2~" } + - { key: F7, mods: Shift, chars: "\x1b[18;2~" } + - { key: F8, mods: Shift, chars: "\x1b[19;2~" } + - { key: F9, mods: Shift, chars: "\x1b[20;2~" } + - { key: F10, mods: Shift, chars: "\x1b[21;2~" } + - { key: F11, mods: Shift, chars: "\x1b[23;2~" } + - { key: F12, mods: Shift, chars: "\x1b[24;2~" } + - { key: F1, mods: Control, chars: "\x1b[1;5P" } + - { key: F2, mods: Control, chars: "\x1b[1;5Q" } + - { key: F3, mods: Control, chars: "\x1b[1;5R" } + - { key: F4, mods: Control, chars: "\x1b[1;5S" } + - { key: F5, mods: Control, chars: "\x1b[15;5~" } + - { key: F6, mods: Control, chars: "\x1b[17;5~" } + - { key: F7, mods: Control, chars: "\x1b[18;5~" } + - { key: F8, mods: Control, chars: "\x1b[19;5~" } + - { key: F9, mods: Control, chars: "\x1b[20;5~" } + - { key: F10, mods: Control, chars: "\x1b[21;5~" } + - { key: F11, mods: Control, chars: "\x1b[23;5~" } + - { key: F12, mods: Control, chars: "\x1b[24;5~" } + - { key: F1, mods: Alt, chars: "\x1b[1;6P" } + - { key: F2, mods: Alt, chars: "\x1b[1;6Q" } + - { key: F3, mods: Alt, chars: "\x1b[1;6R" } + - { key: F4, mods: Alt, chars: "\x1b[1;6S" } + - { key: F5, mods: Alt, chars: "\x1b[15;6~" } + - { key: F6, mods: Alt, chars: "\x1b[17;6~" } + - { key: F7, mods: Alt, chars: "\x1b[18;6~" } + - { key: F8, mods: Alt, chars: "\x1b[19;6~" } + - { key: F9, mods: Alt, chars: "\x1b[20;6~" } + - { key: F10, mods: Alt, chars: "\x1b[21;6~" } + - { key: F11, mods: Alt, chars: "\x1b[23;6~" } + - { key: F12, mods: Alt, chars: "\x1b[24;6~" } + - { key: F1, mods: Super, chars: "\x1b[1;3P" } + - { key: F2, mods: Super, chars: "\x1b[1;3Q" } + - { key: F3, mods: Super, chars: "\x1b[1;3R" } + - { key: F4, mods: Super, chars: "\x1b[1;3S" } + - { key: F5, mods: Super, chars: "\x1b[15;3~" } + - { key: F6, mods: Super, chars: "\x1b[17;3~" } + - { key: F7, mods: Super, chars: "\x1b[18;3~" } + - { key: F8, mods: Super, chars: "\x1b[19;3~" } + - { key: F9, mods: Super, chars: "\x1b[20;3~" } + - { key: F10, mods: Super, chars: "\x1b[21;3~" } + - { key: F11, mods: Super, chars: "\x1b[23;3~" } + - { key: F12, mods: Super, chars: "\x1b[24;3~" } + - { key: NumpadEnter, chars: "\n" } diff --git a/apps/neovim/ftplugin/typescript.vim b/apps/neovim/ftplugin/typescript.vim index 77fd7f5..5950abc 100644 --- a/apps/neovim/ftplugin/typescript.vim +++ b/apps/neovim/ftplugin/typescript.vim @@ -1 +1,2 @@ let b:ale_fixers = ['tslint'] +let b:ale_linters = ['tsserver'] diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 5764ec1..1752b73 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -59,6 +59,7 @@ let g:ale_fix_on_save = 1 " autocomplete let g:ale_completion_enabled = 1 +let g:ale_typescript_tslint_use_global = 1 let g:fzf_layout = { 'window': 'enew' } @@ -96,9 +97,9 @@ Plug 'wellle/targets.vim' " adds some more Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project's root directory Plug 'junegunn/goyo.vim' " better distraction-free editing Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings -Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages -Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language -Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'junegunn/vim-peekaboo' " preview registers Plug 'scrooloose/nerdtree' " file browser Plug 'tpope/vim-eunuch' " unix helper commands +Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages +Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language +Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index c3723e9..03f07c2 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -84,7 +84,7 @@ set isfname+=32 " allow filenames to show them 32s " no freakin' bell set visualbell t_vb= if has('autocmd') - augroup DisableVisualVell + augroup DisableVisualBell autocmd GUIEnter * set visualbell t_vb= augroup END endif diff --git a/de/bspwm/bspwmrc b/de/bspwm/bspwmrc index bc416f4..8f732a8 100755 --- a/de/bspwm/bspwmrc +++ b/de/bspwm/bspwmrc @@ -38,9 +38,9 @@ if command -v sxhkd >/dev/null 2>&1; then sxhkd -m -1 & fi -if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then - source "$DOTFILES_PATH/de/x/loadresources" -fi +# if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then +# source "$DOTFILES_PATH/de/x/loadresources" +# fi if [ -f "$HOME/.fehbg" ]; then "$HOME/.fehbg" & diff --git a/de/fontconfig/conf.d/01-emoji.conf b/de/fontconfig/conf.d/01-emoji.conf deleted file mode 100644 index 5867948..0000000 --- a/de/fontconfig/conf.d/01-emoji.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - Segoe UI Emoji - Noto Color Emoji - - diff --git a/de/x/loadresources b/de/x/loadresources index d2b8540..a514108 100755 --- a/de/x/loadresources +++ b/de/x/loadresources @@ -4,6 +4,13 @@ echo "xloadresources" >> "$HOME/.xstartup_log" ENV_TYPE="${1}" +if [[ "$ENV_TYPE" = "auto" ]]; then + if [[ "$(xrandr --listmonitors | grep 'Monitors:' | awk '{print $2}')" -gt 1 ]]; then + ENV_TYPE="lodpi" + fi + echo "xloadresources auto env: $ENV_TYPE" >> "$HOME/.xstartup_log" +fi + if [[ -z "$ENV_TYPE" ]]; then ENV_TYPE="" else diff --git a/de/x/profile b/de/x/profile index 0fb66ca..0dbc983 100644 --- a/de/x/profile +++ b/de/x/profile @@ -7,10 +7,14 @@ if [[ -z "$DOTFILES_PATH" ]]; then export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles" fi +if command -v autorandr >/dev/null 2>&1; then + autorandr -c +fi + echo "xprofile ($DOTFILES_PATH)" >> "$HOME/.xstartup_log" if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then - source "$DOTFILES_PATH/de/x/loadresources" + "$DOTFILES_PATH/de/x/loadresources" auto fi # keyrepeat settings diff --git a/de/x/resources b/de/x/resources index 61c0d21..25c2ed0 100755 --- a/de/x/resources +++ b/de/x/resources @@ -15,35 +15,36 @@ ## *letterSpace: 0 ## Set fonts in "$HOME/.Xresources.env" -URxvt*font: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*faceName: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*boldFont: xft:Iosevka:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*letterSpace: 0 +URxvt.font: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.faceName: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.boldFont: xft:Iosevka:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.letterSpace: 0 ## rxvt-unicode configuration -URxvt*termName: rxvt-unicode -URxvt*scrollBar: false -URxvt*cursorUnderline: true -URxvt*cursorBlink: true -URxvt*intensityStyles: true -URxvt*utf8: 1 -URxvt*scaleHeight: 1 -URxvt*depth: 32 -URxvt*internalBorder: 24 -URxvt*perl-ext-common: default,matcher,resize-font -URxvt*keysym.M-Escape: perl:keyboard-select:activate -URxvt*resize-font.smaller: C-Down -URxvt*resize-font.bigger: C-Up -URxvt*url-launcher: /usr/bin/xdg-open -URxvt*matcher.button: 1 -URxvt*depth: 0 -URxvt*iso14755: False +URxvt.termName: rxvt-unicode +URxvt.scrollBar: false +URxvt.cursorUnderline: true +URxvt.cursorBlink: true +URxvt.intensityStyles: true +URxvt.utf8: 1 +URxvt.scaleHeight: 1 +URxvt.depth: 32 +URxvt.internalBorder: 24 +URxvt.perl-ext-common: default,matcher,resize-font +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 +URxvt.depth: 0 +URxvt.iso14755: False ## Other Xorg configuration Xcursor.theme: human ## DPI config -*dpi: 92 +dpi: 92 +.dpi: 92 Xft.dpi: 92 *autohint: 0 *lcdfilter: lcddefault diff --git a/scripts/bin/app-launcher b/scripts/bin/app-launcher index 31bbfe6..39470cc 100755 --- a/scripts/bin/app-launcher +++ b/scripts/bin/app-launcher @@ -10,11 +10,21 @@ BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1 FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) GAP=$(xrdb -query | sed -ne 's/.*internalBorder:\s*\(.*\)$/\1/p' | head -n 1) -for i in "$@"; -do - params=" $params $i" -done +echo "$@" >> "$HOME/.sxhkd.log" -echo "$params" >> "$HOME/.sxhkd.log" - -rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 -width 600 $params +rofi \ + -combi-modi run,window \ + -show combi \ + -modi combi \ + -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" \ + -padding "$GAP" \ + -bw "$BORDER_WIDTH" \ + -color-enabled \ + -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" \ + -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" \ + -monitor -4 \ + -width 600 \ + "$@" diff --git a/scripts/bin/bspwm_load_state b/scripts/bin/bspwm_load_state new file mode 100755 index 0000000..5a36b1c --- /dev/null +++ b/scripts/bin/bspwm_load_state @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +f="$DOTFILES_PATH/.bspwm-state.json.tmp" +c="$DOTFILES_PATH/.bspwm-canvas.json.tmp" +bspwm_load_state_canvas "$f" > "$c" +chmod 600 "$c" +bspc wm -l "$c" +rm "$c" +bspwm_load_state_rules "$f" | bash diff --git a/scripts/bin/bspwm_load_state_canvas b/scripts/bin/bspwm_load_state_canvas new file mode 100755 index 0000000..09e4902 --- /dev/null +++ b/scripts/bin/bspwm_load_state_canvas @@ -0,0 +1,27 @@ +#! /usr/bin/env python3 + +import sys +import json + +source = open(sys.argv[1]) if len(sys.argv) > 1 else sys.stdin +state = json.load(source) + +def nullify_clients(node): + if node is None: + return + elif node['client'] is None: + nullify_clients(node['firstChild']) + nullify_clients(node['secondChild']) + else: + node['client'] = None + +state['clientsCount'] = 0 +state['focusHistory'] = [] +state['stackingList'] = [] + +for monitor in state['monitors']: + for desktop in monitor['desktops']: + desktop['focusedNodeId'] = 0 + nullify_clients(desktop['root']) + +print(json.dumps(state)) diff --git a/scripts/bin/bspwm_load_state_rules b/scripts/bin/bspwm_load_state_rules new file mode 100755 index 0000000..f4f2f54 --- /dev/null +++ b/scripts/bin/bspwm_load_state_rules @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +import sys +import json +import os + +file = os.environ['DOTFILES_PATH'] + '/.bspwm-state.json.tmp' + +source = open(sys.argv[1]) if len(sys.argv) > 1 else sys.stdin +state = json.load(source) + +def print_rules(prefix, node, path): + if node is None: + return + elif node['client'] is None: + print_rules(prefix, node['firstChild'], path+['1']) + print_rules(prefix, node['secondChild'], path+['2']) + else: + client = node['client'] + print('bspc rule -a {}:{} -o node={}{}'.format(client['className'], + client['instanceName'], + prefix, '/'.join(path))) + +for i, monitor in enumerate(state['monitors']): + for j, desktop in enumerate(monitor['desktops']): + print_rules('@^{}:^{}:/'.format(i+1, j+1), desktop['root'], []) diff --git a/scripts/bin/bspwm_save_state b/scripts/bin/bspwm_save_state new file mode 100755 index 0000000..595a119 --- /dev/null +++ b/scripts/bin/bspwm_save_state @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +f="$DOTFILES_PATH/.bspwm-state.json.tmp" +bspc wm -d > "$f" +chmod 600 "$f" diff --git a/shell/bash/bashrc b/shell/bash/bashrc index e63c597..edb546f 100644 --- a/shell/bash/bashrc +++ b/shell/bash/bashrc @@ -95,6 +95,9 @@ if [ "$PWD" = "$HOME" ]; then cd "$NICE_HOME" || cd || return fi +# TODO: check if fd command exists +export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' + _make_paths [ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/shell/bash/paths b/shell/bash/paths index b76200d..528bb40 100644 --- a/shell/bash/paths +++ b/shell/bash/paths @@ -7,6 +7,7 @@ export PATH=$PATH:"$GOPATH/bin" export PATH=$PATH:"$DOTFILES_PATH/scripts/bin" export PATH=$PATH:"$DOTFILES_PATH/scripts/env_bin" export PATH=$PATH:"$HOME/.cargo/bin" +export PATH=$PATH:"$HOME/.yarn/bin" if [ -d "$HOME/.local/bin" ]; then export PATH=$PATH:"$HOME/.local/bin"