From df4f7efea1570050ba3f1828e41419304606e212 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 20 Jul 2023 21:27:06 +0200
Subject: ...

---
 accounts/gkleen@sif/default.nix | 10 ++++------
 flake.nix                       |  9 +++++++++
 hosts/sif/default.nix           |  1 +
 hosts/sif/mail/default.nix      |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 4db58a1b..18d4b82b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -134,12 +134,9 @@ in {
                 @cert-authority *.mathinst.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
               ''}
 
-            Match host *.mathinst.loc !host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
+            Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
               # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
-              ProxyJump mathw0g
-
-            Match host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
-              HostName mathw0g.math.lmu.de
+              ProxyJump ssh.math.lmu.de
 
             Match host *.cipmath.loc !host cip04.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
               ProxyJump cip04
@@ -219,6 +216,7 @@ in {
           u2w = "$HOME/projects/uni2work";
           docs = "$HOME/documents";
           dl = "$HOME/Downloads";
+          scrot = "$HOME/screenshots";
           flk = "$HOME/config/nixos-flakes";
           rz = "$HOME/projects/rz";
         };
@@ -396,7 +394,7 @@ in {
           weechat wrappedElementDesktop # helvum
           matrix-synapse-tools.synadm wrappedRocketChatDesktop
           flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
-          sieve-connect gimp inkscape udiskie glab scrot
+          sieve-connect gimp inkscape udiskie glab scrot nitrokey-app pynitrokey
         ];
 
         file = {
diff --git a/flake.nix b/flake.nix
index d51cd532..fd18ba0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,15 @@
 {
   description = "GKleen's flakey nixos configuration";
 
+  nixConfig = {
+    extra-substituters = [
+      "https://nix-community.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+
   inputs = {
     nixpkgs = {
       type = "github";
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 320f7a0c..c55cc7a8 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -540,6 +540,7 @@ in {
       firmware = [ pkgs.firmwareLinuxNonfree ];
 
       keyboard.uhk.enable = true;
+      nitrokey.enable = true;
     };
 
     sound.enable = true;
diff --git a/hosts/sif/mail/default.nix b/hosts/sif/mail/default.nix
index 3ef3e9fb..4989150d 100644
--- a/hosts/sif/mail/default.nix
+++ b/hosts/sif/mail/default.nix
@@ -32,7 +32,7 @@
       odin.asgard.yggdrasil uucp:odin
     '';
     config = {
-      always_bcc = "gkleen+sent@odin.asgard.yggdrasil";
+      # always_bcc = "gkleen+sent@odin.asgard.yggdrasil";
 
       default_transport = "uucp:ymir";
 
-- 
cgit v1.2.3