From acb6fb1677af10ef6fe01671cf527bd8bcbabc93 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Thu, 28 May 2026 13:26:03 +0100 Subject: [PATCH] fixes --- config/modules/nixvim/default.nix | 2 +- config/modules/obs.nix | 130 +++++++++++++++--------------- flake.lock | 8 +- 3 files changed, 71 insertions(+), 69 deletions(-) diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 9c0497a..61f9751 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -271,7 +271,7 @@ ]; settings = { highlight.enable = true; - indent.enable = true; + indent.enable = false; }; }; }; diff --git a/config/modules/obs.nix b/config/modules/obs.nix index 732eb1e..0e15592 100644 --- a/config/modules/obs.nix +++ b/config/modules/obs.nix @@ -1,70 +1,72 @@ -{ den, modules, ... }: { + den, + modules, + ... +}: { modules.obs = settings: { - homeManager = - { - pkgs, - lib, - config, - ... - }: - { - programs = { - obs-studio = { - enable = true; - package = ( - pkgs.obs-studio.override { - cudaSupport = true; - } - ); - plugins = with pkgs.obs-studio-plugins; [ - obs-pipewire-audio-capture - obs-vkcapture - ]; - }; - }; - systemd.user.services = - let - audio-set = lib.mkIf settings.audio { - pw-discordaudio-virtual-device = { - Unit = { - Description = "OBS daemon"; - After = [ "hyprland-session.target" ]; - }; - Install = { - WantedBy = [ "default.target" ]; - }; - Service = { - ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" '' - pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink - ''}"; - Restart = "on-failure"; - RestartSec = "5s"; - }; - }; - pw-gameaudio-virtual-device = { - Unit = { - Description = "OBS daemon"; - After = [ "hyprland-session.target" ]; - }; - Install = { - WantedBy = [ "default.target" ]; - }; - Service = { - ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" '' - pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink - ''}"; - Restart = "on-failure"; - RestartSec = "5s"; - }; - }; - }; - in - lib.mergeAttrsList [ audio-set ]; - - wayland.windowManager.hyprland.settings = { - exec-once = [ "${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer" ]; + homeManager = { + pkgs, + lib, + config, + ... + }: { + programs = { + obs-studio = { + enable = true; + package = ( + pkgs.obs-studio.override { + cudaSupport = true; + } + ); + plugins = with pkgs.obs-studio-plugins; [ + obs-pipewire-audio-capture + obs-vkcapture + obs-vaapi #optional AMD hardware acceleration + obs-gstreamer + ]; }; }; + systemd.user.services = let + audio-set = lib.mkIf settings.audio { + pw-discordaudio-virtual-device = { + Unit = { + Description = "OBS daemon"; + After = ["hyprland-session.target"]; + }; + Install = { + WantedBy = ["default.target"]; + }; + Service = { + ExecStart = "${pkgs.writeShellScript "discord_audio_virt_device" '' + pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink + ''}"; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + pw-gameaudio-virtual-device = { + Unit = { + Description = "OBS daemon"; + After = ["hyprland-session.target"]; + }; + Install = { + WantedBy = ["default.target"]; + }; + Service = { + ExecStart = "${pkgs.writeShellScript "game_audio_virt_device" '' + pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink + ''}"; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + }; + in + lib.mergeAttrsList [audio-set]; + + wayland.windowManager.hyprland.settings = { + # exec-once = ["${config.programs.obs-studio.finalPackage}/bin/obs --startreplaybuffer"]; + }; + }; }; } diff --git a/flake.lock b/flake.lock index ebc3144..94abec1 100644 --- a/flake.lock +++ b/flake.lock @@ -1293,11 +1293,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1779840216, - "narHash": "sha256-fU9m8FTjZ94muIKE5jcCYBvdGKs2qzdPgGQfNCuYlzI=", + "lastModified": 1779876223, + "narHash": "sha256-n7kC2IF9jUSnomS+gwwD2tuwBwRiBVNEmVlTUBVqZzs=", "ref": "main", - "rev": "2213f5814708b2734143f73385a81278d9827a64", - "revCount": 81, + "rev": "f0ebca7595fa8211d1b8eae0cf5850ff45a62d29", + "revCount": 83, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" },