Commit graph

105 commits

Author SHA1 Message Date
Oliver Davies 634bf71c6e Add rci abbreviation 2024-10-09 17:46:45 +01:00
Oliver Davies 0d1065e73c Use t again 2024-10-09 17:46:45 +01:00
Oliver Davies 3b0aa0aa34 Update abbreviations 2024-10-06 09:55:15 +01:00
Oliver Davies 9fbe7c1fec Revert "Remove tmux"
This reverts commit a7556575ac.
2024-09-25 21:33:55 +01:00
Oliver Davies 73a893143e Update tfw directory 2024-09-23 10:46:41 +01:00
Oliver Davies 098d714168 Use create-zellij-session 2024-09-13 20:18:20 +01:00
Oliver Davies a7556575ac Remove tmux
After using it as a daily driver from the last week or so, I'm switching
to Zellij.

https://zellij.dev
2024-09-04 08:00:59 +01:00
Oliver Davies 2d91ea65a4 Update abbreviations 2024-09-04 00:00:16 +01:00
Oliver Davies 9f4e5bebf8 Add the Zellij default configuration
Used `zellij setup --dump-config` to get the configuration and saved it
into its own file.
2024-08-29 09:44:59 +01:00
Oliver Davies 4406690f63 Set Zellij theme 2024-08-29 02:21:19 +01:00
Oliver Davies c62f741a90 Add a default directory when using yt-dlp
Always place downloaded videos in `~/Videos`.
2024-08-28 13:00:36 +01:00
Oliver Davies 7c6d68a589 zsh: add code directory to CDPATH 2024-08-28 13:00:09 +01:00
Oliver Davies 5fe35808d2 Trying out zellij 2024-08-24 23:36:39 +01:00
Oliver Davies 50fc641743 Update abbreviations 2024-08-21 09:36:15 +01:00
Oliver Davies a1c356a1f5 Update aliases, abbreviations and snippets 2024-08-21 01:12:55 +01:00
Oliver Davies ce5b4fa0a1 Create export-video-list script
Create a `export-video-list` script that exports all the video files on
my external hard drive to a JSON file so I can easily see what videos I
have without needing to get and plug in the drive.

I can easily view it using `bat` or `jq` and combine it with `grep` to
search for a specific video - e.g. `cat ~/video.json | grep -i nix`
(`-i` makes the search case-insensitive).
2024-08-20 19:48:57 +01:00
Oliver Davies b30909b32a zsh: add some suffix aliases
Aliases that run when files of a matching type are opened.

See https://youtu.be/8CZIv3MJvic?si=QVqtaCDNaygs2qaE&t=670.
2024-08-19 22:18:02 +01:00
Oliver Davies c712a1b254 Add aliases for curl
Use the cursor position to not have a trailing space after expanding the
abbreviation, making it easier to type any following characters.

See https://zsh-abbr.olets.dev/usage.html#place-the-cursor and
https://github.com/olets/zsh-abbr/discussions/97
2024-08-19 22:10:29 +01:00
Oliver Davies 5dac3f312d Add an abbreviation for C to copy to the
...clipboard using `xclip`

This also works in WSL.
2024-08-19 21:41:42 +01:00
Oliver Davies 9f860ee6f2 Experiment with pet for snippets
https://github.com/knqyf263/pet

Seen on https://youtu.be/fU8HB1cvG9w?si=-lPdL1csAB_4D6tL&t=653.
2024-08-13 18:12:59 +01:00
Oliver Davies 95f6620c47 Remove nnn 2024-08-13 12:04:43 +01:00
Oliver Davies 0acedf8bea Remove starship, atuin and wezterm 2024-08-13 12:04:40 +01:00
Oliver Davies ffc8945630 Simplify tmux configuration 2024-08-13 09:11:06 +01:00
Oliver Davies 6082de62b0 Look for .ignored/run when running commands
Make the `run` command cleverer by also searching for a `.ignored/run`
file, following the convention of always ignoring a `.ignored` directory
from Git.

This allows me to have a local `run` file that doesn't need to be
committed and pushed to the repo (e.g. it's too specific to me), and
being able to keep it outside of the root of the project directory where
it could be committed accidentally.

A similar approach was done by Andreas Möller using Makefiles in this
article:

https://localheinz.com/articles/2020/05/07/using-makefiles-in-projects-where-i-can-not-use-them

With this function, the `.ignored/run` file is executed if it's found
and exits with the status code of the command.

If not, it will fall back to using `./run` as before.

I considered reversing these and checking for `./run` first as there
could be a performance benefit but, if neither file is found, I want the
error to show `./run` and not `.ignored/run` as that's the main use
case.
2024-07-31 16:40:25 +01:00
Oliver Davies 75f983fea7 Revert "git: use difftastic"
This reverts commit c06fb20115.
2024-07-28 13:30:11 +01:00
Oliver Davies 22385b9a1c Revert "git: use difftastic by default"
This reverts commit 2fbf67507f.
2024-07-28 13:29:57 +01:00
Oliver Davies b944d20123 zsh: run zle reset-prompt in each widget
Instead of having to press the Enter key after running a widget, use
`zle reset-prompt` to reset the prompt.
2024-07-24 08:01:20 +01:00
Oliver Davies 15d6fa1aab tmux: update prefix key 2024-07-23 21:33:13 +01:00
Oliver Davies 0a28c2a5b3 zsh: open nvim with Ctrl+v 2024-07-23 20:47:53 +01:00
Oliver Davies ce9cf2ea83 Add gpl and gps abbreviations
`gpl` expands to `git pull` and `gps` expands to `git push`.
2024-07-14 10:38:24 +01:00
Oliver Davies 537eb704e7 zsh: remove zsh-auto-notify plugin
`AUTO_NOTIFY_IGNORE` keeps being reset within a tmux session, so I'm
removing this for now until I have time to investigate further and
resolve.
2024-07-11 13:14:10 +01:00
Oliver Davies d2ae9d01ee git-instafix: set a default upstream branch 2024-07-11 02:58:46 +01:00
Oliver Davies a2ed026258 Use $REPOS variable consistently in scripts 2024-07-10 13:44:09 +01:00
Oliver Davies f0e3671e1d zsh: remove unused functions 2024-07-09 14:25:41 +01:00
Oliver Davies 5bf2253f98 git: organise extraConfig values 2024-07-09 14:25:00 +01:00
Oliver Davies 2fbf67507f git: use difftastic by default
As described in
https://difftastic.wilfred.me.uk/git.html#difftastic-by-default, the
`--ext-diff` option needs to be used for difftastic to be used on
commands other than `git diff`, such as `git show` or `git log`.

> This only applies to git diff. For other git commands, you still need
to specify --ext-diff, or use an alias as described above.

```shell
$ git diff
$ git show HEAD --ext-diff
$ git log -p --ext-diff
```

> Conversely, if you need to copy/paste a diff in the standard diff
format, you can use git diff --no-ext-diff.
2024-07-09 14:15:46 +01:00
Oliver Davies c06fb20115 git: use difftastic 2024-07-09 13:53:02 +01:00
Oliver Davies 42c1bc4045 zsh: remove just override 2024-07-09 12:01:08 +01:00
Oliver Davies 0c4167a464 zsh: don't automatically source zsh plugins
It seems this is done automatically.
2024-07-08 18:46:56 +01:00
Oliver Davies d769885d8f Flatten Code directories 2024-07-06 02:21:40 +01:00
Oliver Davies 53b8745b34 Update git-instafix to 0.2.7
v0.2.6 contained fixes for trunk-based development workflows that don't
require being on a separate branch.

https://github.com/quodlibetor/git-instafix/releases/tag/v0.2.6
2024-07-06 01:38:44 +01:00
Oliver Davies 0fc3c765e5 tmux: remove padding around words in the status
...bar
2024-07-05 23:10:56 +01:00
Oliver Davies d37e30e67c git: ignore .ddev/providers 2024-07-05 15:12:06 +01:00
Oliver Davies b636f365ca tmux: remove tmuxinator 2024-07-03 09:08:47 +01:00
Oliver Davies b11055fd8e zsh: configure auto-notify ignore settings 2024-07-03 09:08:47 +01:00
Oliver Davies b68d48603e zsh: extract aliases and abbreviations into
...separate files
2024-06-30 14:22:57 +01:00
Oliver Davies 0ec273cbb4 zsh: fix gs alias for git status 2024-06-29 20:51:22 +01:00
Oliver Davies 53423ccdbf zsh: add zsh-auto-notify plugin
Shows notifications when long running tasks are completed.

See https://github.com/MichaelAquilina/zsh-auto-notify.
2024-06-29 20:47:41 +01:00
Oliver Davies 0df5f17dae zsh: migrate to zsh-abbr
Migrate from `zsh-expand` to `zsh-abbr` as it seems more performant and
isn't giving me unwanted expansions, such as when typing `run` within
this repository and it completing to something else.

Whilst Home Manager does have `programs.zsh-attr`, there isn't an option
for setting global abbreviations that expand anywhere in the command,
which I need to replace global ZSH aliases such as `G` which expands to
`| grep`.

For now, I've installed `zsh-abbr` via zplug and am creating the
`user-abbreviations` file using Home Manager where I can use `attr -g`
for global aliases.

If or when support is added for global abbreviations in Home Manager,
I'll switch to `programs.zsh-abbr.abbreviations`.

`programs.zsh.shellAliases` is still used for aliases that shouldn't
expand, whereas everything else has been moved to abbreviations.
2024-06-25 12:43:30 +01:00
Oliver Davies 3092cafb20 tmux: make the status bar transparent 2024-06-24 22:36:48 +01:00