Commit Graph

1668 Commits

Author SHA1 Message Date
57f89d34dc zsh:z{profile,logout}: Kill only 'own' ssh-agent
Kill the ssh-agent only if it was created in this session.

Like that the login shell can inherit SSH_AGENT_PID without it killing
the agent at the end. For this to work properly it is important that
LAUNCHED_SSH_AGENT is not exported, otherwise nested login shells will
mess with each other.
2021-06-15 13:19:29 +02:00
b368b20dee zsh:zprofile: Only start one ssh-agent per session
Also check if ssh-agent is available before launching.
2021-06-15 13:05:36 +02:00
b0db2b22a1 zsh:zprofile: Create GNUPGHOME if nonexistent
`gpg` complains otherwise and falls back to `$HOME/.gnupg`.
2021-06-15 13:04:37 +02:00
f6740f9ea0 gnupg:gpg-agent: Use pinentry-curses 2021-06-04 11:57:01 +02:00
ec0e23d07b gnupg: Add gpg-agent configuration stub 2021-06-04 11:55:46 +02:00
5ab5a49793 zsh:stderred.theme: Use escape-sequences w/o tput 2021-06-01 22:36:59 +02:00
3db2c2a87e zsh:g{log,stash}: Drop tput for stty for size
As stty is part of POSIX and thus better available.
2021-06-01 22:10:39 +02:00
6856c2d27e zsh:options: Do not unset CASE_GLOB on android
Do not unset CHASE_GLOB under android as then globbing with absolute
paths breaks as the PWD is often in a path with subdirectories that are
owned by root and not world-readable (e.g. /data/data/).
I *believe* this is the reason for it.
2021-06-01 21:39:49 +02:00
58cdbb6652 locale: Skip conf if locale is not available 2021-06-01 18:12:05 +02:00
db6303aa51 zsh:funcs:g-ch-worktree: Restart on issues
Restart the subshell until every issue is resolved and the worktree is
removed.
2021-05-31 23:17:47 +02:00
ca219a3a1d vim:keybindings: Add <leader>cd - cd to git root 2021-05-22 19:13:36 +02:00
af30da1b3b vim:plugins: Add vim-fugitive 2021-05-22 19:05:08 +02:00
28385a0a1e vim: Set termdebug_wide 2021-05-21 10:18:02 +02:00
06d37a273c git:pull: Use fast-forward only
If I cannot fast-forward I want to stop and think about how I want to
continue (merge or rebase).
2021-05-16 00:51:29 +02:00
44ef15d8ab zsh:autoload:glog,gstash: Drop trailing \n on copy 2021-05-16 00:48:24 +02:00
8af0b5c79a zsh:autoload:glog,gstash: Get rid of redundancy 2021-05-16 00:09:53 +02:00
d0aee7e638 zsh:alias:git-base-branch: Fix small pattern error
In place of the in ed215a35f7 introduced
second bracket can also stand `~` or `^`.
Otherwise something like `[feature^] or [feature~2]` is not thrown out.
2021-05-16 00:04:46 +02:00
c1955dd5f5 zsh:alias:git-base-branch: Match merge commits too
Merge commits should also be matched (indicated by a '-') for the case
that the base branches last commit is a merge commit and another branch
exists that checked out the newest commit that was merged.

Example log (from `glog`):
```
* abcdef Foo (HEAD -> feature)
*   bcdefa Merge branch 'other-feature' into base (base)
|\
| * cdefab Bar (other-feature)
|/
* ...
...
```

with `git show-branch -a` output like:
```
! [base] Merge branch 'other-feature' into base
 * [feature] Foo
  ! [other-feature] Bar
---
 *  [feature] Foo
--  [base] Merge branch 'other-feature' into base
+*+ [other-feature] Bar
```

Here we want `base` to be returned instead of `other-feature` and thus
'-' needs to be matched as well.
2021-05-15 23:17:36 +02:00
ed215a35f7 zsh:alias:git-base-branch: Make regexs more robust
Fixes (in order of the patterns that were touched):

- Only match `*` that come between BOL and the branch name in brackets,
  as another branch could be checked out at a commit containing a `*`

- Only throw out commits that were committed on our current branch and
  not those that contain the branch name in the message (e.g. `test`).

- Only match until first bracket as the commit message could also
  contain a pattern like `[.*]` that would be matched instead.
2021-05-15 22:52:33 +02:00
f58c5fdb27 zsh:alias: Combine both regexs in git-base-branch 2021-05-15 22:17:45 +02:00
32416deedd zsh:alias: Add git-ancestor and git-base-branch 2021-05-15 22:12:50 +02:00
45a2ab8a20 vim:keybindings: Add gp to reselect last paste 2021-05-15 04:07:22 +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
724a6a455d vim:keybindings: Add // to search for selection 2021-05-15 04:06:20 +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
3029e30589 git:ignore: Add compile_flags.txt 2021-05-04 10:50:45 +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
3aa722842d vim: Use tree style listing in netrw 2021-04-28 01:37:42 +02:00
22501182ce vim: Use timer instead of autocommand for autoread 2021-04-26 17:56:15 +02:00
a9b5c19f2f git: Use 'main' as default branch name 2021-04-20 11:51:31 +02:00
987cabb841 bin:zoom-links: Only copy if browser opened
Do not overwrite the link in the clipboard if nothing opened.
2021-04-19 18:17:36 +02:00
b71e768d1c locale: Use en_DK instead of tk_TM for LC_TIME 2021-04-19 18:17:05 +02:00
bb78154888 zsh:zshenv: Use [[ instead of [ 2021-04-12 21:01:31 +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
b2962a5ce1 vim:ctags: Exclude files in build directory 2021-04-12 21:01:30 +02:00
a72eca0bf7 git:ignore: Add tags.{lock,temp} 2021-04-12 21:01:22 +02:00
376c8b6315 X11:xmodmap: Fix ISO US layout 2021-04-08 18:42:13 +02:00
fb72813e0c bin:raw2preview: Refactor + skip directories 2021-04-08 18:30:17 +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
2478e7200e git: Globally ignore node_modules 2021-04-04 10:50:48 +02:00
1bc07937bb repo:LICENSE: Bump year to 2021 2021-04-03 20:27:40 +02:00
60761055d3 bin:filterHistory: Update characters to escape 2021-04-02 18:45:12 +02:00