For git versions that support it, the aliases will use the newer
`switch` instruction instead of `checkout` for its use cases.
Creating a new branch through `gcb` is for example done by
`git switch -c` instead of the older `git checkout -b`.
Additionally streamlined git version checking to be a little faster and
to unify its approach on posix sh, bash and zsh instead of utilizing
individual checking functions.
Added another building block program. This program will be required
going forward in other modules. `version_at_least` takes two version
numbers and returns true if the second is higher than the first.
That means primarily it is useful to check if a program fulfills a
minimum required version, e.g.: `version_at_least 2.1 $(my_program -v)`.
Will be primarily useful for git version checking in the near future.
It has a second possibility of checking for ordered version numbers
passed in but this is of less use. Check source for more information.
Timewarrior now looks for its data directory in `XDG_CONFIG_HOME`
instead of the home directory. This is a little better than nothing, but
does not separate the configuration and data files from each other yet.
Data *should* be lying in `XDG_DATA_HOME` but the data directory can not
be separated since it relies on a single env var `TIMEWARRIORDB`.
For the longest time, shell history ignore was set to the bash version
of the setting. Zsh uses both a different variable and a different
format to ignore various commands in the history.
Additionally increased the history size one order of magnitude,
so we really don't lose anything. Should still be fine for personal
computing work anyway.
Removed nagscreen informing of 2.6.0 news that would periodically tell
you about 'new' things in taskwarrior by telling it i already saw it.
Removed perviously added auto-sync function. Two reasons:
The individual additions/modifications in taskwarrior take longer if
they need to be communicated to a server at the end of every change.
And undo does not work at all if we are already syncing to a server
after every change.
That means wrong changes are also synced and become really hard to
remove again.
So, it seems easier to, for now, sync manually after some commands and
before leaving one workstation for another. Another method of auto-sync
could be implemented but I have not found an elegant way.
Moved pictures and videos back to home directory since they are, first,
not part of a 'media' collection and, second, on a different share to
my personal media assortment.
Removed the unused dunst pausing hotkey, and switched it for a search of
qutebrowser bookmarks, quickmarks, and history.
Key mapping is fn+<Search-Key> (F9 on my machine), and it will open in a
dmenu-like frame.
Results will open in the last opened browser instance, or open a new
one.
Made mail dir synchronization simpler - only a couple of important
directories will ever get synchronized to the local file system, but
still containing basically all important incoming mails.
Removed aerc and switched it for neomutt. aerc is very nice and needs
little to no configuration but neomutt is, as of this moment, just more
stable and mature. It opens quickly, never crashes, has a nice indexing
and quick e-mail handling behavior and is incredibly customizable.
Basically, once you put in some configuration effort, it is everything
aerc isn't --- and that is good, both have their reasons for existing.
It's just that mutt currently works better for me and will thus be the
e-mail reader of choice from now on.
Renamed fuzzy find functions to simpler and more logical names:
`fzf` to find and select anything recursing from current directory.
`fzfcd` to find and enter any directory recursively under current one.
`fzfhome` to locate and select anything from user's home directory.
Added shortcuts for above commands:
<space>f `fzf`
<space>c `fzfcd`
<space>F `grep` from current directory.
Added shortcuts to create and extract archives:
xx to extract selected archive.
xa to archive selected files, giving name of file under cursor.
xc to archive and compress selected files, giving name of file under
cursor.
Move ability to sync current pane to other one from mapping (c-y) to
command (`:syncme`). This is a command only used once in a while and
does not necessarily need its own full mapping. Additionally, having it
as an invocable command mirrors the built-in `:sync` command to do the
exact opposite - sync the other pane to the selected one.
Switch to fork since it's more actively developed and contains some
additional features. Primarily switched since it had quite a bit better
subtitle stream handling than the original for quite a while.
Added script to sh base package to allow checking for internet
connectivity. Checks both through system virtual filesystem and, as a
fallback, through pinging google dns.
Added a simple readme to sh module.
Fixed error in configuration file location for taskopen alias which put
the config file instead of the notes directory.
Now configuration file correctly resides in
$XDG_CONFIG_HOME/task/taskopenrc and notes dir is
$XDG_DATA_HOME/task/notes.
Notes can now correctly be created by doing `task <id> annotate Note`.
Bookmarks are already gitignored. While I don't mind the quickmarks
being public, I also don't think them being saved in this repo brings a
lot of pros - and they are massively out of date anyway.
I could think about integrating them on a private fork
https://shivering-isles.com/publish-your-work-while-keeping-a-private-fork
we will see.
Fixed script to only ask for password once before understanding that the
user does not want to provide it.
Since gpg seems to not differentiate between a *wrongly* entered
password and one entered not at all, we have to assume the user canceled
the password prompt and not bug him again until the next time the script
is invoked.
It will, however, at least notify the user that the process is aborted
in a quick notification message, so that if it was done on accident the
user will still know what's up.
Added bemenu launcher (can alternatively use dmenu) to find and
quickly open a link in the current qutebrowser instance (or a new one if
none exist). Will open it by default in a new tab or if `tab` argument
passed, if `open` option is passed it will open it in the current page
instead.
The script can be used both standalone by being invoked as `qutedmenu`,
or from qutebrowser itself, invoked from its commandline as `spawn
--userscript qutedmenu <open|tab>`.
By default uses bemenu, but if that is not found on system will
automatically switch to make use of dmenu. If you want to use rofi as
your dmenu replacement, generally I will assume it is already symlinked
to dmenu.
Added a keymapping to sxhkd `Mod-Shift-O`, which invokes it from
anywhere.
Added a general purpose languageserver to round out the language server
possibilities. For now only configured to take care of bash linting
(using shellcheck) and formatting, but can be extended to a variety of
other languages (even helping more prosaic forms like markdown and pandoc).
Added automatic proxying to floss alternative frontends for proprietary
websites like reddit (teddit), youtube (invidious), twitter (nitter),
and instagram (bibliogram).
Often does not work on calling cached websites, meaning when it does not
load the correct page a full reload (shift-R) should call up the correct
frontend on first use of a previously visited page.
Squashed commit of the following:
commit ccf5a9f9a001c466e4fe00763f561d09a598bd70
Author: Marty Oehme <marty.oehme@gmail.com>
Date: Wed Jul 28 10:05:37 2021 +0200
qutebrowser: Add LocalLeader key concept
Added differentiation between leader mappings and local leader mappings,
with a similar idea to vim:
leader mappings enact changes within qutebrowser on a more general level
(currently e.g. changing tab display, javascript switch, stylesheet
setting) while
local leader mappings enact changes or interact with the current page
context
(e.g. start mpv stream, display in readability mode, download pdf
version of page, and so on).
This will be hard for my muscle memory, but I think such a switch
benefits logical action separation in the long run, especially in case I
add more action shortcuts over time.
An interesting thing this separation also allows is a more
buffer-specific action repertoire (for example through recognition of
current page context with interceptors) so specific pages contain
different actions.
commit afbe573d527b70fa57d643ede78cd5e71f3ca4c1
Author: Marty Oehme <marty.oehme@gmail.com>
Date: Tue Jul 27 16:00:37 2021 +0200
qutebrowser: Rename key mapping file
Renamed from `keys.py` to `maps.py` to keep some coherence with nvim
naming scheme.
commit cc78cbb67953bba7ab4d5a6dd48dfa50fbcfe2fc
Author: Marty Oehme <marty.oehme@gmail.com>
Date: Tue Jul 27 10:19:34 2021 +0200
qutebrowser: Add reddit redirection
Added redirection to old.reddit whenever a link on reddit is opened.
Added redirection of youtube links to yewtu.be invidious instance.
Added lockscreen trapping and media pausing for lockscreen.
When it is invoked `lockscreen`, all media will be attempted to be pause
and the system will be muted.
Then the lockscreen is engaged.
This should happen automatically when the screen shuts off or the system
suspends or hibernates and can be invoked manually, as before, with
super+x shortcut.
Set burndown chart to only display last 3 months of tasks. I have found
this (for now) to be the best balance between getting a general sense of
overview and still having a meaningful output.
The problem with just basic `burndown` command is that, after using
taskwarrior for a while, your completed tasks *will* pile up (I think I
am at around 1000 now) and the burndown chart, showing relative balance
of completed, pending, working on, will become meaningless. It will only
ever display a large portion of green --- completed --- tasks and not
give a lot of insight.
Setting it to only 1 month back, or even just a week, can work but for
me does not present enough of a tracking overview. I want to see,
relatively, how well I am doing over the last couple of weeks instead of
just today against the days before.
This setting might still change as my needs change.
nvim: Restructure lua config directory
Restructured lua setting files, so that plugin settings are in clearly
labelled as such files, and the base files are just there --- the base
directory.
This should also lay the ground work for modularizing plugins, so that
we can enable/disable plugin groups as we need them.
----------
nvim: Remove ale linter and formatter
Removed ale from plugins.
Linting is being taken care of by lsp and treesitter plugins and
formatting by formatter.nvim.
Added all filetypes ale took care of to formatting on save.
----------
nvim: Replace wiki.vim with zettelkasten.nvim
Removed lerlvag's `wiki.vim` from plugin list.
Though I love it and loved using it, by now it clutters up the list and
the basic functionality I need it provided by zettelkasten.nvim.
(That being linking, following links, and quickly opening a central file).
I may still come back to it at some point, but for now I am happy with
the new setup.
----------
nvim: Add toggleterm and lazygit integration
Added toggleterm plugin, integrating a very quick access to the neovim
terminal (`<leader>=` mapping).
Additionally, added a command to quickly call up a lazygit floating
windows with the same plugin. `<leader>G` will open a git management
window in which you can stage, remove, commit, push, pull and more.
----------
nvim: Replace surround, sneak; Add treesitter, dial
Replaced vim-sneak with lightspeed lua plugin, which accomplishes
similar to the same goal, with a little more flexibility (can also be
used to replicate other vim plugins like e.g. easymotion).
For now I am using it as a straight replacement, with the same fF/tT
functionality stretching over multiple lines, and quick sS 2-letter
jumps to any location ahead/back.
The highlighting is noticeably more stable and faster. For now it is set
to always highlight the next 5 occurences of a letter, wherever they
are. Lastly, it does not -- so the lightspeed author -- change the
buffer in any way which is what happened with sneak (due to vimscript
limitations) and which can and did confuse things like treesitter and
the lsp integration.
Replaced vim-surround with a lua-equivalent surround.nvim. This one I am
less sure about, the lua pluging, while working, still carries some bugs
and does not seem as thoroughly tested. It still has problems with
surrounding stuff with e.g. `*` and does not deal well with some
quotation situations. I will try to keep using it and perhaps find the
time to contribute to some of the issues instead of going back at first
however, purely since I am a much bigger fan of the plugin existing in
luascript.
Replaced vim-peekaboo with registers, another switch to a lua plugin,
which also functions slightly differently however. I much prefer the lua
plugins display of register contents which simply appear as a dropdown,
compe-like, and I can either paste with the correct symbol choice as
always, or by scrolling through it as if it is an autocomplete choice.
Added dial.nvim which slightly extends the functionality of ^a and ^x
number in-/decreases. It should barely be noticeable in normal operation
but now the combination can be used to change dates, alphabet
characters, hex codes and some more. Most prominently, I am using it for
date manipulation.
Added a couple of treesitter related plugins:
treesitter-context shows the context the cursor is currently in if the
beginning of this context goes off-screen, e.g. the function beginning
or current class being edited. Works for nested contexts.
treesitter-textsubjects allows selecting units of codes by going up the
tree branches. So, first you select an argument, then the whole argument
chain, then the function definition, then the whole function, then the
containing class, and so on. It is quite natural, however, I have so far
only made it work for visual selection, so not as a motion target.
Still, very useful - works with `v.` and can be repeated with `.`.
Lastly, ts-context-commentstring improves the correct selection of
commenting type for commenting plugins (i.e. my `gcc` mapping), by
making use of treesitter where available. Can even do multi-language
files like vue, react, or tsx modules with html, css and javascript
interweaved.
----------
nvim: Add code formatter
Added code formatter in lua, right now supporting python, cpp,
javascript, lua, rust.
More can very easily be added.
I am not sure if this plugin supports the formatting of code within
snippets in another file format (lukas-reineke/format.nvim does support
this, but seems not-maintained).
----------
nvim: Add tmux, snippet completion
Added (for real this time) tmux adjacent buffer completion.
Added vsnip completion through compe: Invoke a completion (shown in
compe with snippet preview) through <cr> or <space-cr> and then use
<tab> and <s-tab> to go back and forth through the completable positions
for the respective snippet.
Many default snippets included through the community repository of
friendly-snippets.
----------
nvim: Improve compe completion, Add outline view
Added outline view to neovim, similar to the well-known vista.vim
plugin. Can be opened (and closed again) with <leader>o mapping, simply
mnemonic for 'outline'.
Added unicode symbols (invoked with '\') and tmux adjacent buffers
to compe completion sources.
----------
nvim: Add zen writing mode in lua
Switched from goyo to TrueZen.nvim in looking for a lua replacement of
zen writing modes. The F11 shortcut remains the same, additionally using
F10 shortcut to enter a less drastic minimal mode.
----------
nvim: Switch keymaps to lua format
Using cartographer to make setting keymaps easy.
----------
nvim: Add tmux Navigator lua replacement
----------
nvim: Add autopairs, zen writing lua plugins
Switch goyo and autopairs to make use of lua plugins.
Moved most of the plugin setup code from a custom and manually updated
array being called from init.lua, to their respective plugin
installations in plugins.lua (so, wherever the plugin is installed also
contains the call of the configuration code).
This should hopefully reduce duplication a little and may prepare for
the lua plugin setups to end up in plugins directory of neovim.
----------
nvim: Add lua statusline, base16, async grep
Added galaxyline in an initial iteration which is probably overloaded
but integrates well with the also moved over to lua base16 colorschemes.
For now, it is possible to, at any point, simply call the `:lua
B16theme('themename')` command to change the colorscheme of both neovim
itself and the galaxyline with it.
The statusline, as of now, includes the activated mode (of course), the
filename being edited, the edit state (whether changed from last save,
or read-only), the current git branch if any, as well as the amount of
added, modified, and deleted lines from current git commit. On the right
hand side it contains the lsp status (if connected), the amount of
errors and warnings in current file, the filetype currently recognized
for the file, as well as the usual cursor position in the window.
Added some small other things, including an asynchronous fuzzy-backed
full-text search through telescope, which should hopefully make
full-text searching much more responsive than before; updated the
version of indentline to the correct one; and disabled some unused vim
built-in plugins.
Now silently syncs in the background instead of blocking input. *May*
produce zombie processes in rare circumstances? Will need to investigate
it some more.
Behind the scenes, the shell script has been replaced by a python script
which creates a (disowned) background process which attempts the
syncing.
Changed the way to exit sxhkd chain modes. Instead of using `esc` to get
out of them, now pressing the mode key chain again will also exit out of
the mode (e.g. `alt + m` to get into `media` mode, then `alt + m` once
more to exit it).
This is done since using escape will interfere with many normal-use
scenarios while in a chain-mode, especially if those modes are intended
to be used over somewhat longer periods of time (somewhat like vim-modes
or emacs layers). The key to exit modes has now been moved to `copyright`,
so in the rather improbable case that your keyboard contains a
`copyright` key, be careful of accidentally hitting it when in an sxhkd
chain mode.
Fixed passing arguments to the sxhkd-piped script. It will pass along
any commandline arguments passed now (even `-s`, though then the script
will cease to do anything).
Improved version output of sxhkd-chain-labels a little, invoking
`sxhkd-chain-labels -v` will now show the correct configuration file and
FIFO pipe being used, as well as whether they exist on the file system.
Fixed the versioning of the script to display the correct version.
Let taskwarrior automatically sync any changed tasks whenever a process
is completed.
Will sync 'asynchronously' (start the job as a terminal background
process) and show the sync message after it is done.
Added calendar (using gsimplecal) which appears on left-clicking the
date module. Previous long date format switching has been moved to
right-click.
Under the hood, the official date module has been exchanged with a
custom script which simply replicates the functionality but allows
arbitrary commands to be executed on interactions with the module (since
it is now a script module).
Fixed bash alias loading for additional modules by loading both general
sh aliases as well as individual bash aliases.
Moved git stash push/save aliasing to split between bash/zsh shell since
zsh can check for the correct version of git to invoke push command
(only part of git since 2.13) and bash simply falls back to save.
Removed the ascii-art bar animations calculated for e.g. dunst
notifications for the controls of brightness and volume.
The dunst notifications finally have a working bar slider built into
them when invoked with the correct stack option.
Moved previous default (paper) compilation target for pandoc to its own
file (paper.latex) and saved the current default as a backup file.
This should fix some issues with compilation to PDF, especially with
vertical spacing and quotes which would fail intermittently otherwise.
Switched to a lua setup. Moved from `init.vim` to `init.lua`. Moved to a
lua-based plugin manager (packer.nvim). Moved some plugins to neovim
(i.e. lua) versions instead of vimL (notably fzf and indentLine).
Enabled lsp, treesitter and similar plugins by default.
Modularized plugins a little by invoking them in separate files.
This should provide a base to build on, and allow me to more fully
integrate lua into my workflow.
More detailed changes follow:
nvim: Replace completion-nvim with nvim-compe
Replaced completion-nvim since compe comes with more things working out
of the box (especially buffer completion and treesitter save me two
plugin installations), and seems to be overall a bit better supported.
It's fast, it works well, and I can add custom completion sources so
that should be good enough for me.
Changed around a couple of other things for lsp settings and treesitter,
and moved the files around a bit.
This is somewhat in preparation for a move to a lua-based configuration,
since I have long wanted to make the switch.
nvim: Add treesitter-enabled rainbow brackets
Added rainbow brackets to the editor, using the treesitter AST
detection. I am not sure yet if I will keep them, or if they confuse me
more than they help by coloring *everything* *everywhere* and being a
bit too much for my tired eyes.
nvim: Add vim-terminator to enable repl style dev
Added vim-terminator and included some basic keybindings. The plugin
allows sending code over to a terminal window, or repl for those
languages where it's enabled (python, R, bash somewhat).
The basic workflow for me right now is: From e.g. a python file
1. Open a repl with <leader>rr
2. Send over code with
2a. <leader>rt sending (selected part or whole of) file over
2b. <leader>rd sending (selected part or whole of) delimited area
over
A delimited area in option 2b looks for certain patterns and sends
everything up-to the next instance of that pattern.
Currently, the enabled patterns are `In[n]:` with n being a number,
emulating the way jupyter blocks are coded; and `^```` (three
back-ticks at the beginning of a line), to enable sending code fences
from (R)markdown files.
Since it uses the filetype to determine which repl/interpreter to send
code to, it is still a little unwieldy in markdown files (which in this
editor get handled as `pandoc` filetype.)
FIXME: There are two options going forward, either finding a way to
correctly identify the interpreter without filetype (should be done in
vim-terminator and seems inelegant) or correctly setting the filetype
for code fences in (R)Markdown *only* (seems more feasible and may
already be enabled in RMarkdown plugins for vim).
nvim: Fix simultaneous opening alacritty and nvim
When opening both (e.g. `alacritty -e nvim file`), neovim would open
with the wrong size (usually way smaller than the resulting terminal
size) and stay that way until you resized the terminal window.
This simply sends a 'resize' kill command to vim whenever the user
enters it to circumvent the bug until it's fixed.
nvim: Simplify lua plugin setup, Add indentLine
Added indent line plugin to show where and how indentations occur using
neovims virtual text. Can be toggled with `:IndentBlanklineToggle`.
Simplified lua setup a little by naming settings after intent instead of
per plugin -- everything lsp-y now resides in `lsp.lua`, everything
treesitter in `treesitter.lua`, everything indentation in its respective
file. Should, as long as plugins don't get too many, be perhaps a little
simpler to reason about.
nvim: Switch to packer as plugin manager
Switched to packer -- the plugins move to lua and so will I. Packer
seems basically like `vim-plug` in a dress (which is awesome, since
vim-plug is also awesome!) and it is extremely fast.
So, no real complaints but still a little switch to get that little bit
further away from vimscript.
nvim: Add telescope plugin and configuration
Added telescope as fzf replacement. Fzf served me well, but the
configuration is somewhat difficult (not least owing to the fact it's
written in vimscript), and telescope has a burgeoning ecosystem growing
around it.
I could basically drop-in replace all of my mappings and then some.
Refined some options and changed some defaults and I am fairly happy for
now.
nvim: Switch to zettelkasten plugin over wiki.vim
qute: Add gemini integration
Added simple integration for gemini. When following a link (`f` or `F`)
to a page which begins with the `gemini://` protocol, it will
automatically convert the page to html and display it instead.
qute: Update configuration structure
Moved larger setting blocks (cmd aliaes, content settings, key mappings,
url settings) into their own files.
qute: Add readability, code_select userscripts
Added userscript to invoke (python) readability mode which will render
the page in a much more nicely to read display.
Can be invoked either through `:spawn --userscript readability` or the
key combination `<leader>r`.
Added userscript to copy code snippets from websites, using the `code`
html tag. Invoked through `;c` to fit into the other extended hinting
options qutebrowser provides.
qute: Add open downloads, default download location
Added ability to open last downloads with `gD`, replaces the previous
open last download -- this one lets you select with dmenu where the old
option only opened the very last download automatically.
Set the download directory to default to XDG directory, with fallback to
`~/downloads` if the env var is not set.
qute: Set vifm filepicker
Set vifm to be the filepicker for qute. Can be used to select single or
multiple files.
Simply select the intended files in vifm and they will be passed through
to qutebrowser (and thus whatever website).
Switch the way bookmarks, quickmarks, and scrollmarks are set in
qutebrowser:
Bookmarks can be set with `~`,
Quickmarks can be set with `\`` (backtick),
Scrollmarks can be set with `m`.
This essentially changes the `\`` (backtick) and `mM` key functionality,
but retains the relative setting of quickmarks/bookmarks being on the
same key, just small and capital letter.
This has been changed since I more often need to quickly set a
scrollmark for a page than a new quick/bookmark, and to also unify the
key a little with how vim does it.
Most of the 'bookmarklet' little script invocations I have set
have been migrated away from `<leader>b` pre-mappings to `"` pre-maps:
`<leader>bw` became `"w`
`<leader>ba` became `"a`
`<leader>bg` became `"g`
`<leader>bG` became `"G`
and so on. This makes sense to me as a bigger 'mark' to jump to than a
key-chain prefixed with the leader command.
Lastly, added a key-binding for the newly addded `qr` userscript in
qute, which displays the current url as a qr-code:
`"q`
Fixed invocations of vifm only passing through the first commandline
option, now passes through everything correctly.
Also fixed silencing of the stderr, stdout redirection.
Improved the automatic directory creation somewhat:
It now looks for either a file existing there (could be a directory,
could be an actual file), or a symbolic link pointing somewhere else.
Only if none of those things are at the xdg location will it try to
create a new directory there.
Additionally, it will set the correct permissions for the whole folder
chain being created, NOT just for the last folder in the chain.
vifm: Switch to new xdg directory structure
