fix obs e altri piccoli fix

4 files changed, 12 insertions, 18 deletions

diff --git a/hermes/nixos/programs/cybersec.nix b/hermes/nixos/programs/cybersec.nix
index c96a7ad..1c70ef1 100644
--- a/hermes/nixos/programs/cybersec.nix
+++ b/hermes/nixos/programs/cybersec.nix
@@ -10,7 +10,7 @@
     environment.systemPackages = with pkgs; [
       ascii file binwalk codeql pwntools
       gnat15 python313 gdb gef rizin
-      ghidra-bin cutter
+      ghidra-bin cutter binaryninja-free
       dig wireshark-qt
       postman burpsuite
     ];
diff --git a/hermes/nixos/programs/default.nix b/hermes/nixos/programs/default.nix
index 775d2f9..4d57942 100644
--- a/hermes/nixos/programs/default.nix
+++ b/hermes/nixos/programs/default.nix
@@ -3,7 +3,6 @@
     ./fonts.nix
     ./cybersec.nix
     ./games.nix
-    ./obs.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -15,7 +14,7 @@
     zed-editor alacritty
     nil nixd
     openssh rsync wireguard-tools
-    veracrypt exfat
+    exfat veracrypt
     tmux vim
     fastfetch btop
 
@@ -62,5 +61,4 @@
   fonts.enable = true;
   cybersec.enable = true;
   games.enable = true;
-  obs.enable = true;
 }
diff --git a/hermes/nixos/programs/games.nix b/hermes/nixos/programs/games.nix
index 4c65dfd..84df9cb 100644
--- a/hermes/nixos/programs/games.nix
+++ b/hermes/nixos/programs/games.nix
@@ -19,5 +19,15 @@
         gamescopeSession.enable = false; # SteamOS interface
       };
     };
+
+    # OBS
+    programs.obs-studio = {
+      enable = true;
+      enableVirtualCamera = true;
+
+      #plugins = with pkgs.obs-studio-plugins; [
+      #  droidcam-obs
+      #];
+    };
   };
 }
diff --git a/hermes/nixos/programs/obs.nix b/hermes/nixos/programs/obs.nix
deleted file mode 100644
index 765aaea..0000000
--- a/hermes/nixos/programs/obs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{lib, config, pkgs, ...}: {
-  options.obs.enable = lib.mkEnableOption "obs and virtual camera";
-
-  config = lib.mkIf config.obs.enable {
-    programs.obs-studio = {
-      enable = true;
-      enableVirtualCamera = true;
-
-      plugins = with pkgs.obs-studio-plugins; [
-        droidcam-obs
-      ];
-    };
-  };
-}