Compare commits

...

3 commits

Author SHA1 Message Date
3c80614ee4
update bemmer config 2021-10-24 20:55:28 +02:00
c7dce3b8c0
add nfs client 2021-10-24 20:55:12 +02:00
035b623b42
update deploy script 2021-10-24 20:54:29 +02:00
6 changed files with 37 additions and 31 deletions

View file

@ -12,15 +12,25 @@ fi
mode="${1:-switch}"
host="${2:-nuc}"
target="${3:-$host.c3h}"
target="${3:-c3h@$host.c3h}"
if ! [ -d "hosts/$host" ]
then
echo "Host $host does not exist. Choose from:"
ls hosts
exit
fi
echo "deploying $host to $target"
sleep 1
sources=$(nix-build nix/sources-dir.nix --no-out-link)
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' EXIT
sources="$tmp/sources"
cp -r $(nix-build nix/sources-dir.nix --no-out-link) $tmp/sources
set -x
system_drv=$(nix-instantiate "<nixpkgs/nixos>" -I $sources -I "nixos-config=$PWD/hosts/$host/configuration.nix" | head -n1)
system_drv=$(nix-instantiate "<nixpkgs/nixos>" -A config.system.build.toplevel -I $sources -I "nixos-config=$PWD/hosts/$host/configuration.nix")
nix-copy-closure --to $target $system_drv
system=$(ssh $target "nix-store --realise $system_drv")
ssh $target "sudo nix-env -p /nix/var/nix/profiles/system -i $system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration $mode"

View file

@ -8,7 +8,7 @@
# services
../../shared-services/pulseaudio.nix
#../../shared-services/nfs-server.nix
../../shared-services/nfs-client.nix
../../shared-services/mpd.nix
../../shared-services/ympd.nix
../../shared-services/spotifyd.nix
@ -16,6 +16,11 @@
../../shared-services/vnc.nix
../../shared-services/webserver.nix
];
disabledModules = [
"profiles/base.nix"
];
users.users.c3h = {
isNormalUser = true;
password = "c3h";
@ -25,19 +30,12 @@
networking.hostName = "bemmer";
networking.domain = "c3h";
networking.useDHCP = true;
nixpkgs.system = "aarch64-linux";
boot.initrd.availableKernelModules = lib.mkForce [ "vc4" "i2c_bcm2835" ];
boot.supportedFilesystems = lib.mkForce [ "ext4" "vfat" ];
boot.kernelPackages = pkgs.linuxPackages_rpi4;
documentation.enable = false;
hardware.raspberry-pi."4" = {
fkms-3d.enable = true;
#audio.enable = true;
};
hardware.raspberry-pi."4".fkms-3d.enable = true;
system.stateVersion = "21.05";
}

View file

@ -8,7 +8,7 @@
# services
../../shared-services/pulseaudio.nix
../../shared-services/nfs-server.nix
../../shared-services/nfs-client.nix
../../shared-services/mpd.nix
../../shared-services/ympd.nix
../../shared-services/spotifyd.nix

View file

@ -23,7 +23,7 @@
fsType = "vfat";
};
fileSystems."/mnt" =
fileSystems."/mnt/hdd" =
{ device = "/dev/disk/by-uuid/ff18a6f9-ee3b-452c-8671-38b74508a74c";
fsType = "btrfs";
};

View file

@ -0,0 +1,15 @@
{ ... }:
{
boot.supportedFilesystems = [ "nfs" ];
fileSystems."/mnt/Music" = {
device = "10.23.42.126:/music";
fsType = "nfs";
options = [
"nfsvers=4.1"
"noauto"
"x-systemd.automount"
"x-systemd.idle-timeout=600"
];
};
}

View file

@ -1,17 +0,0 @@
{ ... }:
{
services.nfs.server = {
enable = true;
exports = ''
/mnt 10.23.42.0/24(rw,fsid=0,insecure,no_subtree_check)
'';
statdPort = 4000;
lockdPort = 4001;
mountdPort = 4002;
};
networking.firewall.interfaces.enp3s0.allowedTCPPorts = [ 2049 4000 4001 4002 111 ];
networking.firewall.interfaces.enp3s0.allowedUDPPorts = [ 2049 4000 4001 4002 111 ];
}