summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix10
-rw-r--r--flake.nix9
-rw-r--r--hosts/sif/default.nix1
-rw-r--r--hosts/sif/mail/default.nix2
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 {
134 @cert-authority *.mathinst.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01 134 @cert-authority *.mathinst.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
135 ''} 135 ''}
136 136
137 Match host *.mathinst.loc !host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null" 137 Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
138 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118 138 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
139 ProxyJump mathw0g 139 ProxyJump ssh.math.lmu.de
140
141 Match host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
142 HostName mathw0g.math.lmu.de
143 140
144 Match host *.cipmath.loc !host cip04.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null" 141 Match host *.cipmath.loc !host cip04.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
145 ProxyJump cip04 142 ProxyJump cip04
@@ -219,6 +216,7 @@ in {
219 u2w = "$HOME/projects/uni2work"; 216 u2w = "$HOME/projects/uni2work";
220 docs = "$HOME/documents"; 217 docs = "$HOME/documents";
221 dl = "$HOME/Downloads"; 218 dl = "$HOME/Downloads";
219 scrot = "$HOME/screenshots";
222 flk = "$HOME/config/nixos-flakes"; 220 flk = "$HOME/config/nixos-flakes";
223 rz = "$HOME/projects/rz"; 221 rz = "$HOME/projects/rz";
224 }; 222 };
@@ -396,7 +394,7 @@ in {
396 weechat wrappedElementDesktop # helvum 394 weechat wrappedElementDesktop # helvum
397 matrix-synapse-tools.synadm wrappedRocketChatDesktop 395 matrix-synapse-tools.synadm wrappedRocketChatDesktop
398 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs 396 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
399 sieve-connect gimp inkscape udiskie glab scrot 397 sieve-connect gimp inkscape udiskie glab scrot nitrokey-app pynitrokey
400 ]; 398 ];
401 399
402 file = { 400 file = {
diff --git a/flake.nix b/flake.nix
index d51cd532..fd18ba0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,15 @@
1{ 1{
2 description = "GKleen's flakey nixos configuration"; 2 description = "GKleen's flakey nixos configuration";
3 3
4 nixConfig = {
5 extra-substituters = [
6 "https://nix-community.cachix.org"
7 ];
8 extra-trusted-public-keys = [
9 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
10 ];
11 };
12
4 inputs = { 13 inputs = {
5 nixpkgs = { 14 nixpkgs = {
6 type = "github"; 15 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 {
540 firmware = [ pkgs.firmwareLinuxNonfree ]; 540 firmware = [ pkgs.firmwareLinuxNonfree ];
541 541
542 keyboard.uhk.enable = true; 542 keyboard.uhk.enable = true;
543 nitrokey.enable = true;
543 }; 544 };
544 545
545 sound.enable = true; 546 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 @@
32 odin.asgard.yggdrasil uucp:odin 32 odin.asgard.yggdrasil uucp:odin
33 ''; 33 '';
34 config = { 34 config = {
35 always_bcc = "gkleen+sent@odin.asgard.yggdrasil"; 35 # always_bcc = "gkleen+sent@odin.asgard.yggdrasil";
36 36
37 default_transport = "uucp:ymir"; 37 default_transport = "uucp:ymir";
38 38