diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index f3eaf44..5ba98c6 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -36,5 +36,32 @@ networking.firewall.allowedTCPPorts = [ 9999 ]; networking.firewall.allowedUDPPorts = [ 9999 ]; + # Enable Pipewire && + # Disocrd OBS virtual mic audio sync + services.pipewire = { + enable = true; + pulse.enable = true; + extraConfig.pipewire."99-obs-virtual-mic" = { + "context.modules" = [ + { + name = "libpipewire-module-loopback"; + args = { + "node.description" = "OBS Virtual Mic"; + "capture.props" = { + "node.name" = "obs_capture"; + "media.class" = "Audio/Sink"; + "audio.position" = [ "FL" "FR" ]; + }; + "playback.props" = { + "node.name" = "obs_mic"; + "media.class" = "Audio/Source"; + "audio.position" = [ "FL" "FR" ]; + }; + }; + } + ]; + }; +}; + system.stateVersion = "25.11"; # don't change -} \ No newline at end of file +} diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index f7fee8c..5c4d53e 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -15,6 +15,8 @@ ../../modules/home-manager/bspwm.nix ../../modules/home-manager/polybar.nix ../../modules/home-manager/browsers/zen.nix + ../../modules/home-manager/picom.nix + ../../modules/home-manager/syncplay.nix # ../../modules/home-manager/editors/helix.nix ]; @@ -27,13 +29,13 @@ my.bspwm.monitors = [ { name = "DP-0"; - xrandr = "--primary --auto --pos 1080x0"; - desktops = [ "1" "2" "3" "4" "5" "6" ]; + xrandr = "--primary --mode 2560x1440 --pos 1080x0"; + desktops = [ "4" "5" "6" "7" "8" "9" ]; } { name = "DP-2"; xrandr = "--auto --rotate left --pos 0x0"; - desktops = [ "7" "8" "9" ]; + desktops = [ "1" "2" "3" ]; } ]; diff --git a/modules/home-manager/bspwm.nix b/modules/home-manager/bspwm.nix index c70f8c8..1601100 100644 --- a/modules/home-manager/bspwm.nix +++ b/modules/home-manager/bspwm.nix @@ -52,6 +52,9 @@ in # Wallpapers [ -x ~/.config/wallpaper/set.sh ] && ~/.config/wallpaper/set.sh + + # Picom + ${pkgs.procps}/bin/pgrep -x picom >/dev/null || ${pkgs.picom}/bin/picom -b --config $HOME/.config/picom/picom.conf ''; }; diff --git a/modules/home-manager/picom.nix b/modules/home-manager/picom.nix new file mode 100644 index 0000000..98714ea --- /dev/null +++ b/modules/home-manager/picom.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +{ + home.packages = [ pkgs.picom ]; + + xdg.configFile."picom/picom.conf".text = '' + backend = "glx"; + vsync = true; + + unredir-if-possible = false; + + shadow = false; + fade-in-step = 1; + fade-out-step = 1; + ''; +} diff --git a/modules/home-manager/syncplay.nix b/modules/home-manager/syncplay.nix new file mode 100644 index 0000000..215c7e3 --- /dev/null +++ b/modules/home-manager/syncplay.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + home.packages = [ + pkgs.syncplay + pkgs.mpv + ]; +} diff --git a/modules/home-manager/terminals/alacritty.nix b/modules/home-manager/terminals/alacritty.nix index 64f9c8d..e7ae838 100644 --- a/modules/home-manager/terminals/alacritty.nix +++ b/modules/home-manager/terminals/alacritty.nix @@ -5,7 +5,7 @@ enable = true; settings = { font.size = 11; - window.opacity = 0.95; + window.opacity = 0.85; }; }; } diff --git a/modules/nixos/apps.nix b/modules/nixos/apps.nix index fb06ae0..e35671a 100644 --- a/modules/nixos/apps.nix +++ b/modules/nixos/apps.nix @@ -2,8 +2,8 @@ { users.users.chris.packages = with pkgs; [ telegram-desktop discord inkscape obsidian obs-studio - r2modman signal-desktop flameshot vscodium + r2modman signal-desktop flameshot vscodium spotify nautilus onlyoffice-desktopeditors vlc orca-slicer blender grayjay - kdePackages.kdenlive kicad + kdePackages.kdenlive gimp nextcloud-client ]; -} \ No newline at end of file +} diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index b1408e4..ceaf5f6 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -1,4 +1,8 @@ -{ ... }: +{ pkgs, ... }: { programs.steam.enable = true; -} \ No newline at end of file + + users.users.chris.packages = with pkgs; [ + # lutris + ]; +}