diff options
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | compton/xsession.d/compton.sh | 2 | ||||
-rw-r--r-- | dunst/xsession.d/dunst.sh | 2 | ||||
-rw-r--r-- | finger/plan | 2 | ||||
-rw-r--r-- | vim/filetype.vim | 113 | ||||
-rw-r--r-- | x/xsession.sh | 33 |
7 files changed, 96 insertions, 68 deletions
@@ -11,11 +11,9 @@ install-bin-man \ install-cabal \ install-cargo \ - install-compton \ install-cpanm \ install-curl \ install-dillo \ - install-dunst \ install-emacs \ install-ex \ install-finger \ @@ -410,9 +408,6 @@ install-cabal: install-cargo: cp -p -- cargo/profile.d/*.sh $(HOME)/.profile.d -install-compton: install-x - cp -p -- compton/xsession.d/* $(HOME)/.xsession.d - install-cpanm: cp -p -- cpanm/profile.d/*.sh $(HOME)/.profile.d @@ -423,9 +418,6 @@ install-dillo: dillo/dillorc install-x mkdir -p -- $(HOME)/.dillo cp -p -- dillo/dillorc $(HOME)/.dillo/dillorc -install-dunst: install-x - cp -p -- dunst/xsession.d/* $(HOME)/.xsession.d - install-emacs: emacs/bin/emacsm install-sh mkdir -p -- $(HOME)/.local/bin cp -p -- emacs/emacs $(HOME)/.emacs @@ -1,2 +1,2 @@ -tejr dotfiles v12.7.0 -Fri, 27 May 2022 04:07:18 +0000 +tejr dotfiles v12.8.0 +Sun, 26 Jun 2022 21:26:54 +0000 diff --git a/compton/xsession.d/compton.sh b/compton/xsession.d/compton.sh deleted file mode 100644 index f579eac1..00000000 --- a/compton/xsession.d/compton.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Start compton(1) -compton -b diff --git a/dunst/xsession.d/dunst.sh b/dunst/xsession.d/dunst.sh deleted file mode 100644 index 6aad0c86..00000000 --- a/dunst/xsession.d/dunst.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Start dunst(1) to display libnotify messages -dunst & diff --git a/finger/plan b/finger/plan index b4562cd8..ec8a1d3d 100644 --- a/finger/plan +++ b/finger/plan @@ -1,3 +1,3 @@ > I am his Highness' dog at Kew. > Pray tell me, Sir: whose dog are you? - -- Pope + ---Pope diff --git a/vim/filetype.vim b/vim/filetype.vim index 60221c83..accbe20b 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -24,6 +24,7 @@ augroup filetypedetect " Apache config autocmd BufNewFile,BufRead \ .htaccess + \,htaccess \,*/apache*/?*.conf \ setfiletype apache " Assembly language files @@ -67,6 +68,15 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.csv \ setfiletype csv + " Debian package sources + autocmd BufNewFile,BufRead + \ sources.list + \,*/etc/apt/sources.list.d/*.list + \ setfiletype debsources + autocmd BufNewFile,BufRead + \ ?*.desktop + \,?*.directory + \ setfiletype desktop " Diff and patch files autocmd BufNewFile,BufRead \ ?*.diff @@ -76,6 +86,7 @@ augroup filetypedetect " INI format files autocmd BufNewFile,BufRead \ ?*.ini + \,.editorconfig \,perlcriticrc \,.perlcriticrc \ setfiletype dosini @@ -95,11 +106,18 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ .gdbinit \ setfiletype gdb + " Gemini markup + autocmd BufNewFile,BufRead + \ *.gmi + \,*.gemini + \ setfiletype gemtext " Git commit messages autocmd BufNewFile,BufRead \ COMMIT_EDITMSG + \,EDIT_DESCRIPTION \,MERGE_MSG \,TAG_EDITMSG + \,NOTES_EDITMSG \ setfiletype gitcommit " Git config files autocmd BufNewFile,BufRead @@ -107,7 +125,7 @@ augroup filetypedetect \,.gitconfig \,.gitmodules \,gitconfig - \,~/.config/git/config + \,*/.config/git/config \ setfiletype gitconfig " Git rebase manifests autocmd BufNewFile,BufRead @@ -124,24 +142,23 @@ augroup filetypedetect \ setfiletype go " UNIX group file autocmd BufNewFile,BufRead - \ /etc/group - \,/etc/group- - \,/etc/group.edit - \,/etc/gshadow - \,/etc/gshadow- - \,/etc/gshadow.edit + \ */etc/group + \,*/etc/group- + \,*/etc/group.edit + \,*/etc/gshadow + \,*/etc/gshadow- + \,*/etc/gshadow.edit \ setfiletype group " GTK settings files autocmd BufNewFile,BufRead - \ .gktrc*, + \ .gktrc* \,gktrc* \ setfiletype gtkrc " Vim help files autocmd BufNewFile,BufRead - \ ~/.vim/doc/?*.txt + \ */*.vim/doc/?*.txt \,*/vim-*/doc/?*.txt \,*/vim/*/doc/?*.txt - \,*/*.vim/doc/?*.txt \,$VIMRUNTIME/doc/?*.txt \ setfiletype help " HTML files @@ -151,7 +168,7 @@ augroup filetypedetect \ setfiletype html " hosts(5) file autocmd BufNewFile,BufRead - \ /etc/hosts + \ */etc/hosts \ setfiletype hostconf " inittab(5) files autocmd BufNewFile,BufRead @@ -191,10 +208,19 @@ augroup filetypedetect \,.emacs \,emacs \ setfiletype lisp + " Login configuration + autocmd BufNewFile,BufRead + \ */etc/login.defs + \ setf logindefs " Lua files autocmd BufNewFile,BufRead \ ?*.lua \ setfiletype lua + " Lynx configuration + au BufNewFile,BufRead + \ lynx.cfg + \,.lynxrc + \ setfiletype lynx " m4 files autocmd BufNewFile,BufRead \ ?*.m4 @@ -224,6 +250,16 @@ augroup filetypedetect \ ?*.markdown \,?*.md \ setfiletype markdown + " Meson configuration + autocmd BufNewFile,BufRead + \ meson.build + \,meson_options.txt + \ setfiletype meson + " SNMP MIB files + autocmd BufNewFile,BufRead + \ *.mib + \,*.my + \ setfiletype mib " Mutt configuration files autocmd BufNewFile,BufRead \ Muttrc @@ -231,7 +267,7 @@ augroup filetypedetect \,*/muttrc.d/?*.rc \,.muttrc \,muttrc - \,/etc/Muttrc.d/* + \,*/etc/Muttrc.d/* \ setfiletype muttrc " BIND configuration file autocmd BufNewFile,BufRead @@ -257,12 +293,12 @@ augroup filetypedetect \ setfiletype nroff " UNIX password and shadow files autocmd BufNewFile,BufRead - \ /etc/passwd - \,/etc/passwd- - \,/etc/passwd.edit - \,/etc/shadow - \,/etc/shadow- - \,/etc/shadow.edit + \ */etc/passwd + \,*/etc/passwd- + \,*/etc/passwd.edit + \,*/etc/shadow + \,*/etc/shadow- + \,*/etc/shadow.edit \ setfiletype passwd " Packet capture files autocmd BufNewFile,BufRead @@ -300,6 +336,9 @@ augroup filetypedetect " Python files autocmd BufNewFile,BufRead \ ?*.py + \,?*.pyw + \,?*.pythonstartup + \,?*.pythonrc \ setfiletype python " Readline configuration file autocmd BufNewFile,BufRead @@ -328,13 +367,19 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ smb.conf \ setfiletype samba + " Scheme + au BufNewFile,BufRead + \ ?*.scm + \,*.ss + \,*.sld + \ setfiletype scheme " sed files autocmd BufNewFile,BufRead \ ?*.sed \ setfiletype sed " Services files autocmd BufNewFile,BufRead - \ /etc/services + \ */etc/services \ setfiletype services " Bash shell autocmd BufNewFile,BufRead @@ -369,7 +414,7 @@ augroup filetypedetect \,.xinitrc \,.xsession \,.xsessionrc - \,/etc/default/* + \,*/etc/default/* \,configure \,profile \,shinit @@ -377,9 +422,9 @@ augroup filetypedetect \,xinitrc \,xsession \,xsessionrc - \,/etc/X11/xinit - \,/etc/X11/Xreset - \,/etc/X11/Xsession + \,*/etc/X11/xinit + \,*/etc/X11/Xreset + \,*/etc/X11/Xsession \ let b:is_posix = 1 \|setfiletype sh " SQL @@ -394,19 +439,19 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ sudoers \,sudoers.tmp - \ setfiletype sshdconfig + \ setfiletype sudoers " OpenSSH server configuration autocmd BufNewFile,BufRead \ sshd_config - \ setfiletype sudoers + \ setfiletype sshdconfig " Subversion commit autocmd BufNewFile,BufRead \ svn-commit*.tmp \ setfiletype svn " sysctl configuration files autocmd BufNewFile,BufRead - \ /etc/sysctl.conf - \,/etc/sysctl.d/*.conf + \ */etc/sysctl.conf + \,*/etc/sysctl.d/*.conf \ setfiletype sysctl " Systemd unit files autocmd BufNewFile,BufRead @@ -434,6 +479,10 @@ augroup filetypedetect \ .tmux.conf \,tmux.conf \ setfiletype tmux + " TOML configuration files + autocmd BufNewFile,BufRead + \ ?*.toml + \ setfiletype toml " Tab-separated (TSV) files autocmd BufNewFile,BufRead \ ?*.tsv @@ -514,8 +563,8 @@ augroup filetypedetect " Clumsy attempt at typing files in `sudo -e` if a filename hasn't already " been found autocmd BufNewFile,BufRead - \ /var/tmp/?*????????.* - \,/var/tmp/?*.???????? + \ */var/tmp/?*????????.* + \,*/var/tmp/?*.???????? \ if !did_filetype() \| call filetype#repeat#Sudo() \|endif @@ -526,14 +575,14 @@ augroup filetypedetect \,?*.txt \,INSTALL \,README - \,/etc/issue - \,/etc/motd + \,*/etc/issue + \,*/etc/motd \ setfiletype text autocmd BufNewFile,BufRead \ ?*.cfg \,?*.conf \,?*.config - \,/etc/* + \,*/etc/* \ setfiletype conf autocmd BufNewFile,BufRead \ */log/* diff --git a/x/xsession.sh b/x/xsession.sh index 3475c0bd..483707e6 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -1,5 +1,9 @@ # Custom X session to fit into Debian's way of doing things +# Update browser, since .profile set this to a curses browser on login +# shellcheck disable=SC2034 +BROWSER=x-www-browser + # Monitor and wallpaper setup is very machine-specific, and isn't versioned in # here. Neither xrandr(1) nor xwallpaper(1) have config files, so we fake it # with xargs and looking for a file with argument tokens to read in @@ -8,25 +12,10 @@ # - ~/.config/xrandr/config # - ~/.config/xwallpaper/config # -# We wait for the monitor setup to finish before proceeding, but we can do -# other things while we wait for the wallpaper to be drawn thereon. -# xargs xrandr \ < "${XDG_CONFIG_HOME:-"$HOME"/.config}"/xrandr/config xargs xwallpaper \ - < "${XDG_CONFIG_HOME:-"$HOME"/.config}"/xwallpaper/config & - -# Set a few keyboard map options: -# -# - Remap Caps Lock as another Control key. -# - Remap right Alt as a Compose key. -# - Kill X server with Ctrl+Alt+Backspace. -# -setxkbmap \ - -option caps:ctrl_modifier \ - -option compose:ralt \ - -option terminate:ctrl_alt_bksp \ - & + < "${XDG_CONFIG_HOME:-"$HOME"/.config}"/xwallpaper/config # Set a few X user preferences: # @@ -39,12 +28,14 @@ xset \ b off \ -dpms \ mouse 5/2 0 \ - s off \ - & + s off -# Update browser, since .profile set this to a curses browser on login -# shellcheck disable=SC2034 -BROWSER=x-www-browser +# Start a couple of daemons if we can; it's OK if they don't exist, but log +# the failed attempt to start them to the errors file. +## compton: Display compositor +compton -b & +## dunst: Message display (libnotify) +dunst & # Load all supplementary scripts in ~/.xsession.d for sh in "$HOME"/.xsession.d/*.sh ; do |