Small changes everywhere:
This commit is contained in:
parent
b777ae2cf9
commit
85ea82a9ac
11 changed files with 13 additions and 16 deletions
|
@ -14,7 +14,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Network mounts
|
# Network mounts
|
||||||
"/home/${config.sysusers.main}/MidasNFS" = {
|
"/home/${config.sysusers.main}/Midas" = {
|
||||||
device = "10.100.0.1:/storage";
|
device = "10.100.0.1:/storage";
|
||||||
fsType = "nfs4";
|
fsType = "nfs4";
|
||||||
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
fileSystems."/home/${config.sysusers.main}/MidasNFS" = {
|
fileSystems."/home/${config.sysusers.main}/Midas" = {
|
||||||
device = "10.100.0.1:/storage";
|
device = "10.100.0.1:/storage";
|
||||||
fsType = "nfs4";
|
fsType = "nfs4";
|
||||||
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
device = "/dev/disk/by-uuid/582C6B802C6B57D0";
|
device = "/dev/disk/by-uuid/582C6B802C6B57D0";
|
||||||
options = [ "nosuid" "nodev" ];
|
options = [ "nosuid" "nodev" ];
|
||||||
};
|
};
|
||||||
"/home/${config.sysusers.main}/MidasNFS" = {
|
"/home/${config.sysusers.main}/Midas" = {
|
||||||
device = "10.100.0.1:/storage";
|
device = "10.100.0.1:/storage";
|
||||||
fsType = "nfs4";
|
fsType = "nfs4";
|
||||||
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Network mounts
|
# Network mounts
|
||||||
"/home/${config.sysusers.main}/MidasNFS" = {
|
"/home/${config.sysusers.main}/Midas" = {
|
||||||
device = "${config.ips.server}:/storage";
|
device = "${config.ips.server}:/storage";
|
||||||
fsType = "nfs4";
|
fsType = "nfs4";
|
||||||
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
|
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
|
||||||
|
|
|
@ -108,10 +108,10 @@
|
||||||
n:/etc/nixos
|
n:/etc/nixos
|
||||||
|
|
||||||
# Remote files
|
# Remote files
|
||||||
J:/home/${config.home.username}/MidasNFS
|
J:/home/${config.home.username}/Midas
|
||||||
K:/home/${config.home.username}/MidasNFS/Files
|
K:/home/${config.home.username}/Midas/Files
|
||||||
V:/home/${config.home.username}/MidasNFS/Media
|
V:/home/${config.home.username}/Midas/Media
|
||||||
M:/home/${config.home.username}/MidasNFS/Music
|
M:/home/${config.home.username}/Midas/Music
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
services.mpd = {
|
services.mpd = {
|
||||||
enable = config.home.desktop.enable;
|
enable = config.home.desktop.enable;
|
||||||
network.startWhenNeeded = true;
|
network.startWhenNeeded = true;
|
||||||
musicDirectory = "/home/${config.home.username}/MidasNFS/Music/NixBops";
|
musicDirectory = "/home/${config.home.username}/Midas/Music/NixBops";
|
||||||
playlistDirectory = "/home/${config.home.username}/MidasNFS/Music/NixBops/Playlists";
|
playlistDirectory = "/home/${config.home.username}/Midas/Music/NixBops/Playlists";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
audio_output {
|
audio_output {
|
||||||
type "pipewire"
|
type "pipewire"
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
/storage/Files *(rw,sync,no_subtree_check)
|
/storage/Files *(rw,sync,no_subtree_check)
|
||||||
/storage/Media *(rw,sync,no_subtree_check)
|
/storage/Media *(rw,sync,no_subtree_check)
|
||||||
/storage/Music *(rw,sync,no_subtree_check)
|
/storage/Music *(rw,sync,no_subtree_check)
|
||||||
|
/srv/minecraft *(rw,sync,no_subtree_check)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,14 +10,13 @@
|
||||||
listen.port = 73;
|
listen.port = 73;
|
||||||
hostname = "radio.nixfox.ca";
|
hostname = "radio.nixfox.ca";
|
||||||
admin = {
|
admin = {
|
||||||
user = "${config.sysusers.main}";
|
user = config.sysusers.main;
|
||||||
password = "${config.secrets.cast.adminPass}";
|
password = config.secrets.cast.adminPass;
|
||||||
};
|
};
|
||||||
extraConf = ''
|
extraConf = ''
|
||||||
<authentication>
|
<authentication>
|
||||||
<source-password>${config.secrets.cast.sourcePass}</source-password>
|
<source-password>${config.secrets.cast.sourcePass}</source-password>
|
||||||
</authentication>
|
</authentication>
|
||||||
|
|
||||||
<location>Canada</location>
|
<location>Canada</location>
|
||||||
<admin>contact@nixfox.ca</admin>
|
<admin>contact@nixfox.ca</admin>
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
# Essentials (Global)
|
# Essentials (Global)
|
||||||
|
|
||||||
# A color code between 0-9 or a-f. Set to 'none' to disable.
|
# 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'
|
ops-name-color: 'none'
|
||||||
|
|
||||||
# The character(s) to prefix all nicknames, so that you know they are not true usernames.
|
# The character(s) to prefix all nicknames, so that you know they are not true usernames.
|
||||||
|
|
|
@ -27,7 +27,6 @@ spectator_player_possession=false
|
||||||
# If players without the mod should get kicked from the server
|
# If players without the mod should get kicked from the server
|
||||||
force_voice_chat=false
|
force_voice_chat=false
|
||||||
# The amount of milliseconds, the server should wait to check if the player has the mod installed
|
# 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
|
login_timeout=10000
|
||||||
# The range where the voice chat should broadcast audio to
|
# The range where the voice chat should broadcast audio to
|
||||||
# A value <0 means 'max_voice_distance'
|
# A value <0 means 'max_voice_distance'
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8060;
|
port = 8060;
|
||||||
rtmp-port = 1945;
|
rtmp-port = 1945;
|
||||||
listen = "0.0.0.0";
|
|
||||||
};
|
};
|
||||||
environment.persistence."/persist".directories = [ "/var/lib/owncast" ];
|
environment.persistence."/persist".directories = [ "/var/lib/owncast" ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue