From de5a93802c937965c9f8541bbda499b371aa1d27 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 2 Apr 2021 19:49:57 +0200 Subject: [PATCH 1/5] install vollkorn font from my NUR repo --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index ab43070..637ebc5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -240,7 +240,7 @@ let twemoji-color-font opensans-ttf (iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; }) - # TODO: vollkorn + myNur.vollkorn # TODO: humor-sans ]; From 48fb108bd5b1f969b1fd081b17d819c8677882b1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 2 Apr 2021 19:50:35 +0200 Subject: [PATCH 2/5] add commented-out pidgin, in case OTR support is quickly needed --- home/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/home.nix b/home/home.nix index 637ebc5..4b232cc 100644 --- a/home/home.nix +++ b/home/home.nix @@ -47,6 +47,9 @@ let # split and merge PDFs in a GUI pdfarranger transmission-qt + #(pkgs.pidgin-with-plugins.override { + # plugins = [ pkgs.pidginotr ];}) + # for Hibiscus banking software jameica From f90a11dce694ec617d005e435c949c133922e843 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 8 Apr 2021 21:12:28 +0200 Subject: [PATCH 3/5] uninstall linphone --- home/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 4b232cc..4f9f972 100644 --- a/home/home.nix +++ b/home/home.nix @@ -43,7 +43,6 @@ let olifant subsurface yate - unstable.linphone # split and merge PDFs in a GUI pdfarranger transmission-qt From 1c715f0cd3f48c9cfb1d656432bc27beeba857f8 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 13 Apr 2021 22:09:54 +0200 Subject: [PATCH 4/5] fixup! switch back to upstream wireshark as patch does not apply anymore --- nixos/133dbc2.diff | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 nixos/133dbc2.diff diff --git a/nixos/133dbc2.diff b/nixos/133dbc2.diff deleted file mode 100644 index 59eeaae..0000000 --- a/nixos/133dbc2.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 133dbc21785ebcdf571063ee1c4bcf273733c97b Mon Sep 17 00:00:00 2001 -From: Anders Broman -Date: Wed, 01 Jul 2020 08:40:03 +0200 -Subject: [PATCH] BER: Add the posibillity to do "decode as" on an UDP port. - -Change-Id: I2897b32b58f154c9998316b16d24bf97ef544153 -Reviewed-on: https://code.wireshark.org/review/37628 -Petri-Dish: Anders Broman -Tested-by: Petri Dish Buildbot -Reviewed-by: Anders Broman ---- - -diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c -index 15c2bb8..16bbf4f 100644 ---- a/epan/dissectors/packet-ber.c -+++ b/epan/dissectors/packet-ber.c -@@ -4654,9 +4654,10 @@ - syntax_names[i].value = 0; - syntax_names[i].strptr = NULL; - -- /* allow the dissection of BER/DER carried over a TCP transport -+ /* allow the dissection of BER/DER carried over a TCP/UDP transport - by using "Decode As..." */ - dissector_add_for_decode_as_with_preference("tcp.port", ber_handle); -+ dissector_add_for_decode_as_with_preference("udp.port", ber_handle); - - ber_update_oids(); - } From d238392d5aa7c9d9210ff303a78603db1503cc57 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 15 Apr 2021 19:35:12 +0200 Subject: [PATCH 5/5] configure git via home-manager contact addresses have been defined in non-public submodule --- home/home.nix | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ home/secrets | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 4f9f972..1c273ea 100644 --- a/home/home.nix +++ b/home/home.nix @@ -321,4 +321,54 @@ in services.lorri.enable = true; fonts.fontconfig.enable = true; + + programs.git = + let contacts = import ./secrets/contacts.nix; + in + { + enable = true; + includes = [ + { + condition = "gitdir:~/Seafile/Studium/"; + contents = { + user.name = contacts.realName; + user.email = contacts.uniMail; + }; + } + { + condition = "gitdir:~/src/nixpkgs/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixosMail; + }; + } + ] + # set default name for several other common locations + ++ map + (dir: { + condition = "gitdir:${dir}"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.mainMail; + }; + }) [ "~/src/" "~/bin/" "~/tmp/" "~/nixconfigs/" ]; + extraConfig = { + credential.helper = "cache"; + push.default = "simple"; + diff.tool = "vimdiff"; + merge.tool = "vimdiff"; + core.excludesfile = toString (pkgs.writeText ".gitignore_global" '' + # Direnv stuff + .direnv + .envrc + # Editor files # + ################ + *~ + *.swp + *.swo + ''); + }; + lfs.enable = true; + + }; } diff --git a/home/secrets b/home/secrets index de07de8..068a475 160000 --- a/home/secrets +++ b/home/secrets @@ -1 +1 @@ -Subproject commit de07de8b76dac718ceef1258738ba2dd8fc3d3c2 +Subproject commit 068a4759e72948284c3de85d20a780723278f8b8