summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-05-19 10:02:47 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-05-19 10:02:47 +0200
commitc5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd (patch)
tree30631b64ba9ee14be2966904a82b213b7d85b012
parenteb6a91e0a3f1a06cfa7520eb60fdace24521e92f (diff)
downloadnixos-c5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd.tar
nixos-c5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd.tar.gz
nixos-c5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd.tar.bz2
nixos-c5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd.tar.xz
nixos-c5fa7f9221fa12a57b0d1fa8d8dd1a80c468a9dd.zip
...
-rw-r--r--bragi.nix1
-rw-r--r--odin.nix10
2 files changed, 1 insertions, 10 deletions
diff --git a/bragi.nix b/bragi.nix
index 0f6a3d41..f696972c 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -121,7 +121,6 @@ in rec {
121 tmux 121 tmux
122 nfs-utils 122 nfs-utils
123 jack2Full 123 jack2Full
124 zsh
125 tprint 124 tprint
126 samba 125 samba
127 rebuild-system 126 rebuild-system
diff --git a/odin.nix b/odin.nix
index d9cb5c23..86015968 100644
--- a/odin.nix
+++ b/odin.nix
@@ -14,6 +14,7 @@
14 ./custom/borgbackup.nix 14 ./custom/borgbackup.nix
15 ./custom/motion.nix 15 ./custom/motion.nix
16 ./custom/unit-status-mail.nix 16 ./custom/unit-status-mail.nix
17 ./custom/zsh.nix
17 ./utils/nix/module.nix 18 ./utils/nix/module.nix
18 ]; 19 ];
19 20
@@ -56,15 +57,6 @@
56 monitor-uucp 57 monitor-uucp
57 ]; 58 ];
58 59
59 programs.zsh = {
60 enable = true;
61 shellInit = lib.mkForce ''
62 . ${config.system.build.setEnvironment}
63
64 ${config.environment.shellInit}
65 '';
66 };
67
68 services.openssh = { 60 services.openssh = {
69 enable = true; 61 enable = true;
70 passwordAuthentication = false; 62 passwordAuthentication = false;