diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/core/audio.nix | 1 | ||||
| -rw-r--r-- | os/core/networking.nix | 8 | ||||
| -rw-r--r-- | os/srv/bluetooth.nix | 9 | ||||
| -rw-r--r-- | os/srv/omnisearch.nix | 17 | ||||
| -rw-r--r-- | os/srv/sops.nix | 5 | ||||
| -rw-r--r-- | os/srv/srv.nix | 1 | ||||
| -rw-r--r-- | os/srv/yggdrasil.nix | 31 |
7 files changed, 68 insertions, 4 deletions
diff --git a/os/core/audio.nix b/os/core/audio.nix index 7527501..1e8985a 100644 --- a/os/core/audio.nix +++ b/os/core/audio.nix @@ -41,6 +41,7 @@ in security.rtkit.enable = true; environment.systemPackages = with pkgs; [ toggleMuteNotify + pulsemixer crosspipe alsa-utils ]; diff --git a/os/core/networking.nix b/os/core/networking.nix index bbfda8c..0a93cb9 100644 --- a/os/core/networking.nix +++ b/os/core/networking.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.os.core.network; in @@ -21,6 +26,7 @@ in allowedUDPPorts = [ ]; }; }; + environment.systemPackages = [ pkgs.impala ]; services.resolved.enable = true; systemd.services."NetworkManager-wait-online".enable = false; }; diff --git a/os/srv/bluetooth.nix b/os/srv/bluetooth.nix index a803c55..1705db6 100644 --- a/os/srv/bluetooth.nix +++ b/os/srv/bluetooth.nix @@ -1,14 +1,19 @@ -{ config, lib, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.os.srv.bluetooth; in { options.os.srv.bluetooth.enable = lib.mkEnableOption "enables bluetooth support"; config = lib.mkIf cfg.enable { - services.blueman.enable = true; hardware.bluetooth = { enable = true; powerOnBoot = true; }; + environment.systemPackages = [ pkgs.bluetui ]; }; } diff --git a/os/srv/omnisearch.nix b/os/srv/omnisearch.nix new file mode 100644 index 0000000..e3b05a0 --- /dev/null +++ b/os/srv/omnisearch.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + inputs, + ... +}: +let + cfg = config.os.srv.omnisearch; +in +{ + options.os.srv.omnisearch.enable = lib.mkEnableOption "enables omnisearch"; + # imports = [ inputs.omnisearch.nixosModules.default ]; + + config = lib.mkIf cfg.enable { + # services.omnisearch.enable = true; + }; +} diff --git a/os/srv/sops.nix b/os/srv/sops.nix index 6fac789..250b1c7 100644 --- a/os/srv/sops.nix +++ b/os/srv/sops.nix @@ -28,6 +28,11 @@ in "syncthing/encryption/keepass".owner = username; "vpn/warp_private_key".owner = "root"; "obs/websocket_password".owner = username; + "yggdrasil-private-key" = { + owner = "root"; + group = "wheel"; + mode = "0440"; + }; root_password.neededForUsers = true; user_password.neededForUsers = true; }; diff --git a/os/srv/srv.nix b/os/srv/srv.nix index a496a33..cfd4cfb 100644 --- a/os/srv/srv.nix +++ b/os/srv/srv.nix @@ -15,5 +15,6 @@ ./vpn.nix ./i2p.nix ./yggdrasil.nix + ./omnisearch.nix ]; } diff --git a/os/srv/yggdrasil.nix b/os/srv/yggdrasil.nix index 91bf6f0..7f95c00 100644 --- a/os/srv/yggdrasil.nix +++ b/os/srv/yggdrasil.nix @@ -7,8 +7,37 @@ let cfg = config.os.srv.yggdrasil; in { - options.os.srv.yggdrasil.enable = lib.mkEnableOption "enables yggdrasild"; + options.os.srv.yggdrasil.enable = lib.mkEnableOption "enables yggdrasil"; config = lib.mkIf cfg.enable { + services = { + yggdrasil = { + enable = true; + openMulticastPort = true; + + settings = { + PrivateKeyPath = config.sops.secrets."yggdrasil-private-key".path; + IfName = "ygg0"; + NodeInfoPrivacy = true; + Peers = [ + "tcp://ip6.fvm.mywire.org:8080?key=000000000143db657d1d6f80b5066dd109a4cb31f7dc6cb5d56050fffb014217" + "tcp://ygg1.mk16.de:1337?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a" + "tcp://62.210.85.80:39565" + + "tls://ygg1.mk16.de:1338?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a" + "tls://103.109.234.106:443?key=000000035621c71b5610434589df051aed2688510f904ae79860668dc0fbf182" + "tls://s2.i2pd.xyz:39575" + + "quic://ygg1.mk16.de:1339?key=0000000087ee9949eeab56bd430ee8f324cad55abf3993ed9b9be63ce693e18a" + "quic://ygg6.mk16.de:1339?key=0000005e5ced06fd4d465bc651c5deb6d70cbe82d36efb68c0450268eaaa5384" + "quic://[2a0b:4142:e9e::2]:65535" + ]; + Listen = [ + "tls://0.0.0.0:0" + ]; + }; + }; + yggdrasil-jumper.enable = true; + }; }; } |