summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/x/config.nix
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-08 12:59:45 +0200
committerlassulus <lass@blue.r>2018-09-08 12:59:45 +0200
commit8639e4008a34e5e7d68202a621ef8c95fe3087f4 (patch)
tree730338125b0b095bd633aabeb67a832ff1b8f5b5 /makefu/1systems/x/config.nix
parent68bf23466fcaf91df0f11ba0828ef41fc9f694bf (diff)
parentb4c96ad61109ac59fb90546d104aaeb7ac273c84 (diff)
Merge remote-tracking branch 'gum/master' into test
Diffstat (limited to 'makefu/1systems/x/config.nix')
-rw-r--r--makefu/1systems/x/config.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index e5b481ab6..f6ca0c0ac 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -15,7 +15,7 @@ with import <stockholm/lib>;
<stockholm/makefu/2configs/tools/mic92.nix>
<stockholm/makefu/2configs/laptop-backup.nix>
- <stockholm/makefu/2configs/dnscrypt/client.nix>
+ # <stockholm/makefu/2configs/dnscrypt/client.nix>
<stockholm/makefu/2configs/avahi.nix>
# Debugging
@@ -36,6 +36,8 @@ with import <stockholm/lib>;
# Krebs
<stockholm/makefu/2configs/tinc/retiolum.nix>
+ <stockholm/makefu/2configs/share/gum-client.nix>
+
# applications
<stockholm/makefu/2configs/exim-retiolum.nix>
@@ -72,6 +74,7 @@ with import <stockholm/lib>;
<stockholm/makefu/2configs/hw/irtoy.nix>
<stockholm/makefu/2configs/hw/bluetooth.nix>
# <stockholm/makefu/2configs/hw/rad1o.nix>
+ <stockholm/makefu/2configs/hw/smartcard.nix>
# Filesystem
<stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
@@ -82,6 +85,8 @@ with import <stockholm/lib>;
programs.adb.enable = true;
}
# temporary
+ <stockholm/makefu/2configs/pyload.nix>
+ # <stockholm/makefu/2configs/nginx/rompr.nix>
# <stockholm/makefu/2configs/lanparty/lancache.nix>
# <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
# <stockholm/makefu/2configs/lanparty/samba.nix>
@@ -138,8 +143,11 @@ with import <stockholm/lib>;
boot.loader.grub.configurationLimit = 3;
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
- nixpkgs.overlays = [ (import <python/overlay.nix>) ];
# environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; };
-
+ state = [
+ "/home/makefu/stockholm"
+ "/home/makefu/backup/borgun"
+ "/home/makefu/.mail/"
+ ];
}