Merge branch 'master' of git:nixos-config

common/essentials.nix

@@ -31,7 +31,6 @@
     nmap
     tcpdump
 
-    git-crypt
     tmux
     tig
     exa

home-manager/modules/taskwarrior.nix

@@ -50,12 +50,14 @@ config = mkIf config.m-0.taskwarrior.enable {
         report.default.sort=modified-
 
         uda.partof.type=string
-        uda.partof.label=parent task
+        uda.partof.label=Parent task
         uda.generated.type=string
         uda.gen_name.type=string
-        uda.gen_name.label=generator name
+        uda.gen_name.label=Generator name
         uda.gen_id.type=string
-        uda.gen_id.label=generator id
+        uda.gen_id.label=Generator id
+        uda.gen_orphan.type=string
+        uda.gen_orphan.label=Generated orphan behavior
 
         # Bugwarrior UDAs
         uda.githubtitle.type=string

hosts/hera/configuration.nix

@@ -56,8 +56,13 @@ nixpkgs.config.packageOverrides = pkgs: {
 services = {
   ndppd = {
     enable = true;
-    interface = "ens18";
-    network = "${config.m-0.prefix}::/64";
+    configFile = ''
+      proxy ens18 {
+        rule ${config.m-0.prefix}::/64 {
+          static
+        }
+      }
+    '';
   };
   borgbackup.jobs.data = {
     doInit = false;

system/default.nix

@@ -1,6 +1,7 @@
 { pkgs, config, lib, ... }:
 let
   me = config.m-0.private.me;
+  unstable = import <unstable> {};
 in {
   # channel = 18.03
 
@@ -33,4 +34,7 @@ in {
       openssh.authorizedKeys.keys = me.keys;
     };
   };
+  environment.sessionVariables = {
+    LOCALE_ARCHIVE_2_27 = "${unstable.glibcLocales}/lib/locale/locale-archive";
+  };
 }