This commit is contained in:
ChaotiCryptidz 2022-01-25 13:01:22 +00:00
parent bfe467a9eb
commit 66092dd42c
12 changed files with 33 additions and 47 deletions

View file

@ -1,11 +1,3 @@
{ pkgs, inputs, ... }: {
home.packages = with pkgs; [
jq
ripgrep
fd
pv
tmux
socat
file
];
home.packages = with pkgs; [ jq ripgrep fd pv tmux socat file ];
}

View file

@ -1,3 +1 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ xdg-utils ];
}
{ pkgs, ... }: { home.packages = with pkgs; [ xdg-utils ]; }

View file

@ -1,11 +1,10 @@
{ tree, ... }: {
imports = with tree; [
# systemwide pulseaudio w/ recv native localhost
# to broadcast to all speakers over rtp
profiles.sound.pulseaudio.pulse-systemwide
profiles.sound.pulseaudio.pulse-recv-native-localhost
] ++ [
./hosts/lappy.nix
];
imports = with tree;
[
# systemwide pulseaudio w/ recv native localhost
# to broadcast to all speakers over rtp
profiles.sound.pulseaudio.pulse-systemwide
profiles.sound.pulseaudio.pulse-recv-native-localhost
] ++ [ ./hosts/lappy.nix ];
}

View file

@ -1,7 +1,5 @@
{ pkgs, lib, tree, ... }: {
imports = [
./mpd-broadcast/broadcast.nix
];
imports = [ ./mpd-broadcast/broadcast.nix ];
environment.systemPackages = with pkgs; [ mpc_cli ];
@ -32,7 +30,7 @@
'';
};
systemd.services.mpd.serviceConfig.After = ["pulseaudio.service"];
systemd.services.mpd.serviceConfig.After = [ "pulseaudio.service" ];
systemd.services.mpd.serviceConfig.StateDirectory = [ "/mpd" ];
services.nginx.virtualHosts."stream.owo.monster" = {

View file

@ -1,22 +1,25 @@
{ ... }: {
services.vsftpd = {
{ ... }: {
services.vsftpd = {
enable = true;
extraConfig = ''
listen_port=4220
pasv_enable=Yes
pasv_min_port=51000
pasv_max_port=51999
'';
'';
localUsers = true;
userlistEnable = true;
userlist = ["ftp-user"];
userlist = [ "ftp-user" ];
localRoot = "/storage";
};
users.users.ftp-user = {
isSystemUser = true;
group = "ftp-user";
};
users.groups.ftp-user = {};
networking.firewall.allowedTCPPortRanges = [ { from = 51000; to = 51999; } ];
users.groups.ftp-user = { };
networking.firewall.allowedTCPPortRanges = [{
from = 51000;
to = 51999;
}];
networking.firewall.allowedTCPPorts = [ 4220 ];
}

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: let
passwordFile = "/secrets/mpd-music-sync-password";
{ pkgs, ... }:
let passwordFile = "/secrets/mpd-music-sync-password";
in {
systemd.tmpfiles.rules = [ "d /music 0755 mpd users -" ];
systemd.services.mpd-music-sync = {

View file

@ -6,10 +6,11 @@
environment.systemPackages = with pkgs; [ mpc_cli roc-toolkit ];
systemd.tmpfiles.rules = [
systemd.tmpfiles.rules = [
"d /var/lib/mpd 0755 mpd mpd -"
"d /var/lib/mpd/data 0755 mpd mpd -"
"d /var/lib/mpd/playlists 0755 mpd mpd -" ];
"d /var/lib/mpd/playlists 0755 mpd mpd -"
];
services.mpd = {
enable = true;
@ -26,5 +27,6 @@
'';
};
systemd.services.mpd.serviceConfig.StateDirectory = [ "/music" "/var/lib/mpd" ];
systemd.services.mpd.serviceConfig.StateDirectory =
[ "/music" "/var/lib/mpd" ];
}

View file

@ -7,8 +7,7 @@
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TX1)
# - ttyAMA0: for QEMU's -machine virt
boot.kernelParams =
[ "console=tty0" ];
boot.kernelParams = [ "console=tty0" ];
sdImage = {
populateFirmwareCommands = let

View file

@ -4,8 +4,7 @@
after = [ "dev-ttyAMA0.device" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart =
"${pkgs.bluez}/bin/btattach -B /dev/ttyS1 -P bcm -S 3000000";
ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyS1 -P bcm -S 3000000";
};
};
}

View file

@ -1,7 +1,5 @@
{ pkgs, tree, lib, ... }: {
imports = with tree; [
profiles.connectivity.bluetooth
];
imports = with tree; [ profiles.connectivity.bluetooth ];
hardware.pulseaudio = {
extraModules = with pkgs; [ pkgs.pulseaudio-modules-bt ];

View file

@ -1,7 +1,7 @@
{tree, ...}: {
{ tree, ... }: {
imports = with tree; [ profiles.sound.pulseaudio.pulse ];
hardware.pulseaudio = {
systemWide = true;
enable = true;
};
}
}

View file

@ -1,7 +1,5 @@
{ config, pkgs, ... }: {
sound.enable = true;
nixpkgs.config.pulseaudio = true;
hardware.pulseaudio = {
enable = true;
};
hardware.pulseaudio = { enable = true; };
}