danielsiepmann/nixpkgs
danielsiepmann/nixpkgs
1
0
Code Releases Activity
734 commits 4 branches 0 tags 3.1 MiB
Commit graph

21 commits

Author SHA1 Message Date
Daniel Siepmann 82ad33410b
Ignore php cs fixer cache within Git 2023-02-16 15:39:45 +01:00
Daniel Siepmann 9145644868
Ignore PHUnit 10 cache 2023-02-07 08:57:26 +01:00
Daniel Siepmann 3aec964506
Adjust diff so fancy to my preferences 2023-01-03 15:23:43 +01:00
Daniel Siepmann 6cf94d47ab
Enable diff so fancy for now 
Give it a try and see how it works.
 2023-01-02 16:54:16 +01:00
Daniel Siepmann 6927395384
Revert git noprefix 
As some libraries expect the output. They will break.
 2022-12-13 09:34:37 +01:00
Daniel Siepmann 9164b4002c
Optimise git 
Do not show file prefix, this removes a/ and b/ prefix from file paths.
This eases copying file names from diff output.

Also adjust hot git handles whitespace to improve diffing, especially
for one customer where
`git diff -U0 --word-diff-regex='[^[:space:]]' HEAD~1` is possible now.
 2022-12-13 08:43:21 +01:00
Daniel Siepmann fc197aedea
Always sign git commits on both devices 
As I've transferred my gpg key
 2022-11-04 10:25:51 +01:00
Daniel Siepmann 87408de6b0 Temporarily disable keychain and pgp signing on hikari 2022-11-03 17:01:41 +01:00
Daniel Siepmann 6d0cc6ad8d
Add customer specific gitignore entry 2022-10-05 16:53:54 +02:00
Daniel Siepmann 42081fc2a9
Use binaries from $PATH 
Do not link against raw pkgs version.
They might be adjusted.
Use the ones from PATH.
 2022-08-15 08:41:53 +02:00
Daniel Siepmann 40de1d353f
Keep old git merge behaviour 
I find it way to much / complicated and am used to my old way to merge
things which I keep for now.
 2022-04-19 13:33:45 +02:00
Daniel Siepmann df46cb05ed
Cleanup nix flakes + shells 
Remove flakes for now.
I will use shells for now to not have a mixed setup.
Add composer v1 for a single customer project as overlay due to usage in
shell instead of flakes.

Adjust folder to not have unnecessary deep structure.

Add shell for reuter monorepo using composer v1.
 2022-04-14 15:46:49 +02:00
Daniel Siepmann def8300cca
Disable paging for some git commands 
I don't like pager for those commands.
 2022-03-30 13:02:58 +02:00
Daniel Siepmann 2cd771c838
Use less as general pager 
I tried nvimpager but it was a bit complex for me to re use existing
Neovim settings tweak for specific usage as pager.
I decided to stick with less for everything.
 2022-03-29 15:29:10 +02:00
Daniel Siepmann 126b0fa422
Add new plugin to Neovim for easier merges 
I'll give it a try and check how well it works.
 2022-03-23 17:28:36 +01:00
Daniel Siepmann cdbf6a8680
Link Git mergetool against nixpkgs neovim 
Do not use any global path.
 2022-03-23 17:27:43 +01:00
Daniel Siepmann 3bf0d66f3b
Add inline todos with new plugins and programs to try 2022-03-16 09:04:03 +01:00
Daniel Siepmann 152e540dc1
Remove unused option to use xxdiff from git 
I never used that feature, I always use less as pager and CLI context
for diffing.
 2022-03-10 13:36:51 +01:00
Daniel Siepmann a0832b3767
Add new Git alias 
I use cherry-picks in one project and am to lazy to always wait for
auto completion.
 2022-02-23 13:54:57 +01:00
Daniel Siepmann 00320b8a48
Use my own git diff setup 
That one includes local base and remote at top.
It turns diffthis off for the merged result to have proper code
highlighting of result.
 2022-02-21 13:39:22 +01:00
Daniel Siepmann 6a67e5df5d
Migrate git setup to home-manager 
This was previously done through custom dotfiles.
 2022-02-02 21:50:24 +01:00