default config files for vimrc and gpg-agent

diff --git a/modules/default.mk b/modules/default.mk
index 1c6fb2a6a7345f8eaff997d48f92233d8d74cd26..92c9ff9f53ed8962543a29fc1556697a9b8ad2d5 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -120,11 +120,8 @@ _hostname: ${CFGROOT}
        printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
        sed -Ei "s;^127\.0\.0\.1.*$$;&  $${hostname};" "$${CFGROOT}/etc/hosts"
 
-_timeouts: ${CFGROOT}
-       printf '%s\n' DefaultTimeoutStartSec=10s DefaultTimeoutStopSec=10s >>"${CFGROOT}/etc/systemd/system.conf"
-
-.PHONY: _systemd_timeout _pingcap
-_config: _systemd_timeout _pingcap
+.PHONY: _systemd_timeout _pingcap _files_default
+_config: _systemd_timeout _pingcap _files_default
 _systemd_timeout: ${CFGROOT}
        mkdir -p "$${CFGROOT}/etc/systemd"
        printf 'DefaultTimeout%sSec=%s\n' Start 10s Stop 10s >>"$${CFGROOT}/etc/systemd/system.conf"
@@ -132,6 +129,10 @@ _systemd_timeout: ${CFGROOT}
 _pingcap: ${CFGROOT}
        chroot "$${CFGROOT}" setcap cap_net_raw+p /usr/bin/ping
 
+_files_default: ${CFGROOT} modules/default/
+       cp -a modules/default/. "$${CFGROOT}"
+
+
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi
   ifdef wifipass

diff --git a/modules/default/etc/gnupg/gpg-agent.conf b/modules/default/etc/gnupg/gpg-agent.conf
new file mode 100644 (file)
index 0000000..85405bc
--- /dev/null
+++ b/modules/default/etc/gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+enable-ssh-support

diff --git a/modules/default/etc/vim/vimrc.local b/modules/default/etc/vim/vimrc.local
new file mode 100755 (executable)
index 0000000..521e361
--- /dev/null
+++ b/modules/default/etc/vim/vimrc.local
@@ -0,0 +1,21 @@
+filetype plugin on
+syntax on
+set noswapfile modeline number foldcolumn=1
+set rulerformat=%24(%=%l,%c\ /\ %L\ (%p%%)%)
+
+hi LineNr ctermfg=Red
+hi FoldColumn ctermbg=none
+hi Folded ctermbg=none
+
+let g:sh_fold_enabled = 7
+let g:javaScript_fold = 0
+let g:vimsyn_folding = "acefhiHlmpPrt"
+let g:did_indent_on = 1
+
+autocmd FileType html,css,c,vim set foldmethod=syntax
+
+" borrowed from vim91/syntax/json.vim
+autocmd FileType javascript,awk syn region  bracesFold start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold
+autocmd FileType javascript,awk set foldmethod=syntax
+
+autocmd BufReadPost * normal zR