diff --git a/config/leftwm/config.toml b/config/leftwm/config.toml index ad2e83f..4496e18 100644 --- a/config/leftwm/config.toml +++ b/config/leftwm/config.toml @@ -43,6 +43,11 @@ value = "slock" modifier = ["modkey", "Control"] key = "l" +[[keybind]] +command = "ToggleFullScreen" +modifier = ["modkey", "Shift"] +key = "f" + [[keybind]] command = "MoveToLastWorkspace" modifier = ["modkey", "Shift"] diff --git a/config/xinit_functions.sh b/config/xinit_functions.sh new file mode 100644 index 0000000..2976963 --- /dev/null +++ b/config/xinit_functions.sh @@ -0,0 +1,31 @@ +function _xinit_setup_xinput() { + if ! xinput list >/dev/null; then + return + fi + + _xinit_setup_xinput_touchpad + _xinit_setup_xinput_trackman_marble +} + +function _xinit_setup_xinput_touchpad() { + if ! xinput list-props 'Elan Touchpad' >/dev/null; then + return + fi + + xinput set-prop 'Elan Touchpad' \ + 'libinput Natural Scrolling Enabled' 1 +} + +function _xinit_setup_xinput_trackman_marble() { + if ! xinput list-props 'Logitech USB Trackball' >/dev/null; then + return + fi + + xinput set-button-map \ + 'Logitech USB Trackball' \ + 1 2 3 4 5 6 7 8 9 + xinput set-prop \ + 'Logitech USB Trackball' \ + 'libinput Scroll Method Enabled' \ + 0, 0, 1 +} diff --git a/minirc.dfl b/minirc.dfl new file mode 100644 index 0000000..2c46c23 --- /dev/null +++ b/minirc.dfl @@ -0,0 +1,7 @@ +pu baudrate 115200 +pu bits 8 +pu parity N +pu stopbits 1 +pu rtscts No +pu xonxoff No + diff --git a/vimrc b/vimrc index 52b8c34..55e3ec5 100644 --- a/vimrc +++ b/vimrc @@ -37,12 +37,13 @@ if has("persistent_undo") endif au BufRead,BufNewFile *.gcfg setfiletype gitconfig +au BufRead,BufNewFile *.hcl setfiletype hcl +au BufRead,BufNewFile *.nomad setfiletype hcl au BufRead,BufNewFile *.service setfiletype systemd au BufRead,BufNewFile .Rprofile setfiletype r au BufRead,BufNewFile .envrc setfiletype sh au BufRead,BufNewFile Dockerfile* setfiletype dockerfile au BufRead,BufNewFile Pipfile setfiletype toml -au BufRead,BufNewFile Pipfile setfiletype toml au BufWritePre *.py execute ':Black' au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 au FileType go nmap r (go-run) @@ -81,6 +82,8 @@ let g:go_highlight_function_calls = 1 let g:go_highlight_functions = 1 let g:go_highlight_operators = 1 let g:go_info_mode='gopls' +let g:html_indent_script1 = "inc" +let g:html_indent_style1 = "inc" let g:python_highlight_all = 1 let g:rustfmt_autosave = 1 let g:shfmt_extra_args = '-i 2' diff --git a/xinitrc b/xinitrc index 4d6491a..184f420 100644 --- a/xinitrc +++ b/xinitrc @@ -1,19 +1,13 @@ # vim:filetype=bash:expandtab:ts=2:sts=2 setxkbmap dvorak -function _xinit_setup_xinput() { - if ! xinput list &>/dev/null; then - return - fi - - if ! xinput list-props 'Elan Touchpad' &>/dev/null; then - return - fi - - xinput set-prop 'Elan Touchpad' \ - 'libinput Natural Scrolling Enabled' 1 -} +. ~/.config/xinit_functions.sh _xinit_setup_xinput +eval "$(ssh-agent)" + +if [ -n "${WM}" ]; then + exec "${WM}" +fi exec leftwm diff --git a/zshrc b/zshrc index a247e45..894b45f 100644 --- a/zshrc +++ b/zshrc @@ -175,26 +175,6 @@ done export GPG_TTY=$(tty) -function dump-ssh-agent() { - env | awk '/SSH/ { - sub(/=/, "=\"", $1) - sub(/$/, "\"", $1) - print "export " $1 - }' | tee ~/.ssh/agent.out -} - -function load-ssh-agent() { - source ~/.ssh/agent.out -} - -function start-ssh-agent() { - ssh-agent >~/.ssh/agent.out -} - -function setup-ssh-agent() { - start-ssh-agent && load-ssh-agent -} - function __maybesource() { if [[ -f "${1}" ]]; then if [[ "${2}" == silent ]]; then @@ -227,8 +207,6 @@ function docker-cleanup() { done } -load-ssh-agent &>/dev/null - export NVM_DIR="${HOME}/.nvm" __maybesource ~/.zshenv