diff --git a/common/audio-sharing.nix b/common/audio-sharing.nix deleted file mode 100644 index 8d15584..0000000 --- a/common/audio-sharing.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - cfg = config.schmittlauch.audio-sharing; - fwPort = 8554; -in -{ - options.schmittlauch.audio-sharing = { - enable = lib.mkEnableOption "enable Gnome audio-sharing application via rtsp"; - openFirewall = lib.mkOption { - default = true; - type = lib.types.bool; - description = "Opens the port ${toString fwPort} to allow access to the rtsp stream"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.audio-sharing ]; - }) - (lib.mkIf (cfg.enable && cfg.openFirewall) { - networking.firewall = { - allowedUDPPorts = [ fwPort ]; - allowedTCPPorts = [ fwPort ]; - }; - }) - ]; - -} diff --git a/common/default.nix b/common/default.nix index 26bc5c4..73d5200 100644 --- a/common/default.nix +++ b/common/default.nix @@ -16,7 +16,6 @@ in ./nix-settings.nix ./upgrade-diff.nix ./guest.nix - ./audio-sharing.nix ]; services.davfs2.enable = true; diff --git a/flake.lock b/flake.lock index 0998eba..96b3b33 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1767910483, - "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", + "lastModified": 1767850628, + "narHash": "sha256-D3QzdIT11J66I4mzwmIpAGLzPAcbCS2VaKN8fmOe6+E=", "owner": "nix-community", "repo": "home-manager", - "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", + "rev": "8c8a16d41353a174767c38b962359b51a56ca02e", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768397375, - "narHash": "sha256-7QqbFi3ERvKjEdAzEYPv7iSGwpUKSrQW5wPLMFq45AQ=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "efe2094529d69a3f54892771b6be8ee4a0ebef0f", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768323494, - "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1768451253, - "narHash": "sha256-lrrqQuxIIlHn4TzOMDkhd/fhuDLtHJsXLuJ8x3SCn4o=", + "lastModified": 1767883949, + "narHash": "sha256-emo9Kb/J/lTHgELg2E39kGIv3qlLtGWFpv75BKnmGGU=", "owner": "nix-community", "repo": "NUR", - "rev": "216f5786b653a68a7618296c8d54dde43644ab56", + "rev": "9e297caa8eb66f91378169bc813e4256e1dc9058", "type": "github" }, "original": { diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index aba91d0..42740ef 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -83,6 +83,4 @@ in pkgs.framework-tool unstable.amd-debug-tools ]; - - schmittlauch.audio-sharing.enable = true; }