Compare commits

..

No commits in common. "37b562b5c934449a34b8078e42e7b5ff926c87f7" and "c5fa4d1056cf8358cbb1a24a5d78fb46d2115bf2" have entirely different histories.

42 changed files with 119 additions and 355 deletions

View File

@ -1,30 +1,30 @@
# do not edit; generated by scwrypts # do not edit; generated by scwrypts
# theme : burning-death # theme : spring-sunset
[colors.cursor] [colors.cursor]
cursor = '0x8eadf8' cursor = '0xfdfbe7'
[colors.primary] [colors.primary]
background = '0x300000' background = '0x0b1e32'
foreground = '0xffeaec' foreground = '0xe8eaf7'
[colors.normal] [colors.normal]
black = '0x000505' black = '0x000505'
red = '0xdc1a4e' red = '0xf12875'
green = '0x3296eb' green = '0x5c68c4'
yellow = '0xc24022' yellow = '0xf2e044'
blue = '0x5ab5e0' blue = '0x5ab5e0'
magenta = '0xdf5041' magenta = '0xf5e878'
cyan = '0x34549b' cyan = '0x7983ce'
white = '0xd0f0f0' white = '0xd0f0f0'
[colors.bright] [colors.bright]
black = '0x424253' black = '0x424253'
red = '0xf08ba4' red = '0xf694bc'
green = '0x8eadf8' green = '0x9fa6dc'
yellow = '0xf19892' yellow = '0xf8ef9e'
blue = '0xb9e5f4' blue = '0xb9e5f4'
magenta = '0xf19892' magenta = '0xfbf5c4'
cyan = '0x99bafb' cyan = '0xc5c9ea'
white = '0x7e707e' white = '0x7e707e'
[window] [window]
opacity = 0.75 opacity = 0.85

View File

@ -1,29 +1,29 @@
--- # yamllint disable rule:colons --- # yamllint disable rule:colons
# do not edit; generated by scwrypts # do not edit; generated by scwrypts
# theme : burning-death # theme : spring-sunset
colors: colors:
primary: primary:
background: '0x570406' background: '0x0b1e32'
foreground: '0xffeaec' foreground: '0xe8eaf7'
cursor: cursor:
cursor: '0x8eadf8' cursor: '0xfdfbe7'
normal: normal:
black: '0x000505' black: '0x000505'
red: '0xdc1a4e' red: '0xf12875'
green: '0x3296eb' green: '0x5c68c4'
yellow: '0xc24022' yellow: '0xf2e044'
blue: '0x5ab5e0' blue: '0x5ab5e0'
magenta: '0xdf5041' magenta: '0xf5e878'
cyan: '0x34549b' cyan: '0x7983ce'
white: '0xd0f0f0' white: '0xd0f0f0'
bright: bright:
black: '0x424253' black: '0x424253'
red: '0xf08ba4' red: '0xf694bc'
green: '0x8eadf8' green: '0x9fa6dc'
yellow: '0xf19892' yellow: '0xf8ef9e'
blue: '0xb9e5f4' blue: '0xb9e5f4'
magenta: '0xf19892' magenta: '0xfbf5c4'
cyan: '0x99bafb' cyan: '0xc5c9ea'
white: '0x7e707e' white: '0x7e707e'
window: window:
opacity: 0.8 opacity: 0.8

View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
# do not edit; generated by scwrypts # do not edit; generated by scwrypts
# theme : burning-death # theme : spring-sunset
# #
# source this file to apply colorscheme to linux getty # source this file to apply colorscheme to linux getty
# #
[[ "$TERM" =~ ^linux$ ]] || return 0 [[ "$TERM" =~ ^linux$ ]] || return 0
/bin/echo -e " ]P0570406 ]P1dc1a4e ]P23296eb ]P3c24022 ]P45ab5e0 ]P5df5041 ]P634549b ]P7ffeaec ]P8f08ba4 ]P98eadf8 ]PAf19892 ]PBb9e5f4 ]PCf19892 ]PD99bafb ]PEd0f0f0 ]PF7e707e " /bin/echo -e " ]P00b1e32 ]P1f12875 ]P25c68c4 ]P3f2e044 ]P45ab5e0 ]P5f5e878 ]P67983ce ]P7e8eaf7 ]P8f694bc ]P99fa6dc ]PAf8ef9e ]PBb9e5f4 ]PCfbf5c4 ]PDc5c9ea ]PEd0f0f0 ]PF7e707e "
[ ! $NO_CLEAR ] && clear [ ! $NO_CLEAR ] && clear
return 0 return 0
sed $d sed $d

View File

@ -1,23 +1,23 @@
# do not edit; generated by scwrypts # do not edit; generated by scwrypts
# theme : burning-death # theme : spring-sunset
color0 #000505 color0 #000505
color1 #dc1a4e color1 #f12875
color2 #3296eb color2 #5c68c4
color3 #c24022 color3 #f2e044
color4 #5ab5e0 color4 #5ab5e0
color5 #df5041 color5 #f5e878
color6 #34549b color6 #7983ce
color7 #d0f0f0 color7 #d0f0f0
color8 #424253 color8 #424253
color9 #f08ba4 color9 #f694bc
color10 #8eadf8 color10 #9fa6dc
color11 #f19892 color11 #f8ef9e
color12 #b9e5f4 color12 #b9e5f4
color13 #f19892 color13 #fbf5c4
color14 #99bafb color14 #c5c9ea
color15 #7e707e color15 #7e707e
cursor #8eadf8 cursor #fdfbe7
background #570406 background #0b1e32
foreground #ffeaec foreground #e8eaf7
selection_background # selection_background #
selection_foreground # selection_foreground #

View File

@ -1 +1 @@
burning-death spring-sunset

View File

@ -1,11 +1,11 @@
# do not edit; generated by scwrypts # do not edit; generated by scwrypts
# theme : burning-death # theme : spring-sunset
[colors] [colors]
background = #570406 background = #0b1e32
foreground = #ffeaec foreground = #e8eaf7
background-alt = #c24022 background-alt = #f2e044
foreground-alt = #000505 foreground-alt = #000505
primary = #c24022 primary = #f2e044
secondary = #3296eb secondary = #5c68c4
alert = #dc1a4e alert = #f12875
disabled = #424253 disabled = #424253

View File

@ -1,14 +1,14 @@
/** /**
* do not edit; generated by scwrypts * do not edit; generated by scwrypts
* theme : burning-death * theme : spring-sunset
**/ **/
*{ *{
background: #26416e; background: #0b1e32;
foreground: #d0f0f0; foreground: #d0f0f0;
background-alt: #e77068; background-alt: #f5e878;
foreground-alt: #000505; foreground-alt: #000505;
selected: #000505; selected: #000505;
active: #c24022; active: #f2e044;
urgent: #dc1a4e; urgent: #f12875;
} }

View File

@ -1 +1 @@
/home/w0ryn/.wryn/colorschemes/burning-death.yaml /home/w0ryn/.wryn/colorschemes/spring-sunset.yaml

View File

@ -1,74 +0,0 @@
--- # yamllint disable rule:colons
background: .material.primary.900
foreground: .material.primary.50
cursor: .material.secondary.200
alacritty:
transparency: 0.75
background: '#300000'
ansi:
blue:
regular: '#5ab5e0'
bright: '#b9e5f4'
magenta:
regular: .material.primary.400
bright: .material.primary.200
cyan:
regular: .material.secondary.800
bright: .material.secondary.100
material:
base:
secondary: .material.secondary.400
foreground:
secondary: .material.foreground.secondary.400
primary: # replaces ANSI yellow
50: '#ffeaec'
100: '#ffccce'
200: '#f19892'
300: '#e77068'
400: '#df5041'
500: '#c24022'
600: '#b43523'
700: '#922b1e'
800: '#761316'
900: '#570406'
secondary: # replaces ANSI green
50: '#c3e7fe'
100: '#99bafb'
200: '#8eadf8'
300: '#67a0f1'
400: '#3296eb'
500: '#3c8ce3'
600: '#357ccf'
700: '#3c67b4'
800: '#34549b'
900: '#26416e'
error: # replaces ANSI red
50: '#fbe3e9'
100: '#f6b8c8'
200: '#f08ba4'
300: '#e95d80'
400: '#e23b66'
500: '#dc1a4e'
600: '#cc154c'
700: '#b71148'
800: '#a30a45'
900: '#7f033f'
foreground:
primary:
500: .ansi.gray.black
600: .ansi.gray.black
700: .ansi.gray.black
800: .ansi.gray.black
900: .ansi.gray.black
secondary:
400: .ansi.gray.white

View File

@ -77,17 +77,16 @@ bindsym $mod+Shift+f focus parent; fullscreen; focus child
bindsym $mod+BackSpace open bindsym $mod+BackSpace open
bindsym $mod+1 workspace number "1"; exec --no-startup-id polybar-msg cmd show bindsym $mod+1 workspace number "1"
bindsym $mod+2 workspace number "2"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+2 workspace number "2"
bindsym $mod+3 workspace number "3"; exec --no-startup-id polybar-msg cmd show bindsym $mod+3 workspace number "3"
bindsym $mod+4 workspace number "4"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+4 workspace number "4"
bindsym $mod+5 workspace number "5"; exec --no-startup-id polybar-msg cmd show bindsym $mod+5 workspace number "5"
bindsym $mod+6 workspace number "6"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+6 workspace number "6"
bindsym $mod+7 workspace number "7"; exec --no-startup-id polybar-msg cmd show bindsym $mod+7 workspace number "7"
bindsym $mod+8 workspace number "8"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+8 workspace number "8"
bindsym $mod+9 workspace number "9"; exec --no-startup-id polybar-msg cmd show bindsym $mod+9 workspace number "9"
bindsym $mod+0 workspace number "0"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+0 workspace number "0"
bindsym $mod+Shift+1 move container to workspace number "1" bindsym $mod+Shift+1 move container to workspace number "1"
bindsym $mod+Shift+2 move container to workspace number "2" bindsym $mod+Shift+2 move container to workspace number "2"

View File

@ -5,9 +5,6 @@
SCWRYPTS_SHORTCUT='' # CTRL + W SCWRYPTS_SHORTCUT='' # CTRL + W
SCWRYPTS_ENV_SHORTCUT='' # CTRL + / SCWRYPTS_ENV_SHORTCUT='' # CTRL + /
SCWRYPTS_ENVIRONMENT__SHOW_ENV_HELP=false
SCWRYPTS_ENVIRONMENT__PREFERRED_EDIT_MODE=quiet
for SEARCH_DIR in \ for SEARCH_DIR in \
"$HOME/.wryn/scwrypts" \ "$HOME/.wryn/scwrypts" \
"$HOME/Projects/yage/" \ "$HOME/Projects/yage/" \

View File

@ -40,18 +40,22 @@ $DOTWRYN/config/xinitrc.i3 X11/xinitrc
$DOTWRYN/bin/vim ../.local/bin/vim $DOTWRYN/bin/vim ../.local/bin/vim
$DOTWRYN/bin/$(hostnamectl --static) ../.$(hostnamectl --static) $DOTWRYN/bin/$(hostnamectl --static) ../.$(hostnamectl --static)
$( () { $DOTWRYN/config/scwrypts/environments/scwrypts/local scwrypts/environments/scwrypts/local
local SOURCE_CONTROLLED_GROUPS=(dotwryn remote scwrypts) $DOTWRYN/config/scwrypts/environments/scwrypts/local.altaria scwrypts/environments/scwrypts/local.altaria
local GROUP_MATCH_STRING="\\($(printf '\|%s' ${SOURCE_CONTROLLED_GROUPS[@]} | sed 's/^\\|//')\\)" $DOTWRYN/config/scwrypts/environments/scwrypts/local.blaziken scwrypts/environments/scwrypts/local.blaziken
$DOTWRYN/config/scwrypts/environments/scwrypts/local.butterfree scwrypts/environments/scwrypts/local.butterfree
local _LOCAL='scwrypts/environments' $DOTWRYN/config/scwrypts/environments/scwrypts/local.gardevoir scwrypts/environments/scwrypts/local.gardevoir
local _DOTWRYN="$DOTWRYN/config/scwrypts/environments" $DOTWRYN/config/scwrypts/environments/scwrypts/local.umbreon scwrypts/environments/scwrypts/local.umbreon
$DOTWRYN/config/scwrypts/environments/dotwryn/local scwrypts/environments/dotwryn/local
find "$HOME/.config/$_LOCAL" -mindepth 1 -maxdepth 1 -name \*.env.yaml \ $DOTWRYN/config/scwrypts/environments/dotwryn/local.altaria scwrypts/environments/dotwryn/local.altaria
| sed -n "s^.*/\(local\(\.[^.]\+\)\{0,\}\.$GROUP_MATCH_STRING.env.yaml\)$$_DOTWRYN/\1^$_LOCAL/\1p" \ $DOTWRYN/config/scwrypts/environments/dotwryn/local.blaziken scwrypts/environments/dotwryn/local.blaziken
| grep -v '\.secret\.' \ $DOTWRYN/config/scwrypts/environments/dotwryn/local.butterfree scwrypts/environments/dotwryn/local.butterfree
| sort --unique \ $DOTWRYN/config/scwrypts/environments/dotwryn/local.gardevoir scwrypts/environments/dotwryn/local.gardevoir
| column -ts '^' \ $DOTWRYN/config/scwrypts/environments/dotwryn/local.umbreon scwrypts/environments/dotwryn/local.umbreon
; $DOTWRYN/config/scwrypts/environments/remote/local scwrypts/environments/remote/local
} ) $DOTWRYN/config/scwrypts/environments/remote/local.altaria scwrypts/environments/remote/local.altaria
$DOTWRYN/config/scwrypts/environments/remote/local.blaziken scwrypts/environments/remote/local.blaziken
$DOTWRYN/config/scwrypts/environments/remote/local.butterfree scwrypts/environments/remote/local.butterfree
$DOTWRYN/config/scwrypts/environments/remote/local.gardevoir scwrypts/environments/remote/local.gardevoir
$DOTWRYN/config/scwrypts/environments/remote/local.umbreon scwrypts/environments/remote/local.umbreon
" "

View File

@ -1,2 +0,0 @@
--- # local.altaria > dotwryn
# no configuration set

View File

@ -1,2 +0,0 @@
--- # local.altaria > remote
# no configuration set

View File

@ -1,11 +0,0 @@
--- # local.altaria > scwrypts
media-sync:
targets:
value:
- Pictures
- Documents
- Media
- .local/.porn
- Games/roms
- .local/share/dolphin-emu
- Games/archives

View File

@ -1,2 +0,0 @@
--- # local.blaziken > dotwryn
# no configuration set

View File

@ -1,2 +0,0 @@
--- # local.blaziken > remote
# no configuration set

View File

@ -1,9 +0,0 @@
--- # local.blaziken > scwrypts
media-sync:
targets:
value:
- .local/share/dolphin-emu
- Games/roms/gameboy-advance
- Games/roms/gameboy-color
- Media
- Pictures

View File

@ -1,2 +0,0 @@
--- # local.butterfree > dotwryn
# no configuration set

View File

@ -1,2 +0,0 @@
--- # local.butterfree > remote
# no configuration set

View File

@ -1,10 +0,0 @@
--- # local.butterfree > scwrypts
media-sync:
targets:
value:
- .local/share/dolphin-emu
- Games/roms
- Games/wrynscape
- Documents
- Media
- Pictures

View File

@ -1,6 +0,0 @@
--- # local > dotwryn
desktop:
sfx-path:
value: $HOME/Media/sfx
wallpaper-path:
value: $HOME/Pictures/bg

View File

@ -1,2 +0,0 @@
--- # local.gardevoir > dotwryn
# no configuration set

View File

@ -1,2 +0,0 @@
--- # local.gardevoir > remote
# no configuration set

View File

@ -1,7 +0,0 @@
--- # local.gardevoir > scwrypts
media-sync:
targets:
value:
- Documents
- Media
- Pictures

View File

@ -1,2 +0,0 @@
--- # local > remote
# no configuration set

View File

@ -1,23 +0,0 @@
--- # local > scwrypts
aws:
account:
value: "088935110352"
efs:
local-mount-point:
value: /mnt/efs/yage
profile:
value: yage
region:
value: us-east-2
directus:
base-url:
value: https://heretic.directus.app
discord:
content-header:
value: '<@380809228450922507> '
media-sync:
s3-bucket:
value: yage
twilio:
account-sid:
value: ACac926b109b3cd8a78685a2a0994d0271

View File

@ -1,2 +0,0 @@
--- # local.umbreon > dotwryn
# no configuration set

View File

@ -1,2 +0,0 @@
--- # local.umbreon > remote
# no configuration set

View File

@ -1,16 +0,0 @@
--- # local.umbreon > scwrypts
discord:
default-avatar-url:
value: https://heretic.directus.app/assets/9c975a20-d6f3-47f5-8f77-74014f5d0024
default-username:
value: umbreon
media-sync:
targets:
value:
- Documents
- Pictures
- .local/.porn
- Media/commission
- Media/music
- Media/recordings
- Media/sfx

View File

@ -1,13 +0,0 @@
---
desktop:
.DESCRIPTION: >-
directory containing sound effects
sfx-path:
.ENVIRONMENT: DESKTOP__SFX_PATH
wallpaper-path:
.ENVIRONMENT: DESKTOP__WALLPAPER_PATH
wryn:
.DESCRIPTION: >-
home server data
server-hostnames:
.ENVIRONMENT: WRYN__SERVER_HOSTNAMES

View File

@ -20,7 +20,7 @@ MAIN() {
case $1 in case $1 in
up ) up )
case $UTIL in case $UTIL in
xbacklight ) xbacklight -inc 10 ;; xbacklight ) xbacklight + 10 ;;
gmux_backlight ) gmux_backlight +100 ;; gmux_backlight ) gmux_backlight +100 ;;
enlighten ) enlighten )
@ -31,13 +31,7 @@ MAIN() {
;; ;;
down ) down )
case $UTIL in case $UTIL in
xbacklight ) xbacklight ) xbacklight - 10 ;;
[[ $(xbacklight -get) -le 10 ]] \
&& xbacklight -set 1 \
|| xbacklight -dec 10 \
;
[[ $(xbacklight -get) -le 0 ]] && xbacklight -set 1
;;
gmux_backlight ) gmux_backlight -100 ;; gmux_backlight ) gmux_backlight -100 ;;
enlighten ) enlighten )

View File

@ -5,31 +5,31 @@ _GENERATE_THEME__alacritty() {
echo "# do not edit; generated by scwrypts echo "# do not edit; generated by scwrypts
# theme : $THEME_NAME # theme : $THEME_NAME
[colors.cursor] [colors.cursor]
cursor = '0x$(_GET_HEX .alacritty.cursor cursor)' cursor = '0x$CURSOR'
[colors.primary] [colors.primary]
background = '0x$(_GET_HEX .alacritty.background .background)' background = '0x$BACKGROUND'
foreground = '0x$(_GET_HEX .alacritty.foreground .foreground)' foreground = '0x$FOREGROUND'
[colors.normal] [colors.normal]
black = '0x$(_GET_HEX .ansi.gray.black)' black = '0x$BLACK'
red = '0x$(_GET_HEX .ansi.red.regular)' red = '0x$RED'
green = '0x$(_GET_HEX .ansi.green.regular)' green = '0x$GREEN'
yellow = '0x$(_GET_HEX .ansi.yellow.regular)' yellow = '0x$YELLOW'
blue = '0x$(_GET_HEX .ansi.blue.regular)' blue = '0x$BLUE'
magenta = '0x$(_GET_HEX .ansi.magenta.regular)' magenta = '0x$MAGENTA'
cyan = '0x$(_GET_HEX .ansi.cyan.regular)' cyan = '0x$CYAN'
white = '0x$(_GET_HEX .ansi.gray.white)' white = '0x$WHITE'
[colors.bright] [colors.bright]
black = '0x$(_GET_HEX .ansi.gray.regular)' black = '0x$BRIGHT_BLACK'
red = '0x$(_GET_HEX .ansi.red.bright)' red = '0x$BRIGHT_RED'
green = '0x$(_GET_HEX .ansi.green.bright)' green = '0x$BRIGHT_GREEN'
yellow = '0x$(_GET_HEX .ansi.yellow.bright)' yellow = '0x$BRIGHT_YELLOW'
blue = '0x$(_GET_HEX .ansi.blue.bright)' blue = '0x$BRIGHT_BLUE'
magenta = '0x$(_GET_HEX .ansi.magenta.bright)' magenta = '0x$BRIGHT_MAGENTA'
cyan = '0x$(_GET_HEX .ansi.cyan.bright)' cyan = '0x$BRIGHT_CYAN'
white = '0x$(_GET_HEX .ansi.gray.bright)' white = '0x$BRIGHT_WHITE'
" | sed '$d' > "$_COLORSCHEME_FILE__alacritty_toml" " | sed '$d' > "$_COLORSCHEME_FILE__alacritty_toml"
# backwards yaml compatibility # backwards yaml compatibility

View File

@ -17,8 +17,6 @@ DEFAULT_MATERIAL_REFERENCES="$ACTIVE_THEME_PATH/default.yaml"
DEPENDENCIES+=(sed yq) DEPENDENCIES+=(sed yq)
__CHECK_ENV_VAR DESKTOP__WALLPAPER_PATH --optional
##################################################################### #####################################################################
MAX_LOOKUP_RECURSION=10 MAX_LOOKUP_RECURSION=10
@ -228,10 +226,6 @@ SET_THEME() {
} }
done done
local WALLPAPER="$(find "$DESKTOP__WALLPAPER_PATH" -type f -name $THEME_NAME.\* 2>/dev/null | head -n1)"
[ "$WALLPAPER" ] && command -v feh &>/dev/null \
&& feh --bg-fill "$WALLPAPER"
CHECK_ERRORS --no-usage \ CHECK_ERRORS --no-usage \
&& echo "$THEME_NAME" > "$ACTIVE_THEME_PATH/name.txt" && echo "$THEME_NAME" > "$ACTIVE_THEME_PATH/name.txt"
} }

View File

@ -1,5 +0,0 @@
---
remote-tmux-session:
.DESCRIPTION: >-
session name for remote connection (default 'remote')
.ENVIRONMENT: REMOTE_TMUX_SESSION

View File

@ -115,4 +115,3 @@ CloudFlare
Cloudflare Cloudflare
test test
When When
exit

Binary file not shown.

View File

@ -25,5 +25,5 @@ nnoremap <S-y> :call ToggleYCM()<CR>
nnoremap gd :YcmCompleter GoToDefinition<CR> nnoremap gd :YcmCompleter GoToDefinition<CR>
augroup ycm_hover augroup ycm_hover
autocmd FileType rust,typescript,javascript,python nnoremap <silent><buffer> K <Plug>(YCMHover) autocmd FileType rust,typescript,javascript,python nnoremap <silent><buffer> ? <Plug>(YCMHover)
augroup end augroup end

View File

@ -2,12 +2,12 @@
" 31.utility-execute.vim wrapper for scwrypts-specific execution " 31.utility-execute.vim wrapper for scwrypts-specific execution
" "
function ExecuteScwrypt(scwrypt = '', args = '', output = '', syntax = 'bash', loglevel = '0') function ExecuteScwrypt(scwrypt = '', args = '', output = '', syntax = 'bash')
let b:scwryptsPrevArgs = a:args let b:scwryptsPrevArgs = a:args
call ExecuteCommand('scwrypts --log-level ' . a:loglevel . ' ' . a:scwrypt . ' -- ' . a:args, a:output, 'shell', a:syntax) call ExecuteCommand('scwrypts -n ' . a:scwrypt . ' -- ' . a:args, a:output, 'shell', a:syntax)
echom 'scwrypts -n ' . a:scwrypt . '--' . a:args echom 'scwrypts -n ' . a:scwrypt . '--' . a:args
endfunction endfunction
function ExecuteScwryptInteractive(scwrypt = '', args = '', output = '', syntax = 'bash', loglevel = '4') function ExecuteScwryptInteractive(scwrypt = '', args = '', output = '', syntax = 'bash')
call ExecuteScwrypt(a:scwrypt, a:args . input('scwrypts ' . a:scwrypt . '--' . a:args), a:output, a:syntax, a:loglevel) call ExecuteScwrypt(a:scwrypt, a:args . input('scwrypts ' . a:scwrypt . '--' . a:args), a:output, a:syntax)
endfunction endfunction

View File

@ -51,7 +51,7 @@ function QuickREPL(repl = '')
let b:quick_repl = l:repl let b:quick_repl = l:repl
let l:output = get(g:quickrepl_output_format_overrides_by_repl_command, l:repl, g:quickrepl_output_format_default) let l:output = get(g:quickrepl_output_format_overrides_by_repl_command, l:repl, g:quickrepl_output_format_default)
let l:repl_args = get(g:quickrepl_repl_command_args_by_repl_command, l:repl, '') let l:repl_args = get(g:quickrepl_repl_command_args, l:repl, '')
call ExecuteCommand(l:repl . ' ' . l:repl_args, l:output) call ExecuteCommand(l:repl . ' ' . l:repl_args, l:output)
endfunction endfunction

View File

@ -25,12 +25,7 @@
let g:quick_command_output_format = 'split-pane-horizontal' let g:quick_command_output_format = 'split-pane-horizontal'
function QuickCommand() function QuickCommand()
let l:quick_command = get(g:, 'quick_command', '') let l:quick_command = get(b:, 'quick_command', '')
if ( l:quick_command == '' )
let l:quick_command = get(b:, 'quick_command', '')
endif
if ( l:quick_command == '' ) if ( l:quick_command == '' )
let l:quick_command = input('input quick command : ') | redraw let l:quick_command = input('input quick command : ') | redraw
endif endif
@ -45,26 +40,4 @@ function QuickCommand()
call ExecuteCommand(l:quick_command, g:quick_command_output_format) call ExecuteCommand(l:quick_command, g:quick_command_output_format)
endfunction endfunction
function QuickCommandSetGlobal() nnoremap <Leader>t :call QuickCommand()<CR>
let l:quick_command = get(b:, 'quick_command', '')
if ( l:quick_command == '' )
let l:quick_command = input('input quick command : ') | redraw
endif
if ( l:quick_command == '' )
echohl DiffDelete | echo "no command supplied" | echohl None
return
endif
let g:quick_command = l:quick_command
endfunction
function QuickCommandReset()
let b:quick_command = ''
let g:quick_command = ''
endfunction
nnoremap <Leader>t :call QuickCommand()<CR>
nnoremap <Leader>gst :call QuickCommandSetGlobal()<CR>
"nnoremap <LocalLeader>t :call QuickCommandReset()<CR>

View File

@ -63,9 +63,9 @@ augroup file_specific_commands
autocmd FileType *.scwrypts let b:scwryptsEnvs = split(system('scwrypts --list-envs'), '\n') autocmd FileType *.scwrypts let b:scwryptsEnvs = split(system('scwrypts --list-envs'), '\n')
autocmd FileType *.scwrypts let b:scwryptsEnvChoices = split(system('echo SCWRYPTS_ENV=; scwrypts --list-envs | awk "{print \"\"NR\". \"\$0}"'), '\n') autocmd FileType *.scwrypts let b:scwryptsEnvChoices = split(system('echo SCWRYPTS_ENV=; scwrypts --list-envs | awk "{print \"\"NR\". \"\$0}"'), '\n')
autocmd FileType *.scwrypts let b:executeDefault = "call ExecuteScwrypt(b:scwryptsAutoName, ' ', 'split-pane-horizontal', 'bash', '4')" autocmd FileType *.scwrypts let b:executeDefault = "call ExecuteScwrypt(b:scwryptsAutoName, ' ', 'split-pane-vertical')"
autocmd FileType *.scwrypts let b:executeInteractive = "call ExecuteScwryptInteractive(b:scwryptsAutoName, ' ', 'split-pane-horizontal')" autocmd FileType *.scwrypts let b:executeInteractive = "call ExecuteScwryptInteractive(b:scwryptsAutoName, ' ', 'split-pane-vertical')"
autocmd FileType *.scwrypts let b:executeBuild = "let $SCWRYPTS_ENV=b:scwryptsEnvs[inputlist(b:scwryptsEnvChoices) - 1]" autocmd FileType *.scwrypts let b:executeBuild = "let $SCWRYPTS_ENV=b:scwryptsEnvs[inputlist(b:scwryptsEnvChoices) - 1]"
autocmd FileType *.scwrypts let b:executeTest = "call ExecuteScwrypt(b:scwryptsAutoName, b:scwryptsPrevArgs, 'split-pane-horizontal', 'bash', '4')" autocmd FileType *.scwrypts let b:executeTest = "call ExecuteScwrypt(b:scwryptsAutoName, b:scwryptsPrevArgs, 'split-pane-vertical')"
augroup end augroup end
" }}} " }}}