From 82791a8796afa5e0eb2590c9ffea7a81acfbef20 Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Mon, 25 Dec 2023 18:55:45 -0500 Subject: [PATCH] Moved dslr-webcam to separate nixos module Hoping to write a guide sometime soon! --- hostModules/default.nix | 1 + hostModules/dslr-webcam/default.nix | 6 ++++++ hostModules/{personal => dslr-webcam}/dslr-webcam.nix | 6 +++--- hostModules/personal/default.nix | 1 - hosts/dionysus/default.nix | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 hostModules/dslr-webcam/default.nix rename hostModules/{personal => dslr-webcam}/dslr-webcam.nix (96%) diff --git a/hostModules/default.nix b/hostModules/default.nix index f2e9297..ed27796 100644 --- a/hostModules/default.nix +++ b/hostModules/default.nix @@ -1,4 +1,5 @@ { personal.imports = [ ./personal ]; raspi4sd.imports = [ ./raspi4sd ]; + dslr-webcam.imports = [ ./dslr-webcam ]; } diff --git a/hostModules/dslr-webcam/default.nix b/hostModules/dslr-webcam/default.nix new file mode 100644 index 0000000..34937fd --- /dev/null +++ b/hostModules/dslr-webcam/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./dslr-webcam.nix + ]; +} diff --git a/hostModules/personal/dslr-webcam.nix b/hostModules/dslr-webcam/dslr-webcam.nix similarity index 96% rename from hostModules/personal/dslr-webcam.nix rename to hostModules/dslr-webcam/dslr-webcam.nix index ef016da..cdbf624 100644 --- a/hostModules/personal/dslr-webcam.nix +++ b/hostModules/dslr-webcam/dslr-webcam.nix @@ -3,10 +3,10 @@ # - https://www.tomoliver.net/posts/using-an-slr-as-a-webcam-nixos { pkgs, lib, config, ... }: let - cfg = config.personal.dslr-webcam; + cfg = config.dslr-webcam; in { - options.personal.dslr-webcam = { + options.dslr-webcam = { enable = lib.mkEnableOption "DSLR webcam"; virtual-device-name = lib.mkOption { type = lib.types.str; @@ -67,4 +67,4 @@ in ''; }; }; -} \ No newline at end of file +} diff --git a/hostModules/personal/default.nix b/hostModules/personal/default.nix index f698abf..d09906b 100644 --- a/hostModules/personal/default.nix +++ b/hostModules/personal/default.nix @@ -3,7 +3,6 @@ imports = [ ./base.nix ./docker.nix - ./dslr-webcam.nix ./flatpak.nix ./gnome.nix ./networkmanager.nix diff --git a/hosts/dionysus/default.nix b/hosts/dionysus/default.nix index 2aeb89e..aac0459 100644 --- a/hosts/dionysus/default.nix +++ b/hosts/dionysus/default.nix @@ -3,6 +3,7 @@ imports = [ ./hardware-configuration.nix self.nixosModules.personal + self.nixosModules.dslr-webcam nixos-hardware.nixosModules.common-gpu-nvidia-nonprime ]; @@ -31,7 +32,7 @@ personal.zsa.enable = true; - personal.dslr-webcam = { + dslr-webcam = { enable = true; camera-udev-product = "7b4/130/100"; # My beloved Olympus OM-D EM5 Mark II ffmpeg-hwaccel = true;