1
1
Fork 0

Compare commits

..

No commits in common. "9b27214df802c23bc3b96cb479897320d9d3c019" and "9f61edec49779531ae8256588c1ee8ab63c3ee03" have entirely different histories.

3 changed files with 6 additions and 10 deletions

View File

@ -161,11 +161,11 @@
gameRO = sambaShareRO "/nas/game/" ''@nas''; gameRO = sambaShareRO "/nas/game/" ''@nas'';
imageRO = sambaShareRO "/nas/image" ''@nas''; imageRO = sambaShareRO "/nas/image" ''@nas'';
videoRO = sambaShareRO "/nas/video" ''@nas''; videoRO = sambaShareRO "/nas/video" ''@nas'';
#audio = sambaShare "/nas/audio" ''@nas''; audio = sambaShare "/nas/audio" ''@nas'';
#doc = sambaShare "/nas/doc/" ''@nas''; doc = sambaShare "/nas/doc/" ''@nas'';
#game = sambaShare "/nas/game/" ''@nas''; game = sambaShare "/nas/game/" ''@nas'';
#image = sambaShare "/nas/image" ''@nas''; image = sambaShare "/nas/image" ''@nas'';
#video = sambaShare "/nas/video" ''@nas''; video = sambaShare "/nas/video" ''@nas'';
}; };
}; };
@ -198,7 +198,6 @@
openssh.authorizedKeys.keyFiles = [ openssh.authorizedKeys.keyFiles = [
./keys/tvb.palamas.pub ./keys/tvb.palamas.pub
./keys/tvb.stagirite.pub ./keys/tvb.stagirite.pub
./keys/tvb.vagrant.pub
./keys/monitor.isidore.pub ./keys/monitor.isidore.pub
./keys/inquisitor.conduit.pub ./keys/inquisitor.conduit.pub
]; ];
@ -206,6 +205,4 @@
#./keys/tvb.empyrean.pub #./keys/tvb.empyrean.pub
nix.buildCores = 4; nix.buildCores = 4;
nix.package = pkgs.nixFlakes;
nix.extraOptions = "experimental-features = nix-command flakes";
} }

View File

@ -6,7 +6,7 @@ let
catacombServerSource = builtins.fetchGit { catacombServerSource = builtins.fetchGit {
url = "https://git.alogoulogoi.com/Jaculabilis/catacomb-server.git"; url = "https://git.alogoulogoi.com/Jaculabilis/catacomb-server.git";
ref = "develop-nix"; ref = "develop-nix";
rev = "63574bb39cc777deb56a76548f08789d238fcfec"; rev = "24838851eeb7e9bd4181bf46ea0a55432c3bba66";
}; };
catacombServer = pkgs.callPackage catacombServerSource {}; catacombServer = pkgs.callPackage catacombServerSource {};

View File

@ -1 +0,0 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDO+v/xHtA4E7DCMPmQtbCMJOh2DNKU5xyVjLW1nYE0lkIM+bNGGDVU7QSx3DpZHQSQPyXKk0GmCQsRs09NtUuTF6zrWogqbab9vrVFS2cxgSnsiw79gH10lrJGWfIHbRt+P4C/JzWFoy2+s2Jt2C5MTLyeb0E5/+1SL92eVZgmC0WroE3i/IUrhbI5plVJ74juCk7Jsy6tbKbskZqouBaNVZYPIx9s4EBTQLiVLyCOTeFMHu4SYjozfyCD7r0P0vcujKCJRbgN/H23v7uWmFp1DAYgxk3RYTIH0s19MIDRKf6UI47VdspdDUqW1FYoUEjO4q61iLgMFosIAfCPMvP6BJL8DA8AtifchUhUTgRD4J4JToS71zkyxhBkCNlc4EfjWvNO6nfZdKjTz/C+jlFSMYsgexF6Igzee+fvBcT8fRHOfJDK+fgXGj6/m/h1SH9BK2ZaP0rP8VCnWqT0xiIPeOVIKjFQQzYElvEkti8PZUckPOjqHrKEmyy6bBltiJFnRdxf5Vj/dMxNAjtDEaJD8ayuKts2RoRPYzyN5fmBWlIQzedznBFZiE5P67mWWYZWvmDGFOMrylcLXCiEXUnm9KwyV1MsL9WwI/7NZYcZopbxGjmDMfbmfaHhQJ1uX3T7aToPAUUthFdmn+tdYbiEwEL0MK/kVW+WJwZnWpuSmQ== tvb@vagrant