harry
/
it-infra
forked from M-Labs/it-infra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixops: use artiq flake for openocd

This commit is contained in:
Sebastien Bourdeauducq 2022-05-26 19:30:23 +08:00
parent 75987781f5
commit 3003183e25
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixops/desktop.nix
View File

@ -2,7 +2,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
m-labs = import (fetchTarball https://nixbld.m-labs.hk/channel/custom/artiq/full/artiq-full/nixexprs.tar.xz) { inherit pkgs; }; artiq = builtins.getFlake git+https://github.com/m-labs/artiq.git;
in in
{ {
deployment.targetHost = host; deployment.targetHost = host;
@ -44,7 +44,7 @@ in
gnome3.gnome-tweaks gnome3.gnome-tweaks
jq sublime3 rink qemu_kvm jq sublime3 rink qemu_kvm
tmux screen gdb minicom picocom tigervnc tmux screen gdb minicom picocom tigervnc
# TODO m-labs.openocd artiq.packages.x86_64-linux.openocd-bscanspi
# TODO xc3sprog # TODO xc3sprog
emacs bat ripgrep emacs bat ripgrep
xpra xpra
@ -152,7 +152,7 @@ in
users.extraGroups.plugdev = { }; users.extraGroups.plugdev = { };
users.extraUsers = import ./common-users.nix { inherit pkgs; }; users.extraUsers = import ./common-users.nix { inherit pkgs; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
# TODO services.udev.packages = [ m-labs.openocd ]; services.udev.packages = [ artiq.packages.x86_64-linux.openocd-bscanspi ];
services.udev.extraRules = (import ./extra-udev.nix); services.udev.extraRules = (import ./extra-udev.nix);
nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];

7
nixops/light.nix
View File

@ -2,7 +2,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
m-labs = import (fetchTarball https://nixbld.m-labs.hk/channel/custom/artiq/full/artiq-full/nixexprs.tar.xz) { inherit pkgs; }; artiq = builtins.getFlake git+https://github.com/m-labs/artiq.git;
in in
{ {
deployment.targetHost = host; deployment.targetHost = host;
@ -33,7 +33,7 @@ in
documentation.enable = false; documentation.enable = false;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
opensc opensc yubikey-manager yubikey-manager-qt yubico-piv-tool
wget vim git firefox usbutils pciutils file lm_sensors acpi wget vim git firefox usbutils pciutils file lm_sensors acpi
gimp imagemagick gimp imagemagick
evince evince
@ -42,6 +42,7 @@ in
unzip zip gnupg unzip zip gnupg
sublime3 rink sublime3 rink
tmux screen tigervnc tmux screen tigervnc
artiq.packages.x86_64-linux.openocd-bscanspi
any-nix-shell any-nix-shell
]; ];
programs.wireshark.enable = true; programs.wireshark.enable = true;
@ -126,7 +127,7 @@ in
users.extraUsers = import ./common-users.nix { inherit pkgs; }; users.extraUsers = import ./common-users.nix { inherit pkgs; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
# TODO services.udev.packages = [ m-labs.openocd ]; services.udev.packages = [ artiq.packages.x86_64-linux.openocd-bscanspi ];
services.udev.extraRules = (import ./extra-udev.nix); services.udev.extraRules = (import ./extra-udev.nix);
nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];

8
nixops/rpi.nix
View File

@ -2,7 +2,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
m-labs = import (fetchTarball https://nixbld.m-labs.hk/channel/custom/artiq/full/artiq-full/nixexprs.tar.xz) { inherit pkgs; }; artiq = builtins.getFlake git+https://github.com/m-labs/artiq.git;
in in
{ {
deployment.targetHost = host; deployment.targetHost = host;
@ -67,13 +67,15 @@ in
}; };
}; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
services.udev.packages = [ m-labs.openocd ]; services.udev.packages = [ artiq.packages.x86_64-linux.openocd-bscanspi ];
services.udev.extraRules = (import ./extra-udev.nix); services.udev.extraRules = (import ./extra-udev.nix);
documentation.enable = false; documentation.enable = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
psmisc wget vim git sshfs usbutils uhubctl lm_sensors file mosh tmux m-labs.openocd screen gdb minicom picocom psmisc wget vim git sshfs usbutils uhubctl lm_sensors file mosh tmux
artiq.packages.x86_64-linux.openocd-bscanspi
# TODO xc3sprog # TODO xc3sprog
screen gdb minicom picocom
]; ];
programs.fish.enable = true; programs.fish.enable = true;
programs.wireshark.enable = true; programs.wireshark.enable = true;