From 85ea82a9ac871a5e8b301efa81e1d088618e446c Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 14 Mar 2025 15:21:37 -0400 Subject: [PATCH] Small changes everywhere: --- hosts/envy/filesystems/default.nix | 2 +- hosts/pear/filesystems/default.nix | 2 +- hosts/redmond/filesystems/default.nix | 2 +- hosts/tower/filesystems/default.nix | 2 +- modules/home/programs/terminal/ranger/default.nix | 8 ++++---- modules/home/services/mpd/default.nix | 4 ++-- modules/system/services/server/fileserver/nfs/default.nix | 1 + modules/system/services/server/icecast/default.nix | 5 ++--- .../services/server/minecraft/common/essentialsconfig.yml | 1 - .../services/server/minecraft/common/vcserver.properties | 1 - .../services/server/socialserver/owncast/default.nix | 1 - 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/hosts/envy/filesystems/default.nix b/hosts/envy/filesystems/default.nix index 5a0a4c4..9b6cece 100644 --- a/hosts/envy/filesystems/default.nix +++ b/hosts/envy/filesystems/default.nix @@ -14,7 +14,7 @@ }; # Network mounts - "/home/${config.sysusers.main}/MidasNFS" = { + "/home/${config.sysusers.main}/Midas" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/pear/filesystems/default.nix b/hosts/pear/filesystems/default.nix index 4d04ac2..9cd40ca 100644 --- a/hosts/pear/filesystems/default.nix +++ b/hosts/pear/filesystems/default.nix @@ -1,6 +1,6 @@ { config, ... }: { - fileSystems."/home/${config.sysusers.main}/MidasNFS" = { + fileSystems."/home/${config.sysusers.main}/Midas" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/redmond/filesystems/default.nix b/hosts/redmond/filesystems/default.nix index 394a938..25ea2bb 100644 --- a/hosts/redmond/filesystems/default.nix +++ b/hosts/redmond/filesystems/default.nix @@ -5,7 +5,7 @@ device = "/dev/disk/by-uuid/582C6B802C6B57D0"; options = [ "nosuid" "nodev" ]; }; - "/home/${config.sysusers.main}/MidasNFS" = { + "/home/${config.sysusers.main}/Midas" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix index 51e8ce4..d90163c 100644 --- a/hosts/tower/filesystems/default.nix +++ b/hosts/tower/filesystems/default.nix @@ -39,7 +39,7 @@ }; # Network mounts - "/home/${config.sysusers.main}/MidasNFS" = { + "/home/${config.sysusers.main}/Midas" = { device = "${config.ips.server}:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index 5c56325..8fc590a 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -108,10 +108,10 @@ n:/etc/nixos # Remote files - J:/home/${config.home.username}/MidasNFS - K:/home/${config.home.username}/MidasNFS/Files - V:/home/${config.home.username}/MidasNFS/Media - M:/home/${config.home.username}/MidasNFS/Music + J:/home/${config.home.username}/Midas + K:/home/${config.home.username}/Midas/Files + V:/home/${config.home.username}/Midas/Media + M:/home/${config.home.username}/Midas/Music ''; }; packages = with pkgs; [ diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index 960fe1e..58e07b4 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -3,8 +3,8 @@ services.mpd = { enable = config.home.desktop.enable; network.startWhenNeeded = true; - musicDirectory = "/home/${config.home.username}/MidasNFS/Music/NixBops"; - playlistDirectory = "/home/${config.home.username}/MidasNFS/Music/NixBops/Playlists"; + musicDirectory = "/home/${config.home.username}/Midas/Music/NixBops"; + playlistDirectory = "/home/${config.home.username}/Midas/Music/NixBops/Playlists"; extraConfig = '' audio_output { type "pipewire" diff --git a/modules/system/services/server/fileserver/nfs/default.nix b/modules/system/services/server/fileserver/nfs/default.nix index 031de4e..a346ad0 100644 --- a/modules/system/services/server/fileserver/nfs/default.nix +++ b/modules/system/services/server/fileserver/nfs/default.nix @@ -6,6 +6,7 @@ /storage/Files *(rw,sync,no_subtree_check) /storage/Media *(rw,sync,no_subtree_check) /storage/Music *(rw,sync,no_subtree_check) + /srv/minecraft *(rw,sync,no_subtree_check) ''; }; } diff --git a/modules/system/services/server/icecast/default.nix b/modules/system/services/server/icecast/default.nix index b05ee0f..1c0387c 100644 --- a/modules/system/services/server/icecast/default.nix +++ b/modules/system/services/server/icecast/default.nix @@ -10,14 +10,13 @@ listen.port = 73; hostname = "radio.nixfox.ca"; admin = { - user = "${config.sysusers.main}"; - password = "${config.secrets.cast.adminPass}"; + user = config.sysusers.main; + password = config.secrets.cast.adminPass; }; extraConf = '' ${config.secrets.cast.sourcePass} - Canada contact@nixfox.ca ''; diff --git a/modules/system/services/server/minecraft/common/essentialsconfig.yml b/modules/system/services/server/minecraft/common/essentialsconfig.yml index 53aaff7..b616c00 100644 --- a/modules/system/services/server/minecraft/common/essentialsconfig.yml +++ b/modules/system/services/server/minecraft/common/essentialsconfig.yml @@ -15,7 +15,6 @@ # Essentials (Global) # A color code between 0-9 or a-f. Set to 'none' to disable. -# In 1.16+ you can use hex color codes here as well. (For example, #613e1d is brown). ops-name-color: 'none' # The character(s) to prefix all nicknames, so that you know they are not true usernames. diff --git a/modules/system/services/server/minecraft/common/vcserver.properties b/modules/system/services/server/minecraft/common/vcserver.properties index 95e95bf..1174f26 100644 --- a/modules/system/services/server/minecraft/common/vcserver.properties +++ b/modules/system/services/server/minecraft/common/vcserver.properties @@ -27,7 +27,6 @@ spectator_player_possession=false # If players without the mod should get kicked from the server force_voice_chat=false # The amount of milliseconds, the server should wait to check if the player has the mod installed -# Only active when force_voice_chat is set to true login_timeout=10000 # The range where the voice chat should broadcast audio to # A value <0 means 'max_voice_distance' diff --git a/modules/system/services/server/socialserver/owncast/default.nix b/modules/system/services/server/socialserver/owncast/default.nix index 2b17504..72c034a 100644 --- a/modules/system/services/server/socialserver/owncast/default.nix +++ b/modules/system/services/server/socialserver/owncast/default.nix @@ -7,7 +7,6 @@ enable = true; port = 8060; rtmp-port = 1945; - listen = "0.0.0.0"; }; environment.persistence."/persist".directories = [ "/var/lib/owncast" ]; };