M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:df452f7d94d25933ac7bd46b4f7563d0c262624a
Branches Tags
M-Labs:master
...
compare: M-Labs:405492b2e965e3da30062ac020aa04995ab874d7
Branches Tags
M-Labs:master

2 Commits
df452f7d94 ... 405492b2e9

Author SHA1 Message Date
Sebastien Bourdeauducq 405492b2e9 nixbld: add fish shell 2019-07-31 22:48:42 +08:00
Sebastien Bourdeauducq a86f29733e nixbld: redirect old artiq resources page 2019-07-31 22:48:42 +08:00
1 changed files with 6 additions and 0 deletions
Show Stats Expand all files Collapse all files

6
nixbld-etc-nixos/configuration.nix
View File

@ -52,6 +52,8 @@ in
services.openssh.forwardX11 = true; services.openssh.forwardX11 = true;
programs.mosh.enable = true; programs.mosh.enable = true;
programs.fish.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 631 5901 80 443 ]; networking.firewall.allowedTCPPorts = [ 631 5901 80 443 ];
networking.firewall.allowedUDPPorts = [ 631 ]; networking.firewall.allowedUDPPorts = [ 631 ];
@ -74,6 +76,7 @@ in
users.extraUsers.sb = { users.extraUsers.sb = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner" "wireshark" "docker"]; extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner" "wireshark" "docker"];
shell = pkgs.fish;
}; };
users.extraUsers.rj = { users.extraUsers.rj = {
isNormalUser = true; isNormalUser = true;
@ -284,6 +287,9 @@ ACTION=="add", SUBSYSTEM=="tty", \
locations."/artiq".extraConfig = '' locations."/artiq".extraConfig = ''
return 301 /experiment-control/artiq/; return 301 /experiment-control/artiq/;
''; '';
locations."/artiq/resources.html".extraConfig = ''
return 301 /experiment-control/resources/;
'';
# autogenerated ARTIQ manuals # autogenerated ARTIQ manuals
locations."/artiq/manual-beta" = { locations."/artiq/manual-beta" = {