diff --git a/home/dev/all/extra.nix b/home/dev/all/extra.nix index 51f4645..2e6b537 100644 --- a/home/dev/all/extra.nix +++ b/home/dev/all/extra.nix @@ -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 ]; } diff --git a/home/gui/xdg.nix b/home/gui/xdg.nix index 9458a41..0dae732 100644 --- a/home/gui/xdg.nix +++ b/home/gui/xdg.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ xdg-utils ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ xdg-utils ]; } diff --git a/hosts/hetzner-vm/services/mpd-broadcast/broadcast.nix b/hosts/hetzner-vm/services/mpd-broadcast/broadcast.nix index a592ccf..04c76b1 100644 --- a/hosts/hetzner-vm/services/mpd-broadcast/broadcast.nix +++ b/hosts/hetzner-vm/services/mpd-broadcast/broadcast.nix @@ -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 ]; } diff --git a/hosts/hetzner-vm/services/mpd.nix b/hosts/hetzner-vm/services/mpd.nix index 243949f..25b495d 100644 --- a/hosts/hetzner-vm/services/mpd.nix +++ b/hosts/hetzner-vm/services/mpd.nix @@ -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" = { diff --git a/hosts/hetzner-vm/services/storage-sftp.nix b/hosts/hetzner-vm/services/storage-sftp.nix index efab6a6..7b96b62 100644 --- a/hosts/hetzner-vm/services/storage-sftp.nix +++ b/hosts/hetzner-vm/services/storage-sftp.nix @@ -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 ]; } diff --git a/hosts/lappy/profiles/mpd-music-sync.nix b/hosts/lappy/profiles/mpd-music-sync.nix index 3dc0d02..de27474 100644 --- a/hosts/lappy/profiles/mpd-music-sync.nix +++ b/hosts/lappy/profiles/mpd-music-sync.nix @@ -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 = { diff --git a/hosts/lappy/profiles/mpd.nix b/hosts/lappy/profiles/mpd.nix index 1032376..b52f367 100644 --- a/hosts/lappy/profiles/mpd.nix +++ b/hosts/lappy/profiles/mpd.nix @@ -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" ]; } diff --git a/hosts/raspberry/boot.nix b/hosts/raspberry/boot.nix index 8fc38e3..8e99023 100644 --- a/hosts/raspberry/boot.nix +++ b/hosts/raspberry/boot.nix @@ -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 diff --git a/hosts/raspberry/services/btattach.nix b/hosts/raspberry/services/btattach.nix index 8b6c6c7..0ef275c 100644 --- a/hosts/raspberry/services/btattach.nix +++ b/hosts/raspberry/services/btattach.nix @@ -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"; }; }; } diff --git a/profiles/sound/pulseaudio/pulse-bluetooth.nix b/profiles/sound/pulseaudio/pulse-bluetooth.nix index 060628a..045ce1a 100644 --- a/profiles/sound/pulseaudio/pulse-bluetooth.nix +++ b/profiles/sound/pulseaudio/pulse-bluetooth.nix @@ -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 ]; diff --git a/profiles/sound/pulseaudio/pulse-systemwide.nix b/profiles/sound/pulseaudio/pulse-systemwide.nix index 7fa3f6e..db7b9bf 100644 --- a/profiles/sound/pulseaudio/pulse-systemwide.nix +++ b/profiles/sound/pulseaudio/pulse-systemwide.nix @@ -1,7 +1,7 @@ -{tree, ...}: { +{ tree, ... }: { imports = with tree; [ profiles.sound.pulseaudio.pulse ]; hardware.pulseaudio = { systemWide = true; enable = true; }; -} \ No newline at end of file +} diff --git a/profiles/sound/pulseaudio/pulse.nix b/profiles/sound/pulseaudio/pulse.nix index 50e2135..cd5b5ca 100644 --- a/profiles/sound/pulseaudio/pulse.nix +++ b/profiles/sound/pulseaudio/pulse.nix @@ -1,7 +1,5 @@ { config, pkgs, ... }: { sound.enable = true; nixpkgs.config.pulseaudio = true; - hardware.pulseaudio = { - enable = true; - }; + hardware.pulseaudio = { enable = true; }; }