colors, fixes

This commit is contained in:
Yuri Zamyatin 2025-06-12 20:21:33 +00:00
parent 09ed42abc7
commit 6811313bf1
7 changed files with 74 additions and 22 deletions

View File

@ -64,7 +64,7 @@ while read -r entity; do
etype="${entity_parts[0]}"
ename="${entity_parts[1]}"
eid="${entity_parts[2]}"
[ "$etype" != "user" ] && [ "$etype" != "group" ] && echo "ERROR: bad entity type" >&2 && exit 1
[ "$etype" != "user" ] && [ "$etype" != "group" ] && echo "ERROR: bad entity type $etype" >&2 && exit 1
# every user has their own primary group with id matching uid,
# so for each entry we need a usergroup

View File

@ -0,0 +1,2 @@
vim -c 'redir > ~/tmp/vim-highlight.dump' -c 'silent! highlight' -c 'redir END' -c 'q'
echo >> ~/tmp/vim-highlight.dump

View File

@ -8,6 +8,5 @@ alias ls='ls --color=auto'
alias grep='grep --color=auto'
export EDITOR=vim
PS1='\[\033[38;2;153;136;255m\]\u@\h:\W\$\[\033[0m\]\[\e[0;91m\]${?#0}\[\e[0m\] '
PS1='\[\033[1;95m\]\u@\h:\W\$\[\033[0m\]\[\033[1;91m\]${?#0}\[\033[0m\] '

View File

@ -1,3 +1,12 @@
{{ define "fadeColor" }}
{{- $color := .color -}}
{{- $opacity := .opacity -}}
{{ $result := "" }}
{{- range $color | regexp.Replace "(..)" "$1 " | strings.TrimSpace | strings.Split " " -}}
{{- $result = printf "%s%s" $result (conv.ParseInt . 16 32 | math.Mul $opacity | math.Round | conv.ToInt | printf "%02x") -}}
{{- end -}}
{{- $result -}}
{{- end -}}
# -*- conf -*-
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
@ -55,7 +64,7 @@ urgent=yes
[scrollback]
# lines=1000
lines=10000
# multiplier=3.0
# indicator-position=relative
# indicator-format=""
@ -109,6 +118,18 @@ foreground={{ .theme.color.fg }}
# bright6=24dfc4 # bright cyan
# bright7=ffffff # bright white
regular0={{ .theme.color.bg }}
regular1=ff4d51
regular2=35d450
regular3=e9e836
regular4=5dc5f8
regular5={{ .theme.color.fg_accent }}
regular6=24dfc4
regular7={{ .theme.color.fg }}
bright0={{ .theme.color.bg }}
bright5={{ .theme.color.fg_accent }}
bright7={{ .theme.color.fg }}
## dimmed colors (see foot.ini(5) man page)
# dim0=<not set>
# ...
@ -141,9 +162,9 @@ foreground={{ .theme.color.fg }}
# selection-foreground=<inverse foreground/background>
# selection-background=<inverse foreground/background>
# jump-labels=<regular0> <regular3> # black-on-yellow
# scrollback-indicator=<regular0> <bright4> # black-on-bright-blue
# search-box-no-match=<regular0> <regular1> # black-on-red
# search-box-match=<regular0> <regular3> # black-on-yellow
scrollback-indicator={{ .theme.color.bg }} {{ template "fadeColor" (dict "color" .theme.color.fg_accent "opacity" .theme.opacity.med) }}
search-box-no-match={{ .theme.color.fg }} {{ .theme.color.bg_accent_dark }}
search-box-match={{ .theme.color.fg }} {{ .theme.color.bg_accent_dark }}
# urls=<regular3>
[csd]
@ -163,17 +184,17 @@ foreground={{ .theme.color.fg }}
[key-bindings]
# scrollback-up-page=Shift+Page_Up
# scrollback-up-half-page=none
scrollback-up-half-page=Control+Shift+u
# scrollback-up-line=none
# scrollback-down-page=Shift+Page_Down
# scrollback-down-half-page=none
scrollback-down-half-page=Control+Shift+d
# scrollback-down-line=none
# scrollback-home=none
# scrollback-end=none
clipboard-copy=Control+c XF86Copy
clipboard-paste=Control+v XF86Paste
clipboard-copy=Control+c
clipboard-paste=Control+v
# primary-paste=Shift+Insert
# search-start=Control+Shift+r
search-start=Control+Shift+slash
# font-increase=Control+plus Control+equal Control+KP_Add
# font-decrease=Control+minus Control+KP_Subtract
# font-reset=Control+0 Control+KP_0
@ -190,14 +211,14 @@ clipboard-paste=Control+v XF86Paste
# show-urls-persistent=none
# prompt-prev=Control+Shift+z
# prompt-next=Control+Shift+x
# unicode-input=Control+Shift+u
unicode-input=none
# noop=none
[search-bindings]
# cancel=Control+g Control+c Escape
# commit=Return
# find-prev=Control+r
# find-next=Control+s
cancel=Escape
commit=Return
find-prev=Control+K
find-next=Control+k
# cursor-left=Left Control+b
# cursor-left-word=Control+Left Mod1+b
# cursor-right=Right Control+f
@ -208,6 +229,8 @@ clipboard-paste=Control+v XF86Paste
# delete-prev-word=Mod1+BackSpace Control+BackSpace
# delete-next=Delete
# delete-next-word=Mod1+d Control+Delete
# delete-to-start=Control+u
delete-to-end=none
# extend-char=Shift+Right
# extend-to-word-boundary=Control+w Control+Shift+Right
# extend-to-next-whitespace=Control+Shift+w
@ -216,14 +239,13 @@ clipboard-paste=Control+v XF86Paste
# extend-backward-to-word-boundary=Control+Shift+Left
# extend-backward-to-next-whitespace=none
# extend-line-up=Shift+Up
clipboard-paste=Control+v Control+y XF86Paste
clipboard-paste=Control+v
# primary-paste=Shift+Insert
# unicode-input=none
# quit=none
# scrollback-up-page=Shift+Page_Up
# scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up
# scrollback-up-half-page=none
# scrollback-up-line=none
# scrollback-down-page=Shift+Page_Down
# scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down
# scrollback-down-half-page=none
# scrollback-down-line=none
# scrollback-home=none

View File

@ -0,0 +1,5 @@
pcsc-driver /usr/lib/libpcsclite.so
card-timeout 5
disable-ccid
allow-admin
enable-pinpad-varlen

View File

@ -46,6 +46,30 @@ set wildmenu
set wildmode=list:longest,full
set gdefault
" colors
set t_Co=16
set notermguicolors
set t_RV= " bugfix
" new
highlight LineNr ctermfg=5 ctermbg=none
autocmd VimEnter * highlight SignColumn ctermbg=none
" fg magenta (5) -> blue (4)
highlight Title term=bold ctermfg=4 gui=bold
highlight Special term=bold ctermfg=4
highlight PreProc term=underline ctermfg=4
highlight Underlined term=underline cterm=underline ctermfg=4 gui=underline
" fg blue (4 or 12) -> magenta (5)
highlight SpecialKey term=bold ctermfg=5
highlight Directory term=bold ctermfg=5
highlight Folded term=standout ctermfg=5 ctermbg=7
highlight FoldColumn term=standout ctermfg=5 ctermbg=7
highlight SignColumn term=standout ctermfg=5 ctermbg=7
highlight Comment term=bold ctermfg=5
highlight NonText term=bold ctermfg=5 gui=bold
highlight DiffDelete term=bold ctermfg=5 ctermbg=14 gui=bold
highlight Changed ctermfg=5
" bg
highlight SpellCap cterm=underline ctermfg=9 ctermbg=none gui=undercurl
"###########################################
"############## file-specific ###############

View File

@ -16,7 +16,7 @@ xkb_symbols "yurmak" {
replace key <LCTL> { [ Super_L ] };
replace key <LWIN> { [ Alt_R ] };
replace key <LALT> { [ ISO_Level3_Shift ] };
replace key <RALT> { [ ALT_L ] };
replace key <RALT> { [ Alt_L ] };
#####################################
########### characters ##############