From 8ad9f4a54302a7b79bdfe7de8f1fb5eefea04eab Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 15 Aug 2023 22:18:56 +1200 Subject: Revert "Remove picom (X compositor)" This reverts commit ad35987a6ce12d46aaa1cc1570c25ae6414f6f60. I needed to enable this to get transparency working for mouse-click displays in vokoscreenNG. Maybe it'll help elsewhere in ways I'd not considered. Let's give this another go. --- Makefile | 5 +++++ README.md | 1 + picom/picom.conf | 9 +++++++++ picom/xsession.d/picom.sh | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 picom/picom.conf create mode 100644 picom/xsession.d/picom.sh diff --git a/Makefile b/Makefile index 9f98ce20..374c3ed4 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ install-parcellite \ install-perlcritic \ install-perltidy \ + install-picom \ install-plenv \ install-psql \ install-pyenv \ @@ -543,6 +544,10 @@ install-perltidy: install-sh mkdir -p -- $(XDG_CONFIG_HOME)/perltidy cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc +install-picom: install-x + cp -p -- picom/picom.conf $(XDG_CONFIG_HOME) + cp -p -- picom/xsession.d/picom.sh $(HOME)/.xsession.d + install-plenv: install-sh install-cpanm cp -p -- plenv/profile.d/plenv.sh $(HOME)/.profile.d cp -p -- plenv/shrc.d/plenv.sh $(HOME)/.shrc.d diff --git a/README.md b/README.md index 0c4ee069..9f368177 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ Configuration is included for: - [Perl::Critic](http://perlcritic.com/)---static source code analysis engine for Perl - [Perl::Tidy](http://perltidy.sourceforge.net/)---reformats Perl source code +- [picom](https://github.com/yshui/picom)---compositor for X - [Readline](https://tiswww.case.edu/php/chet/readline/rltop.html)---GNU library for user input used by Bash, MySQL, and others - [Subversion](https://subversion.apache.org/)---Apache Subversion, a version diff --git a/picom/picom.conf b/picom/picom.conf new file mode 100644 index 00000000..9a2e8277 --- /dev/null +++ b/picom/picom.conf @@ -0,0 +1,9 @@ +backend = "glx"; +frame-opacity = 0.95; +glx-no-rebind-pixmap = true +inactive-dim = 0.1 +inactive-opacity = 0.95; +no-fading-openclose = true +shadow = true; +use-damage = true; +vsync = true; diff --git a/picom/xsession.d/picom.sh b/picom/xsession.d/picom.sh new file mode 100644 index 00000000..1b5807ff --- /dev/null +++ b/picom/xsession.d/picom.sh @@ -0,0 +1,2 @@ +# Start X compositor +picom & -- cgit v1.2.3 From 8a7b4a4cc9638581d1ca9240e8a44cb1df4d595e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 15 Aug 2023 22:33:32 +1200 Subject: Remove picom config for now Will see if we need to add anything later. --- Makefile | 1 - picom/picom.conf | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 picom/picom.conf diff --git a/Makefile b/Makefile index 374c3ed4..b0512962 100644 --- a/Makefile +++ b/Makefile @@ -545,7 +545,6 @@ install-perltidy: install-sh cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc install-picom: install-x - cp -p -- picom/picom.conf $(XDG_CONFIG_HOME) cp -p -- picom/xsession.d/picom.sh $(HOME)/.xsession.d install-plenv: install-sh install-cpanm diff --git a/picom/picom.conf b/picom/picom.conf deleted file mode 100644 index 9a2e8277..00000000 --- a/picom/picom.conf +++ /dev/null @@ -1,9 +0,0 @@ -backend = "glx"; -frame-opacity = 0.95; -glx-no-rebind-pixmap = true -inactive-dim = 0.1 -inactive-opacity = 0.95; -no-fading-openclose = true -shadow = true; -use-damage = true; -vsync = true; -- cgit v1.2.3 From 85bfc99d15f2b27319c580d85119220ed1aa2326 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 10 Oct 2023 14:22:24 +1300 Subject: Update comment on vimrc mapping --- vim/vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index d32b437b..ca0d9952 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1016,9 +1016,9 @@ endif " many of these. " -" Use backspace as an even quicker way to switch to the current buffer's -" alternate buffer. User nickspoons of #vim was incredulous that I had never -" used CTRL-^ and indeed did not know about it. I have since repented. +" I use Mosh (the mobile shell) a lot, which uses CTRL-^ as its escape key. +" That shadows Vim's shortcut to switch to the alternate buffer. Map +" to do that instead. " nnoremap \ -- cgit v1.2.3 From 7dccf412e5144f1cd6370cc409126769eb956f84 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 13 Nov 2023 11:54:07 +1300 Subject: Remove picom completely Slows down OpenTTD. Non-negotiable! I'll just start it when I actually need it for e.g. vokoscreeNG. --- Makefile | 4 ---- README.md | 1 - picom/xsession.d/picom.sh | 2 -- 3 files changed, 7 deletions(-) delete mode 100644 picom/xsession.d/picom.sh diff --git a/Makefile b/Makefile index b0512962..9f98ce20 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,6 @@ install-parcellite \ install-perlcritic \ install-perltidy \ - install-picom \ install-plenv \ install-psql \ install-pyenv \ @@ -544,9 +543,6 @@ install-perltidy: install-sh mkdir -p -- $(XDG_CONFIG_HOME)/perltidy cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc -install-picom: install-x - cp -p -- picom/xsession.d/picom.sh $(HOME)/.xsession.d - install-plenv: install-sh install-cpanm cp -p -- plenv/profile.d/plenv.sh $(HOME)/.profile.d cp -p -- plenv/shrc.d/plenv.sh $(HOME)/.shrc.d diff --git a/README.md b/README.md index 9f368177..0c4ee069 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,6 @@ Configuration is included for: - [Perl::Critic](http://perlcritic.com/)---static source code analysis engine for Perl - [Perl::Tidy](http://perltidy.sourceforge.net/)---reformats Perl source code -- [picom](https://github.com/yshui/picom)---compositor for X - [Readline](https://tiswww.case.edu/php/chet/readline/rltop.html)---GNU library for user input used by Bash, MySQL, and others - [Subversion](https://subversion.apache.org/)---Apache Subversion, a version diff --git a/picom/xsession.d/picom.sh b/picom/xsession.d/picom.sh deleted file mode 100644 index 1b5807ff..00000000 --- a/picom/xsession.d/picom.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Start X compositor -picom & -- cgit v1.2.3 From 9ca502c802dc5399e5c0e25b73dbcf83eb671064 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 22 Dec 2023 17:26:24 +1300 Subject: Remove sudo wrapper forcing -H/--set-home --- README.md | 2 -- sh/shrc.d/sudo.sh | 8 -------- 2 files changed, 10 deletions(-) delete mode 100644 sh/shrc.d/sudo.sh diff --git a/README.md b/README.md index 0c4ee069..6861776a 100644 --- a/README.md +++ b/README.md @@ -240,8 +240,6 @@ in `sh/shrc.d` to be loaded by any POSIX interactive shell. Those include: - `ll()` runs `ls -Al` if it can, or `ls -al` otherwise. - `path()` manages the contents of `PATH` conveniently. - `scp()` tries to detect forgotten hostnames in `scp(1)` command calls. -- `sudo()` forces `-H` for `sudo(8)` calls so that `$HOME` is never preserved; - I hate having `root`-owned files in my home directory. - `tor()` is just a terse shortcut for using Torsocks to anonymize TCP connections from the current shell. - `tree()` colorizes GNU `tree(1)` output if possible (without having diff --git a/sh/shrc.d/sudo.sh b/sh/shrc.d/sudo.sh deleted file mode 100644 index d9e30bc4..00000000 --- a/sh/shrc.d/sudo.sh +++ /dev/null @@ -1,8 +0,0 @@ -# Add the -H parameter to sudo(8) calls, always use the target user's $HOME -sudo() { - case $1 in - -v) ;; - *) set -- -H "$@" ;; - esac - command sudo "$@" -} -- cgit v1.2.3 From 71734780fa772b4610f6e491e00e0b86212a7f4f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 11 Jan 2024 21:09:01 +1300 Subject: Update flavor comment for stub vimrc --- vim/vimrc.stub | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vim/vimrc.stub b/vim/vimrc.stub index 92c53dfb..2acd2d10 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -13,13 +13,13 @@ if !&compatible && !exists('$POSIXLY_CORRECT') endif " If we got this far, it means we're running a tiny, 'compatible', and/or -" ancient version of Vim. -" -" So, strip out the user runtime directories from 'runtimepath', force -" 'compatible' on, source your trusty '~/.exrc', put on your dubbed cassette -" copy of Kraftwerk's 'Computerwelt', and start using vi v3.7 on your -" engineering department's Sun OS 4.x server via your VT220 terminal. It's -" July 1985, you write K&R C, and it's good for you, like raisin bran. +" ancient version of Vim. So: strip out the user runtime dirs from +" 'runtimepath', force 'compatible' on, :source your trusty ~/.exrc, put on +" your dubbed cassette copy of Kraftwerk's 'Computerwelt', and start using vi +" v3.7 on your engineering department's SunOS 2.0 server via your shiny new +" VT220 terminal. It's December 1985, and you're going home soon for the +" holidays. You're writing K&R C tonight. It's good for you, like raisin +" bran. " set runtimepath-=~/.vim set runtimepath-=~/.vim/after -- cgit v1.2.3 From b9327207274ef48b3534e4b0bffe04ee372b9417 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 13 Jan 2024 00:33:47 +1300 Subject: Prevent loading the manpager plugin --- vim/after/plugin/dist.vim | 1 + vim/plugin/dist.vim | 2 ++ 2 files changed, 3 insertions(+) diff --git a/vim/after/plugin/dist.vim b/vim/after/plugin/dist.vim index 98574de8..c53ebd2c 100644 --- a/vim/after/plugin/dist.vim +++ b/vim/after/plugin/dist.vim @@ -7,3 +7,4 @@ unlet loaded_rrhelper unlet loaded_spellfile_plugin unlet loaded_tarPlugin unlet loaded_zipPlugin +unlet loaded_manpager_plugin diff --git a/vim/plugin/dist.vim b/vim/plugin/dist.vim index 3a84abaa..94974f5f 100644 --- a/vim/plugin/dist.vim +++ b/vim/plugin/dist.vim @@ -14,3 +14,5 @@ let loaded_netrwPlugin = 1 let loaded_rrhelper = 1 " I don't need extra spelling files let loaded_spellfile_plugin = 1 +" No thanks, just plain `less` is fine for manual pages +let loaded_manpager_plugin = 1 -- cgit v1.2.3 From ca78850b7298cf7af18d7d103a1302b47ca45ecc Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 13 Jan 2024 00:34:25 +1300 Subject: Set 'cdhome' if it exists --- vim/vimrc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index ca0d9952..3b6b8671 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -556,6 +556,14 @@ if exists('+breakindent') set breakindent endif +" I use `cd` with no argument to go $HOME in the shell all the time. +" Analogous behavior for Vim with :cd makes sense to me. I can use :pwd (or +" my g mapping) if I want to see where I am. +" +if exists('+cdhome') + set cdhome +endif + " Rather than rejecting operations like :write or :saveas when 'readonly' is " set or in other situations in which data might be lost, Vim should give me " a prompt to allow me to confirm that I know what I'm doing. -- cgit v1.2.3 From b96c7d23fbd5de3ada235606c170cbf99bb0cd0a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 13 Jan 2024 00:34:38 +1300 Subject: Set 'smoothscroll' if it exists --- vim/vimrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 3b6b8671..b5f9870b 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -806,6 +806,15 @@ set noshowcmd " set shortmess+=I +" Scrolling by screen line rather than file line makes sense to me. Turn the +" option to do so on, if it's there. This only works with mouse scrolling, +" which I don't use, and with CTRL-E, CTRL-Y, which I should be using more +" anyway. +" +if exists('+smoothscroll') + set smoothscroll +endif + " I find the defaults of new windows opening above or to the left of the " previous window too jarring, because I'm used to both the i3 window manager " and the tmux terminal multiplexer doing it the other way around, in reading -- cgit v1.2.3 From e2e09d2540b2039323f6a97ef4b137b0b306c944 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 14 Jan 2024 16:07:14 +1300 Subject: Update date in vimrc --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index b5f9870b..66c1c68f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ " Tom Ryder (tejr)'s Literate Vimrc " ----------------------------------- " -" Last updated: Fri, 06 May 2022 12:23:48 +0000 +" Last updated: Sun, 14 Jan 2024 03:06:40 +0000 " " > And I was lifted up in heart, and thought " > Of all my late-shown prowess in the lists, -- cgit v1.2.3