Merge remote-tracking branch 'khanelinix/main'

FrankelJb · Oct 18, 2023 · b14700c · b14700c
2 parents b2f0627 + aa86bb5
commit b14700c
Show file tree

Hide file tree

Showing 16 changed files with 595 additions and 431 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/nixos/apps/obs/default.nix → modules/home/apps/obs/default.nix b/modules/nixos/apps/obs/default.nix → modules/home/apps/obs/default.nix
@@ -16,15 +16,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [
-      (pkgs.wrapOBS {
-        plugins = with pkgs.obs-studio-plugins; [
-          looking-glass-obs
-          obs-move-transition
-          obs-multi-rtmp
-          wlrobs
-        ];
-      })
-    ];
+    programs.obs-studio = {
+      enable = true;
+      package = pkgs.obs-studio;
+
+      plugins = with pkgs.obs-studio-plugins; [
+        looking-glass-obs
+        obs-move-transition
+        obs-multi-rtmp
+        wlrobs
+      ];
+    };
   };
 }
diff --git a/modules/home/cli-apps/k9s/default.nix b/modules/home/cli-apps/k9s/default.nix
@@ -8,9 +8,9 @@
   inherit (lib) mkIf;
   inherit (lib.internal) mkBoolOpt;
 
-  cfg = config.khanelinix.cli-apps.k9s;
+  cfg = config.beansnix.cli-apps.k9s;
 in {
-  options.khanelinix.cli-apps.k9s = {
+  options.beansnix.cli-apps.k9s = {
     enable = mkBoolOpt false "Whether or not to enable k9s.";
   };
 

diff --git a/modules/home/desktop/addons/waybar/default-modules.jsonc b/modules/home/desktop/addons/waybar/default-modules.jsonc