Commit Graph

580 Commits

Author SHA1 Message Date
32416deedd zsh:alias: Add git-ancestor and git-base-branch 2021-05-15 22:12:50 +02:00
4f70d7f32f zsh:glog: Show pgp key instead of fingerprint
Also display a status: (From `git-show` manpage)
```
"G" for a good (valid) signature,
"B" for a bad signature,
"U" for a good signature with unknown validity,
"X" for a good signature that has expired,
"Y" for a good signature made by an expired key,
"R" for a good signature made by a revoked key,
"E" if the signature cannot be checked (e.g. missing key) and
"N" for no signature
```
2021-05-15 04:06:22 +02:00
00da37623a zsh:funcs:git-checkout-worktree: Remove -p flag
As under OSX the -p flag does not exist, it seems safer to just use
`mktemp -d` and create the worktree under that directory.
This just has the disadvantage of one more dir to display in the `PWD`.
2021-05-15 04:06:14 +02:00
6e89def392 zsh:autload: Add gstash to display git stashes
Add gstash as a copy of glog with very slight modifications.
(Exchange `git log` with `git stash list` and remove the `--graph` flag)
2021-05-15 04:06:09 +02:00
492c29c096 git:functions: Remove old unused nemo wrapper 2021-05-10 17:30:46 +02:00
4053920f53 git:completion: Fix command not found error
_git has to be loaded before other functions can use its completion
functions.

Hint to this found at: https://unix.stackexchange.com/a/269818
2021-05-10 17:28:22 +02:00
b82a9d2221 git:completion: Add git-checkout-worktree 2021-05-10 17:27:54 +02:00
1d8f21b565 zsh:functions: Add git-checkout-worktree 2021-05-10 16:12:23 +02:00
7090f55653 zsh:alias: Add -j flag per default to make 2021-05-04 10:43:19 +02:00
c93d36677b zsh:glog: Handle missing commands and OS X
As the commit hash is now potentially printed (when no clipboard tool is
available), the copy-command needed to be executed not silent.
2021-04-30 11:48:09 +02:00
1b17c35f4b zsh: Add zlogout to kill ssh-agent
On system where my dotfiles are only partially installed (e.g. only
the shell) for the environment variables defined in the zprofile to take
affect, every terminal instance needs to execute zsh a login-shell.
This lead to numerous instances of the ssh-agent that were not killed
when exiting the shell. As I still need the correct env-vars like
SSH_AGENT_PID in every shell I cannot just pgrep and execute the agent
respectively.

This adds a zlogout that kills the agent spawned in the current shell.
It also stops `exec`ing `startx` as then the zlogout is not read.
2021-04-12 21:01:31 +02:00
fd2c3f611b fzf: Ignore node_modules also without rg 2021-04-12 21:01:30 +02:00
74e7cdef30 zsh:alias: Check for MACOS in clipboard aliases
Also check for the existence of perl before baking it into the alias.
2021-04-04 10:53:41 +02:00
7d085eedd0 zsh,X11: Move ssh-agent from xinitrc to zprofile
As I also want the ssh-agent to run without X.
2021-04-04 10:52:51 +02:00
d52afbfa3c zsh:completion: Add completion for glog 2021-03-11 01:26:59 +01:00
ed55fc14dc zsh:zprofile: Add /Library/Apple/usr/bin to PATH
When under macos add /Library/Apple/usr/bin to the PATH.
2021-03-10 13:50:05 +01:00
c09033ed21 zsh:zprofile: Add /usr/local/bin to PATH 2021-03-10 13:43:11 +01:00
abd26352d4 zsh:ls-show-hidden: Use coreutils ls under darwin 2021-03-10 13:37:32 +01:00
17ef6a23e5 zsh:functions:nvim-man: Use portable flag for man
The macos version of man does not have the long versions of the flags.
2021-03-10 13:35:33 +01:00
48dc9ca561 zsh:keys:cmd-on-enter: Add reset on other command
If a command is normally executed CMD_ON_ENTER is reseted to `ls`.
Otherwise problems can occur when for example switching the directory to
a non-repo when CMD_ON_ENTER contains `gs`.
2021-03-09 15:47:09 +01:00
93225e2d66 zsh:keys:cmd-on-enter: Cycle between ls & gs too 2021-03-08 01:10:09 +01:00
f0ebab3ca2 repo: Update submodules 2021-03-08 01:05:32 +01:00
7008284a5f zsh:zshenv: Fix typo 2021-02-26 12:26:57 +01:00
e71150fa5e repo: Add locale configuration 2021-02-17 03:03:25 +01:00
754adc9cf7 zsh:fzf-tab: Limit dir previews to a depth of 3
Otherwise this is way to performance heavy in large directories.
2021-02-17 02:56:08 +01:00
fa9e8da091 zsh:glog: Show also commit stats in preview 2021-02-17 02:39:59 +01:00
965e725bc2 zsh:alias: Use nvim in vimdiff alias 2021-01-27 02:10:24 +01:00
bd1e968f6f zsh:funcs:cd: Recognize ls suffix in paths 2021-01-25 10:20:55 +01:00
9f616bace6 zsh:glog: Disable echo's backslash interpretation
With it allowed it breaks the preview and copy of commits that contains
such sequences.
2021-01-15 13:40:29 +01:00
1cbf572d42 zsh:p10k: Recognize protonvpn as vpn 2021-01-15 12:41:09 +01:00
5c95111b0f zsh:func:nvim-man: Fail if no manpage found 2021-01-15 12:39:47 +01:00
555e983d1f zsh: Fix truncation of history by bash
As bash uses some environment variables with the same name as zsh it
uses the same history file and potentially truncates it, when there is
no bashrc.
2021-01-07 09:49:37 +01:00
2c30d57573 zsh:keys: Fix fzf abort check
The file should be opened if fzf returned something not the other way
around. This probably happened in the last refactoring session before
committing.
2021-01-05 22:07:07 +01:00
d0cd6ffef0 zsh: Move man wrapper into function for completion 2021-01-04 16:34:16 +01:00
ec2b7d58ed zsh:keys: Simulate <leader>f from vim config 2021-01-03 22:33:23 +01:00
5c91bc23a2 zsh:keys: Increase KEYTIMEOUT a bit 2021-01-02 00:40:01 +01:00
e4677c2626 zsh:completion: Fix completion of ls, git-checkout 2020-12-28 03:17:38 +01:00
ebea6a8a80 zsh: Add WIP fzf-tab configuration adding previews 2020-12-28 03:11:20 +01:00
2b64781000 zsh:alias: Use nvim's Man function instead of pipe
Just setting neovim as the `MANPAGER` practically results in a pipe.
The problem with this is that `man` puts hard line breaks into the text
depending on the current window width. When the width changes afterwards
the input naturally doesn't change.
When using neovim's `Man` function this is resolved.
2020-12-28 03:01:35 +01:00
a440e8b61e zsh: Use dictionary for command existence check
Use the `commands` dictionary from zsh instead of always calling
`command`.

Regex used:
s/command -v \([^ ]*\) &>\/dev\/null/(( $+commands[\1] ))/g
2020-12-28 02:58:46 +01:00
03564cf46f zsh:options: Add new options 2020-12-23 20:10:21 +01:00
fd06f73e01 zsh:options: Add line long group separators 2020-12-23 20:09:16 +01:00
6e29b8b51a vim:crypt-umount(): Continue if already unmounted 2020-12-23 19:53:28 +01:00
ba2e85c988 zsh:options: Reformat
Sort by groups as in zshoptions(1) and keep the full description of the
option above the `setopt` so that the lines remain under the max width.
2020-12-23 16:20:21 +01:00
914e8a1992 repo: Update submodules & cleanup gitmodules
Update all submodules to the newest commit.
Change submodule names in `.gitmodules` from local path to repo names.
Sort and group `.gitmodules` by program that uses it.
Remove the clone of 'fzf-tab' as my pull request got merged.
2020-12-22 16:22:33 +01:00
a9e2e5b847 vim:alias: Vim related aliases + ^Z, fg workflow 2020-12-19 03:01:46 +01:00
5b5fc5eefa zsh:alias: Remove Ubuntu update alias 2020-12-19 02:58:55 +01:00
5cf0f7fdf2 zsh: More XDG! 2020-12-19 02:57:45 +01:00
26ef592129 zsh:glog: Add --stat preview 2020-12-19 02:31:52 +01:00
10ef02c421 zsh:glog: Support arguments
Arguments given to `glog` are directly passed to the `git log` call that
populates the commit list. Useful for example for specifying the
commit/branch.
2020-12-19 02:29:51 +01:00