diff --git a/images/translate-setup/audio.nix b/images/translate-setup/audio.nix index 5d38c14..fce4297 100644 --- a/images/translate-setup/audio.nix +++ b/images/translate-setup/audio.nix @@ -1,5 +1,5 @@ { pkgs, lib, config, ... }: { - users.users.mainUser.extraGroups = [ "audio" ]; + users.users.mainUser.extraGroups = [ "audio" "pipewire" ]; hardware.pulseaudio = { enable = true; diff --git a/nixos/modules/programs/browser.nix b/nixos/modules/programs/browser.nix index 5a61c96..e7e2958 100644 --- a/nixos/modules/programs/browser.nix +++ b/nixos/modules/programs/browser.nix @@ -253,7 +253,7 @@ in isNormalUser = true; group = "users"; # enable video usage - extraGroups = if config.gpu then [ "video" "audio" ] else [ "audio" ]; + extraGroups = if config.gpu then [ "video" "audio" "pipewire" ] else [ "audio" "pipewire" ]; }); # add groups to mainUser diff --git a/nixos/modules/programs/slack.nix b/nixos/modules/programs/slack.nix index 0af2fce..8bdd09c 100644 --- a/nixos/modules/programs/slack.nix +++ b/nixos/modules/programs/slack.nix @@ -118,7 +118,7 @@ in isNormalUser = true; group = "users"; # enable video usage - extraGroups = [ "video" "audio" ]; + extraGroups = [ "video" "audio" "pipewire" ]; }; environment.systemPackages = [ bin backupScript desktopFile ]; diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 4a41c24..62caa9c 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -32,7 +32,7 @@ in isNormalUser = true; home = "/home/steam"; createHome = true; - extraGroups = [ "audio" "input" "video" ]; + extraGroups = [ "audio" "input" "video" "pipewire" ]; }; # for steam diff --git a/nixos/modules/system/audio.nix b/nixos/modules/system/audio.nix index 7f70540..2b65239 100644 --- a/nixos/modules/system/audio.nix +++ b/nixos/modules/system/audio.nix @@ -85,28 +85,27 @@ in # ---------- # because of systemWide ensure main user is in audio group - system.custom.mainUser.extraGroups = [ "audio" ]; + system.custom.mainUser.extraGroups = [ "audio" "pipewire" ]; #services.pipewire = { # enable = true; - # alsa.enable = true; - # jack.enable = true; - # media-session.enable = true; + # systemWide = true; + # media-session.enable = false; # pulse.enable = true; + # jack.enable = false; + # alsa.enable = false; #}; + #hardware.pulseaudio.enable = false; + # todo use pipewire for this hardware.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; - # all in audio group can do audio systemWide = true; - extraConfig = '' - # automatically switch to newly-connected devices load-module module-switch-on-connect - # http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html # https://gavv.github.io/articles/pulseaudio-under-the-hood/#ladspa-plugin-sink ${builtins.toString (flip map cfg.sinks (sink: '' diff --git a/nixos/system/all/packages.nix b/nixos/system/all/packages.nix index 550d011..744ae4e 100644 --- a/nixos/system/all/packages.nix +++ b/nixos/system/all/packages.nix @@ -55,6 +55,8 @@ in # to browse logs better lnav + nixos-option + storepath prefetch-git-rendered diff --git a/nixos/system/desktop/home-manager/xmonad.nix b/nixos/system/desktop/home-manager/xmonad.nix index 09a26f9..c323e30 100644 --- a/nixos/system/desktop/home-manager/xmonad.nix +++ b/nixos/system/desktop/home-manager/xmonad.nix @@ -12,7 +12,7 @@ let '' module NixCommands where - nixStartIrc = "${pkgs.rxvt_unicode}/bin/urxvt -e irc" + nixStartChat = "${pkgs.element-desktop}/bin/element-desktop" nixStartAudacious = "${pkgs.audacious}/bin/audacious" nixStartFlameshot = "${pkgs.flameshot}/bin/flameshot gui -p /share/" nixInvertColors = "${pkgs.xcalib}/bin/xcalib -invert -alter" diff --git a/nixos/system/desktop/home-manager/xmonad/Main.hs b/nixos/system/desktop/home-manager/xmonad/Main.hs index e106648..9f8a9c8 100644 --- a/nixos/system/desktop/home-manager/xmonad/Main.hs +++ b/nixos/system/desktop/home-manager/xmonad/Main.hs @@ -99,7 +99,7 @@ projects = [ Project { projectName = "chat" , projectDirectory = "~/" - , projectStartHook = Just $ spawn nixStartIrc + , projectStartHook = Just $ spawn nixStartChat } , Project { projectName = "audio"