From 6c833c59ad286c1ea6373ed5a5d491c0c531b337 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Wed, 11 Sep 2024 15:47:18 -0700 Subject: [PATCH 1/2] immersed-vr: rename to immersed --- pkgs/by-name/im/{immersed-vr => immersed}/darwin.nix | 0 pkgs/by-name/im/{immersed-vr => immersed}/linux.nix | 0 pkgs/by-name/im/{immersed-vr => immersed}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+) rename pkgs/by-name/im/{immersed-vr => immersed}/darwin.nix (100%) rename pkgs/by-name/im/{immersed-vr => immersed}/linux.nix (100%) rename pkgs/by-name/im/{immersed-vr => immersed}/package.nix (100%) diff --git a/pkgs/by-name/im/immersed-vr/darwin.nix b/pkgs/by-name/im/immersed/darwin.nix similarity index 100% rename from pkgs/by-name/im/immersed-vr/darwin.nix rename to pkgs/by-name/im/immersed/darwin.nix diff --git a/pkgs/by-name/im/immersed-vr/linux.nix b/pkgs/by-name/im/immersed/linux.nix similarity index 100% rename from pkgs/by-name/im/immersed-vr/linux.nix rename to pkgs/by-name/im/immersed/linux.nix diff --git a/pkgs/by-name/im/immersed-vr/package.nix b/pkgs/by-name/im/immersed/package.nix similarity index 100% rename from pkgs/by-name/im/immersed-vr/package.nix rename to pkgs/by-name/im/immersed/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 88b828c32cbe..4bfa1a438dd8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -718,6 +718,7 @@ mapAliases { imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 + immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 From ab5706b3a5eefbabb7759b1d360388e777806cea Mon Sep 17 00:00:00 2001 From: Gavin John Date: Wed, 11 Sep 2024 15:51:54 -0700 Subject: [PATCH 2/2] nixos/programs.immersed-vr: rename to programs.immersed --- .../manual/release-notes/rl-2411.section.md | 2 +- nixos/modules/module-list.nix | 2 +- nixos/modules/programs/immersed-vr.nix | 34 ------------- nixos/modules/programs/immersed.nix | 49 +++++++++++++++++++ 4 files changed, 51 insertions(+), 36 deletions(-) delete mode 100644 nixos/modules/programs/immersed-vr.nix create mode 100644 nixos/modules/programs/immersed.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 60dddddfd73a..26d94218e994 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -103,7 +103,7 @@ - [ddns-updater](https://github.com/qdm12/ddns-updater), a service to update DNS records periodically with WebUI for many DNS providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable). -- [Immersed VR](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed-vr](#opt-programs.immersed-vr.enable). +- [Immersed](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed](#opt-programs.immersed.enable). - [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193cb43118f4..bbdd218ca64c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -215,7 +215,7 @@ ./programs/iftop.nix ./programs/i3lock.nix ./programs/iio-hyprland.nix - ./programs/immersed-vr.nix + ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix ./programs/joycond-cemuhook.nix diff --git a/nixos/modules/programs/immersed-vr.nix b/nixos/modules/programs/immersed-vr.nix deleted file mode 100644 index 57edb3cbaea0..000000000000 --- a/nixos/modules/programs/immersed-vr.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.programs.immersed-vr; -in -{ - - options = { - programs.immersed-vr = { - enable = lib.mkEnableOption "immersed-vr"; - - package = lib.mkPackageOption pkgs "immersed-vr" {}; - }; - }; - - config = lib.mkIf cfg.enable { - boot = { - kernelModules = [ "v4l2loopback" "snd-aloop" ]; - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; - extraModprobeConfig = '' - options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera" - ''; - }; - - environment.systemPackages = [ cfg.package ]; - }; - - meta.maintainers = pkgs.immersed-vr.meta.maintainers; -} diff --git a/nixos/modules/programs/immersed.nix b/nixos/modules/programs/immersed.nix new file mode 100644 index 000000000000..0fb217b91d54 --- /dev/null +++ b/nixos/modules/programs/immersed.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.immersed; +in +{ + imports = [ + (lib.mkRenamedOptionModule + [ + "programs" + "immersed-vr" + ] + [ + "programs" + "immersed" + ] + ) + ]; + + options = { + programs.immersed = { + enable = lib.mkEnableOption "immersed"; + + package = lib.mkPackageOption pkgs "immersed" { }; + }; + }; + + config = lib.mkIf cfg.enable { + boot = { + kernelModules = [ + "v4l2loopback" + "snd-aloop" + ]; + extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; + extraModprobeConfig = '' + options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera" + ''; + }; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = pkgs.immersed.meta.maintainers; +}