Compare commits
15 Commits
master
...
fcfee6c674
| Author | SHA1 | Date | |
|---|---|---|---|
| fcfee6c674 | |||
| d0e944d05c | |||
| 4a6e36c7e9 | |||
| 14fe50fc2a | |||
| 178afc667e | |||
| 596bf121a6 | |||
| 1a8549064b | |||
| 54e9f0a561 | |||
| e8702f49c3 | |||
| c81813b0f8 | |||
| 81114d55b8 | |||
| f4bb3e7c17 | |||
| c80a855627 | |||
| e9a3a5ecc7 | |||
| 272185d9b7 |
@@ -2,36 +2,11 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
cmake
|
vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option
|
||||||
ethtool
|
nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree
|
||||||
file
|
ncdu perf ldns pv
|
||||||
freeipmi
|
|
||||||
git
|
|
||||||
gnumake
|
|
||||||
home-manager
|
|
||||||
htop
|
|
||||||
ipmitool
|
|
||||||
ldns
|
|
||||||
lm_sensors
|
|
||||||
ncdu
|
|
||||||
nix-diff
|
|
||||||
nix-index
|
|
||||||
nix-output-monitor
|
|
||||||
nixfmt-tree
|
|
||||||
nixos-option
|
|
||||||
pciutils
|
|
||||||
perf
|
|
||||||
pv
|
|
||||||
ripgrep
|
|
||||||
tcpdump
|
|
||||||
tmux
|
|
||||||
tree
|
|
||||||
vim
|
|
||||||
wget
|
|
||||||
|
|
||||||
# From jungle overlay
|
# From jungle overlay
|
||||||
nixgen
|
osumb nixgen
|
||||||
osumb
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.direnv.enable = true;
|
programs.direnv.enable = true;
|
||||||
|
|||||||
@@ -194,19 +194,6 @@
|
|||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOlRX7ZCnqtUJYCxKgWmgSrFCYuA2LHY96rVwqxXPl86 aaguirre@BSC-8488184117"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOlRX7ZCnqtUJYCxKgWmgSrFCYuA2LHY96rVwqxXPl86 aaguirre@BSC-8488184117"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
emonteir = {
|
|
||||||
uid = 9656;
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/Computational/emonteir";
|
|
||||||
description = "Erwin Royson Monteiro";
|
|
||||||
group = "Computational";
|
|
||||||
hosts = [ "apex" "fox" ];
|
|
||||||
hashedPassword = "$6$0mU88zd3ZuK5NiJQ$DFWL5RMLH6esQM5UyhBCiiNryw4lDDmvJp7Usz3tmevnsiSJr6u0RsUKAnR/K8GRBFrV1.GocrgNjKjik5GY//";
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOKZKot/Y3F5Wq9pQIXlCbyvQuVVeWMCsAC96Nd+LTcG erwin@Oreo"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
groups = {
|
groups = {
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ let
|
|||||||
name = "jungle-web";
|
name = "jungle-web";
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
|
url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
|
||||||
rev = "5f18335d14126d2fef134c0cd441771436f7dfa1";
|
rev = "52abaf4d71652a9ef77a0b098db14ca33bffff4c";
|
||||||
hash = "sha256-s9VBF91sQ7hg9+lrwNFPYgoXTTyXaQcAulCiGJgWERo=";
|
hash = "sha256-/ul9GazbOrOkmlvSgDz/+2W+V+ir5725Y7mVLc3rb0M=";
|
||||||
};
|
};
|
||||||
buildInputs = [ pkgs.hugo ];
|
buildInputs = [ pkgs.hugo ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# Allow user access to FTDI USB device
|
|
||||||
services.udev.packages = lib.singleton (pkgs.writeTextFile {
|
|
||||||
# Needs to be < 73
|
|
||||||
name = "60-ftdi-tc1.rules";
|
|
||||||
text = ''
|
|
||||||
# Bus 003 Device 003: ID 0403:6011 Future Technology Devices International, Ltd FT4232H Quad HS USB-UART/FIFO IC
|
|
||||||
# Use := to make sure it doesn't get changed later
|
|
||||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", MODE:="0666"
|
|
||||||
'';
|
|
||||||
destination = "/etc/udev/rules.d/60-ftdi-tc1.rules";
|
|
||||||
});
|
|
||||||
|
|
||||||
# Allow access to USB for docker in GitLab runner
|
|
||||||
services.gitlab-runner = {
|
|
||||||
services.gitlab-bsc-docker = {
|
|
||||||
registrationFlags = [
|
|
||||||
# We need raw access to the USB port to reboot the board
|
|
||||||
"--docker-devices /dev/bus/usb/003/003"
|
|
||||||
# And TTY access for the serial port
|
|
||||||
"--docker-devices /dev/ttyUSB2"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
address = "10.0.40.1";
|
address = "10.0.40.1";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
} ];
|
} ];
|
||||||
interfaces.ibs785.ipv4.addresses = [ {
|
interfaces.ibp5s0.ipv4.addresses = [ {
|
||||||
address = "10.0.42.1";
|
address = "10.0.42.1";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
} ];
|
} ];
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
} ];
|
} ];
|
||||||
# Watch out! The OmniPath device is not in the same place here:
|
# Watch out! The OmniPath device is not in the same place here:
|
||||||
interfaces.ibs801.ipv4.addresses = [ {
|
interfaces.ibp129s0.ipv4.addresses = [ {
|
||||||
address = "10.0.42.2";
|
address = "10.0.42.2";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
} ];
|
} ];
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
../module/p.nix
|
../module/p.nix
|
||||||
../module/vpn-dac.nix
|
../module/vpn-dac.nix
|
||||||
../module/hut-substituter.nix
|
../module/hut-substituter.nix
|
||||||
../module/tc1-board.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Select the this using the ID to avoid mismatches
|
# Select the this using the ID to avoid mismatches
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ let
|
|||||||
name = "jungle-web";
|
name = "jungle-web";
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
|
url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
|
||||||
rev = "5f18335d14126d2fef134c0cd441771436f7dfa1";
|
rev = "52abaf4d71652a9ef77a0b098db14ca33bffff4c";
|
||||||
hash = "sha256-s9VBF91sQ7hg9+lrwNFPYgoXTTyXaQcAulCiGJgWERo=";
|
hash = "sha256-/ul9GazbOrOkmlvSgDz/+2W+V+ir5725Y7mVLc3rb0M=";
|
||||||
};
|
};
|
||||||
buildInputs = [ pkgs.hugo ];
|
buildInputs = [ pkgs.hugo ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user