nixpkgs-fmt everything
This commit is contained in:
parent
3c683e7b9e
commit
f68a4f4431
@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.system.autoUpgrade;
|
cfg = config.system.autoUpgrade;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
|
flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.bios;
|
cfg = config.bios;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.bios = {
|
options.bios = {
|
||||||
enable = mkEnableOption "enable bios boot";
|
enable = mkEnableOption "enable bios boot";
|
||||||
device = mkOption {
|
device = mkOption {
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.efi;
|
cfg = config.efi;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.efi = {
|
options.efi = {
|
||||||
enable = mkEnableOption "enable efi boot";
|
enable = mkEnableOption "enable efi boot";
|
||||||
};
|
};
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.firmware;
|
cfg = config.firmware;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.firmware.x86_64 = {
|
options.firmware.x86_64 = {
|
||||||
enable = mkEnableOption "enable x86_64 firmware";
|
enable = mkEnableOption "enable x86_64 firmware";
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.remoteLuksUnlock;
|
cfg = config.remoteLuksUnlock;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.remoteLuksUnlock = {
|
options.remoteLuksUnlock = {
|
||||||
enable = lib.mkEnableOption "enable luks root remote decrypt over ssh/tor";
|
enable = lib.mkEnableOption "enable luks root remote decrypt over ssh/tor";
|
||||||
enableTorUnlock = lib.mkOption {
|
enableTorUnlock = lib.mkOption {
|
||||||
@ -61,18 +62,22 @@ in {
|
|||||||
copy_bin_and_libs ${pkgs.haveged}/bin/haveged
|
copy_bin_and_libs ${pkgs.haveged}/bin/haveged
|
||||||
'';
|
'';
|
||||||
boot.initrd.network.postCommands = lib.mkMerge [
|
boot.initrd.network.postCommands = lib.mkMerge [
|
||||||
(''
|
(
|
||||||
|
''
|
||||||
# Add nice prompt for giving LUKS passphrase over ssh
|
# Add nice prompt for giving LUKS passphrase over ssh
|
||||||
echo 'read -s -p "Unlock Passphrase: " passphrase && echo $passphrase > /crypt-ramfs/passphrase && exit' >> /root/.profile
|
echo 'read -s -p "Unlock Passphrase: " passphrase && echo $passphrase > /crypt-ramfs/passphrase && exit' >> /root/.profile
|
||||||
'')
|
''
|
||||||
|
)
|
||||||
|
|
||||||
(let torRc = (pkgs.writeText "tor.rc" ''
|
(
|
||||||
|
let torRc = (pkgs.writeText "tor.rc" ''
|
||||||
DataDirectory /etc/tor
|
DataDirectory /etc/tor
|
||||||
SOCKSPort 127.0.0.1:9050 IsolateDestAddr
|
SOCKSPort 127.0.0.1:9050 IsolateDestAddr
|
||||||
SOCKSPort 127.0.0.1:9063
|
SOCKSPort 127.0.0.1:9063
|
||||||
HiddenServiceDir /etc/tor/onion/bootup
|
HiddenServiceDir /etc/tor/onion/bootup
|
||||||
HiddenServicePort 22 127.0.0.1:22
|
HiddenServicePort 22 127.0.0.1:22
|
||||||
''); in lib.mkIf cfg.enableTorUnlock ''
|
''); in
|
||||||
|
lib.mkIf cfg.enableTorUnlock ''
|
||||||
echo "tor: preparing onion folder"
|
echo "tor: preparing onion folder"
|
||||||
# have to do this otherwise tor does not want to start
|
# have to do this otherwise tor does not want to start
|
||||||
chmod -R 700 /etc/tor
|
chmod -R 700 /etc/tor
|
||||||
@ -87,7 +92,8 @@ in {
|
|||||||
echo "tor: starting tor"
|
echo "tor: starting tor"
|
||||||
tor -f ${torRc} --verify-config
|
tor -f ${torRc} --verify-config
|
||||||
tor -f ${torRc} &
|
tor -f ${torRc} &
|
||||||
'')
|
''
|
||||||
|
)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,8 @@ in
|
|||||||
wget
|
wget
|
||||||
kakoune
|
kakoune
|
||||||
htop
|
htop
|
||||||
git git-lfs
|
git
|
||||||
|
git-lfs
|
||||||
dnsutils
|
dnsutils
|
||||||
tmux
|
tmux
|
||||||
nethogs
|
nethogs
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.nix.flakes;
|
cfg = config.nix.flakes;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.nix.flakes = {
|
options.nix.flakes = {
|
||||||
enable = mkEnableOption "use nix flakes";
|
enable = mkEnableOption "use nix flakes";
|
||||||
};
|
};
|
||||||
|
@ -22,7 +22,8 @@ let
|
|||||||
ponyo = "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion";
|
ponyo = "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion";
|
||||||
s0 = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
|
s0 = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
programs.ssh.knownHosts = {
|
programs.ssh.knownHosts = {
|
||||||
ponyo = {
|
ponyo = {
|
||||||
hostNames = [ "ponyo" "ponyo.neet.dev" "git.neet.dev" ];
|
hostNames = [ "ponyo" "ponyo.neet.dev" "git.neet.dev" ];
|
||||||
|
@ -72,7 +72,8 @@ let
|
|||||||
portForwarding = cfg.forwardPortForTransmission || cfg.forwardedPort != null;
|
portForwarding = cfg.forwardPortForTransmission || cfg.forwardedPort != null;
|
||||||
|
|
||||||
containerServiceName = "container@${config.vpn-container.containerName}.service";
|
containerServiceName = "container@${config.vpn-container.containerName}.service";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pia.wireguard = {
|
options.pia.wireguard = {
|
||||||
enable = mkEnableOption "Enable private internet access";
|
enable = mkEnableOption "Enable private internet access";
|
||||||
badPortForwardPorts = mkOption {
|
badPortForwardPorts = mkOption {
|
||||||
|
@ -33,7 +33,8 @@ let
|
|||||||
serviceList = map serviceTemplate cfg.hosts;
|
serviceList = map serviceTemplate cfg.hosts;
|
||||||
|
|
||||||
services = combineAttrs serviceList;
|
services = combineAttrs serviceList;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.keepalive-ping = {
|
options.keepalive-ping = {
|
||||||
enable = mkEnableOption "Enable keep alive ping task";
|
enable = mkEnableOption "Enable keep alive ping task";
|
||||||
hosts = mkOption {
|
hosts = mkOption {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# enable pulseaudio support for packages
|
# enable pulseaudio support for packages
|
||||||
nixpkgs.config.pulseaudio = true;
|
nixpkgs.config.pulseaudio = true;
|
||||||
|
@ -49,7 +49,8 @@ let
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# chromium with specific extensions + settings
|
# chromium with specific extensions + settings
|
||||||
programs.chromium = {
|
programs.chromium = {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./kde.nix
|
./kde.nix
|
||||||
./xfce.nix
|
./xfce.nix
|
||||||
@ -52,6 +53,10 @@ in {
|
|||||||
jellyfin-media-player
|
jellyfin-media-player
|
||||||
joplin-desktop
|
joplin-desktop
|
||||||
config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
|
config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
|
||||||
|
|
||||||
|
# For Nix IDE
|
||||||
|
nixpkgs-fmt
|
||||||
|
rnix-lsp
|
||||||
];
|
];
|
||||||
|
|
||||||
# Networking
|
# Networking
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
users.users.googlebot.packages = [
|
users.users.googlebot.packages = [
|
||||||
pkgs.discord
|
pkgs.discord
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# kde plasma
|
# kde plasma
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
@ -14,7 +14,8 @@ let
|
|||||||
version_opts = "vers=3.1.1";
|
version_opts = "vers=3.1.1";
|
||||||
|
|
||||||
opts = "${systemd_opts},${network_opts},${user_opts},${version_opts},${auth_opts}";
|
opts = "${systemd_opts},${network_opts},${user_opts},${version_opts},${auth_opts}";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.mount-samba = {
|
options.services.mount-samba = {
|
||||||
enable = lib.mkEnableOption "enable mounting samba shares";
|
enable = lib.mkEnableOption "enable mounting samba shares";
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(self: super: {
|
(self: super: {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
hardware.steam-hardware.enable = true; # steam controller
|
hardware.steam-hardware.enable = true; # steam controller
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(self: super: {
|
(self: super: {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de.touchpad;
|
cfg = config.de.touchpad;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.de.touchpad = {
|
options.de.touchpad = {
|
||||||
enable = lib.mkEnableOption "enable touchpad";
|
enable = lib.mkEnableOption "enable touchpad";
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.de;
|
cfg = config.de;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# yubikey
|
# yubikey
|
||||||
services.pcscd.enable = true;
|
services.pcscd.enable = true;
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.ceph;
|
cfg = config.ceph;
|
||||||
in {
|
in
|
||||||
options.ceph = {
|
{
|
||||||
};
|
options.ceph = { };
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
# ceph.enable = true;
|
# ceph.enable = true;
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.gitea;
|
cfg = config.services.gitea;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.gitea = {
|
options.services.gitea = {
|
||||||
hostname = lib.mkOption {
|
hostname = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.icecast;
|
cfg = config.services.icecast;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.icecast = {
|
options.services.icecast = {
|
||||||
mount = lib.mkOption {
|
mount = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.iodine.server;
|
cfg = config.services.iodine.server;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# iodine DNS-based vpn
|
# iodine DNS-based vpn
|
||||||
services.iodine.server = {
|
services.iodine.server = {
|
||||||
|
@ -15,7 +15,8 @@ let
|
|||||||
"bsd.ninja"
|
"bsd.ninja"
|
||||||
"bsd.rocks"
|
"bsd.rocks"
|
||||||
];
|
];
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# kresd doesn't work with tailscale MagicDNS
|
# kresd doesn't work with tailscale MagicDNS
|
||||||
mailserver.localDnsResolver = false;
|
mailserver.localDnsResolver = false;
|
||||||
@ -60,9 +61,11 @@ in {
|
|||||||
sender_dependent_relayhost_maps = "hash:/var/lib/postfix/conf/sender_relay";
|
sender_dependent_relayhost_maps = "hash:/var/lib/postfix/conf/sender_relay";
|
||||||
smtp_sender_dependent_authentication = "yes";
|
smtp_sender_dependent_authentication = "yes";
|
||||||
};
|
};
|
||||||
services.postfix.mapFiles.sender_relay = let
|
services.postfix.mapFiles.sender_relay =
|
||||||
|
let
|
||||||
relayHost = "[smtp.mailgun.org]:587";
|
relayHost = "[smtp.mailgun.org]:587";
|
||||||
in pkgs.writeText "sender_relay"
|
in
|
||||||
|
pkgs.writeText "sender_relay"
|
||||||
(concatStringsSep "\n" (map (domain: "@${domain} ${relayHost}") domains));
|
(concatStringsSep "\n" (map (domain: "@${domain} ${relayHost}") domains));
|
||||||
services.postfix.mapFiles.sasl_relay_passwd = "/run/agenix/sasl_relay_passwd";
|
services.postfix.mapFiles.sasl_relay_passwd = "/run/agenix/sasl_relay_passwd";
|
||||||
age.secrets.sasl_relay_passwd.file = ../../secrets/sasl_relay_passwd.age;
|
age.secrets.sasl_relay_passwd.file = ../../secrets/sasl_relay_passwd.age;
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
let
|
let
|
||||||
cfg = config.services.matrix;
|
cfg = config.services.matrix;
|
||||||
certs = config.security.acme.certs;
|
certs = config.security.acme.certs;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.matrix = {
|
options.services.matrix = {
|
||||||
enable = lib.mkEnableOption "enable matrix";
|
enable = lib.mkEnableOption "enable matrix";
|
||||||
element-web = {
|
element-web = {
|
||||||
@ -137,7 +138,8 @@ in {
|
|||||||
];
|
];
|
||||||
locations."/".proxyPass = "http://localhost:${toString cfg.port}";
|
locations."/".proxyPass = "http://localhost:${toString cfg.port}";
|
||||||
};
|
};
|
||||||
virtualHosts.${cfg.turn.host} = { # get TLS cert for TURN server
|
virtualHosts.${cfg.turn.host} = {
|
||||||
|
# get TLS cert for TURN server
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
};
|
};
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
let
|
let
|
||||||
cfg = config.services.murmur;
|
cfg = config.services.murmur;
|
||||||
certs = config.security.acme.certs;
|
certs = config.security.acme.certs;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.murmur.domain = lib.mkOption {
|
options.services.murmur.domain = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
};
|
};
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.nextcloud;
|
cfg = config.services.nextcloud;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
https = true;
|
https = true;
|
||||||
|
@ -5,7 +5,8 @@ let
|
|||||||
nginxWithRTMP = pkgs.nginx.override {
|
nginxWithRTMP = pkgs.nginx.override {
|
||||||
modules = [ pkgs.nginxModules.rtmp ];
|
modules = [ pkgs.nginxModules.rtmp ];
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.nginx.stream = {
|
options.services.nginx.stream = {
|
||||||
enable = lib.mkEnableOption "enable nginx rtmp/hls/dash video streaming";
|
enable = lib.mkEnableOption "enable nginx rtmp/hls/dash video streaming";
|
||||||
port = lib.mkOption {
|
port = lib.mkOption {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.nginx;
|
cfg = config.services.nginx;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
|
@ -4,7 +4,8 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.owncast;
|
cfg = config.services.owncast;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.owncast = {
|
options.services.owncast = {
|
||||||
hostname = lib.mkOption {
|
hostname = lib.mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
@ -14,7 +14,8 @@ let
|
|||||||
cp -ar $src $out
|
cp -ar $src $out
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.privatebin = {
|
options.services.privatebin = {
|
||||||
enable = lib.mkEnableOption "enable privatebin";
|
enable = lib.mkEnableOption "enable privatebin";
|
||||||
host = lib.mkOption {
|
host = lib.mkOption {
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
let
|
let
|
||||||
cfg = config.services.radio;
|
cfg = config.services.radio;
|
||||||
radioPackage = config.inputs.radio.packages.${config.currentSystem}.radio;
|
radioPackage = config.inputs.radio.packages.${config.currentSystem}.radio;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.radio = {
|
options.services.radio = {
|
||||||
enable = lib.mkEnableOption "enable radio";
|
enable = lib.mkEnableOption "enable radio";
|
||||||
user = lib.mkOption {
|
user = lib.mkOption {
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.searx;
|
cfg = config.services.searx;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.searx = {
|
services.searx = {
|
||||||
environmentFile = "/run/agenix/searx";
|
environmentFile = "/run/agenix/searx";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.thelounge;
|
cfg = config.services.thelounge;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.thelounge = {
|
options.services.thelounge = {
|
||||||
fileUploadBaseUrl = lib.mkOption {
|
fileUploadBaseUrl = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
@ -79,8 +79,11 @@ in
|
|||||||
"${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}:${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}/udp"
|
"${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}:${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}/udp"
|
||||||
];
|
];
|
||||||
cmd = [
|
cmd = [
|
||||||
"lightspeed-webrtc" "--addr=0.0.0.0" "--ip=${domain}"
|
"lightspeed-webrtc"
|
||||||
"--ports=${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}" "run"
|
"--addr=0.0.0.0"
|
||||||
|
"--ip=${domain}"
|
||||||
|
"--ports=${toStr webrtc-peer-lower-port}-${toStr webrtc-peer-upper-port}"
|
||||||
|
"run"
|
||||||
];
|
];
|
||||||
# imageFile = pkgs.dockerTools.pullImage {
|
# imageFile = pkgs.dockerTools.pullImage {
|
||||||
# imageName = "projectlightspeed/webrtc";
|
# imageName = "projectlightspeed/webrtc";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.zerobin;
|
cfg = config.services.zerobin;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.zerobin = {
|
options.services.zerobin = {
|
||||||
host = lib.mkOption {
|
host = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
12
flake.nix
12
flake.nix
@ -80,7 +80,8 @@
|
|||||||
};
|
};
|
||||||
patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
|
patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
|
||||||
|
|
||||||
in patchedNixpkgs.lib.nixosSystem {
|
in
|
||||||
|
patchedNixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = allModules ++ [ path ];
|
modules = allModules ++ [ path ];
|
||||||
|
|
||||||
@ -97,7 +98,8 @@
|
|||||||
"s0" = mkSystem "x86_64-linux" nixpkgs ./machines/storage/s0/configuration.nix;
|
"s0" = mkSystem "x86_64-linux" nixpkgs ./machines/storage/s0/configuration.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
packages = let
|
packages =
|
||||||
|
let
|
||||||
mkKexec = system:
|
mkKexec = system:
|
||||||
(nixpkgs.lib.nixosSystem {
|
(nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
@ -108,7 +110,8 @@
|
|||||||
inherit system;
|
inherit system;
|
||||||
modules = [ ./machines/ephemeral/iso.nix ];
|
modules = [ ./machines/ephemeral/iso.nix ];
|
||||||
}).config.system.build.isoImage;
|
}).config.system.build.isoImage;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
"x86_64-linux"."kexec" = mkKexec "x86_64-linux";
|
"x86_64-linux"."kexec" = mkKexec "x86_64-linux";
|
||||||
"x86_64-linux"."iso" = mkIso "x86_64-linux";
|
"x86_64-linux"."iso" = mkIso "x86_64-linux";
|
||||||
"aarch64-linux"."kexec" = mkKexec "aarch64-linux";
|
"aarch64-linux"."kexec" = mkKexec "aarch64-linux";
|
||||||
@ -124,7 +127,8 @@
|
|||||||
profiles.system.path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configName};
|
profiles.system.path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configName};
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
s0 = mkDeploy "s0" "s0";
|
s0 = mkDeploy "s0" "s0";
|
||||||
router = mkDeploy "router" "router";
|
router = mkDeploy "router" "router";
|
||||||
ponyo = mkDeploy "ponyo" "ponyo.neet.dev";
|
ponyo = mkDeploy "ponyo" "ponyo.neet.dev";
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "e1000" "e1000e" "virtio_pci" "r8169" ];
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "e1000" "e1000e" "virtio_pci" "r8169" ];
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues
|
"panic=30"
|
||||||
|
"boot.panic_on_fail" # reboot the machine upon fatal boot issues
|
||||||
"console=ttyS0,115200" # enable serial console
|
"console=ttyS0,115200" # enable serial console
|
||||||
"console=tty1"
|
"console=tty1"
|
||||||
];
|
];
|
||||||
@ -21,7 +22,8 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
cryptsetup
|
cryptsetup
|
||||||
btrfs-progs
|
btrfs-progs
|
||||||
git git-lfs
|
git
|
||||||
|
git-lfs
|
||||||
wget
|
wget
|
||||||
htop
|
htop
|
||||||
dnsutils
|
dnsutils
|
||||||
|
@ -12,12 +12,14 @@
|
|||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/02a8c0c7-fd4e-4443-a83c-2d0b63848779";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/02a8c0c7-fd4e-4443-a83c-2d0b63848779";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/0C95-1290";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/0C95-1290";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
[
|
||||||
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ];
|
||||||
@ -22,12 +23,14 @@
|
|||||||
boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"; # expanded disk
|
boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"; # expanded disk
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/mapper/enc-pv";
|
{
|
||||||
|
device = "/dev/mapper/enc-pv";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/d3a3777d-1e70-47fa-a274-804dc70ee7fd";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/d3a3777d-1e70-47fa-a274-804dc70ee7fd";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
# boot
|
# boot
|
||||||
@ -40,22 +41,24 @@
|
|||||||
allowDiscards = true;
|
allowDiscards = true;
|
||||||
};
|
};
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/vg/root";
|
{
|
||||||
|
device = "/dev/vg/root";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "/dev/vg/root";
|
{
|
||||||
|
device = "/dev/vg/root";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
options = [ "subvol=home" ];
|
||||||
};
|
};
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/2C85-2B59";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/2C85-2B59";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/vg/swap"; }
|
[{ device = "/dev/vg/swap"; }];
|
||||||
];
|
|
||||||
|
|
||||||
# high-resolution display
|
# high-resolution display
|
||||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||||
|
@ -10,7 +10,8 @@
|
|||||||
|
|
||||||
# Enable serial output
|
# Enable serial output
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues
|
"panic=30"
|
||||||
|
"boot.panic_on_fail" # reboot the machine upon fatal boot issues
|
||||||
"console=ttyS0,115200n8" # enable serial console
|
"console=ttyS0,115200n8" # enable serial console
|
||||||
];
|
];
|
||||||
boot.loader.grub.extraConfig = "
|
boot.loader.grub.extraConfig = "
|
||||||
@ -33,16 +34,17 @@
|
|||||||
remoteLuksUnlock.enable = true;
|
remoteLuksUnlock.enable = true;
|
||||||
boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c";
|
boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c";
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/d97f324f-3a2e-4b84-ae2a-4b3d1209c689";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/d97f324f-3a2e-4b84-ae2a-4b3d1209c689";
|
||||||
fsType = "ext3";
|
fsType = "ext3";
|
||||||
};
|
};
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/45bf58dd-67eb-45e4-9a98-246e23fa7abd"; }
|
[{ device = "/dev/disk/by-uuid/45bf58dd-67eb-45e4-9a98-246e23fa7abd"; }];
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
# boot
|
# boot
|
||||||
@ -31,28 +32,39 @@
|
|||||||
|
|
||||||
# mounts
|
# mounts
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "rpool/nixos/root";
|
{
|
||||||
fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
|
device = "rpool/nixos/root";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||||
};
|
};
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "rpool/nixos/home";
|
{
|
||||||
fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
|
device = "rpool/nixos/home";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||||
};
|
};
|
||||||
fileSystems."/var/lib" =
|
fileSystems."/var/lib" =
|
||||||
{ device = "rpool/nixos/var/lib";
|
{
|
||||||
fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
|
device = "rpool/nixos/var/lib";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||||
};
|
};
|
||||||
fileSystems."/var/log" =
|
fileSystems."/var/log" =
|
||||||
{ device = "rpool/nixos/var/log";
|
{
|
||||||
fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
|
device = "rpool/nixos/var/log";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/data" =
|
fileSystems."/data" =
|
||||||
{ device = "rpool/nixos/data";
|
{
|
||||||
fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
|
device = "rpool/nixos/data";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" "X-mount.mkdir" ];
|
||||||
};
|
};
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/4FB4-738E";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4FB4-738E";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user