diff options
Diffstat (limited to '')
| -rw-r--r-- | home/home-minimal.nix | 25 | ||||
| -rw-r--r-- | home/home.nix | 5 | ||||
| -rw-r--r-- | home/newsboat-public.nix | 8 | ||||
| -rw-r--r-- | home/packages-minimal.nix | 2 |
4 files changed, 39 insertions, 1 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix index 42f358d..78d6014 100644 --- a/home/home-minimal.nix +++ b/home/home-minimal.nix @@ -138,8 +138,33 @@ commit.verbose = true; rerere.enabled = true; branch.sort = "-authordate"; + + merge.mergiraf = { + name = "mergiraf"; + driver = "merigraf merge --git %O %A %B -s %S -x %X -y %Y -p %P"; + }; }; + attributes = [ + "*.java merge=mergiraf" + "*.rs merge=mergiraf" + "*.go merge=mergiraf" + "*.js merge=mergiraf" + "*.jsx merge=mergiraf" + "*.json merge=mergiraf" + "*.yml merge=mergiraf" + "*.yaml merge=mergiraf" + "*.html merge=mergiraf" + "*.htm merge=mergiraf" + "*.xhtml merge=mergiraf" + "*.xml merge=mergiraf" + "*.c merge=mergiraf" + "*.h merge=mergiraf" + "*.cpp merge=mergiraf" + "*.hpp merge=mergiraf" + "*.cs merge=mergiraf" + ]; + # diff-so-fancy.enable = true; # difftastic.enable = true; delta = { diff --git a/home/home.nix b/home/home.nix index 22640b9..0452e0f 100644 --- a/home/home.nix +++ b/home/home.nix @@ -316,6 +316,11 @@ user = "git"; identityFile = keydir + "/id_surltesh-echer"; }; + "encoder* mixer* atem* minion*" = { + # hostname = "%h.lan.c3voc.de"; + user = "voc"; + extraOptions.StrictHostKeyChecking = "no"; + }; "nobelium" = { hostname = "no.colorspace.club"; user = "root"; diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix index 1bd5bcb..8216b14 100644 --- a/home/newsboat-public.nix +++ b/home/newsboat-public.nix @@ -29,6 +29,7 @@ with import ./newsboat-lib.nix; (ntag "https://www.gdl.de/feed.rss" "trains") (ntag "https://www.transformativeworks.org/feed" "fandom") (ntag "https://haskell.github.io/security-advisories/atom.xml" "comp") + (ntag "https://blog.haskell.org/atom.xml" "comp") # blogs (btag "https://scilogs.spektrum.de/klimalounge/feed/" "climate") @@ -205,6 +206,9 @@ with import ./newsboat-lib.nix; (btag "https://blog.poisson.chat/rss.xml" "comp") (btag "https://blog.nadja.top/feed.rss" "hardware") (btag "https://matttproud.com/blog/index.xml" "comp") + (btag "https://www.rntz.net/blog/atom.xml" "comp") + (btag "https://realdougwilson.com/feed.xml" "fonts") + (btag "https://feeds.feedburner.com/balpha" "fonts") # paper (btag "http://arxiv.org/rss/cs.PL" "paper") @@ -269,6 +273,10 @@ with import ./newsboat-lib.nix; (ytag "UC6IxnFzHofFJ5X2PycSMsww" "stuff") # xkcd's What If? (ytag "UClgXF_jwWAwPRu8nT1g90xQ" "stuff") # Matt Gray (ytag "UCqqJQ_cXSat0KIAVfIfKkVA" "food") # Kenji + (ytag "UCK48_8v5k90EXEYRD5mATlw" "plants") # techplant + (ytag "UChIwaIJ8nxk8nskUZJD2yyg" "plants") # plants in jars + (ytag "UCWYSiz0rqNEJ0mX4a45Lhrw" "plants") # nick alexander + (ytag "UC9_p50tH3WmMslWRWKnM7dQ" "food") # Adam Ragusea (blender 2737) # blender developers (blender 10) # reels (blender 9) # open movies diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix index fe09bc3..f2294ec 100644 --- a/home/packages-minimal.nix +++ b/home/packages-minimal.nix @@ -21,7 +21,7 @@ # nix tools nixpkgs-review nix-top nix-diff nix-tree # git - gitAndTools.gitAnnex git-bug git-appraise + gitAndTools.gitAnnex git-bug git-appraise mergiraf # other things gauche # html, js & co |