Moved dslr-webcam to separate nixos module

Hoping to write a guide sometime soon!
nikitawootten · Dec 25, 2023 · 82791a8 · 82791a8
1 parent 2bc1a73
commit 82791a8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./dslr-webcam.nix
+  ];
+}
diff --git a/hostModules/personal/dslr-webcam.nix → hostModules/dslr-webcam/dslr-webcam.nix b/hostModules/personal/dslr-webcam.nix → 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
       '';
     };
   };
-}
+}
diff --git 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
@@ -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;