From f453a8f40ff1e9a1ec834405a1d6b5225727b44d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 13 Mar 2024 23:35:32 +0100 Subject: [PATCH] ljasdljasdjkl --- hosts/nord/default.nix | 2 +- hosts/noximilien/default.nix | 2 +- profiles/desktop/sound/pipewire.nix | 5 ++++- profiles/desktop/steam.nix | 9 +++++++-- users/pbsds/home/profiles/desktop.nix | 14 +++++++------- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index fea487a..3146518 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -44,7 +44,7 @@ networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery - networking.wireguard.interfaces."wg0".ips = [ "172.22.48.4/24" ]; + networking.wireguard.interfaces."wg0".ips = [ "172.22.48.4/24" ]; # fyrkat # Networking diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index b5cc02c..95044ea 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -96,7 +96,7 @@ networking.hostId = "e1ffd469"; # needed for zfs: head -c 8 /etc/machine-id - networking.wireguard.interfaces."wg0".ips = [ "172.22.48.3/24" ]; + networking.wireguard.interfaces."wg0".ips = [ "172.22.48.3/24" ]; # fyrkat # TODO: remove? Move to where relevant? nixpkgs.overlays = [ diff --git a/profiles/desktop/sound/pipewire.nix b/profiles/desktop/sound/pipewire.nix index db93a55..d9e75a1 100644 --- a/profiles/desktop/sound/pipewire.nix +++ b/profiles/desktop/sound/pipewire.nix @@ -14,7 +14,10 @@ #services.pipewire.media-session.enable = true; environment.systemPackages = with pkgs; [ - easyeffects + pavucontrol # volume and defaults + easyeffects # eq + helvum # patchbay + carla # VST (TODO: move into a DAW profile?) ]; security.rtkit.enable = true; # optional diff --git a/profiles/desktop/steam.nix b/profiles/desktop/steam.nix index 1e3d163..78714db 100644 --- a/profiles/desktop/steam.nix +++ b/profiles/desktop/steam.nix @@ -72,9 +72,14 @@ environment.systemPackages = with pkgs; [ steam-tui steamcmd - protontricks + #winetricks + #protontricks - jstest-gtk # nice to have + wineWowPackages.full + #wineWowPackages.waylandFull + + # nice to have + jstest-gtk ]; } diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix index 291438d..5182ed6 100644 --- a/users/pbsds/home/profiles/desktop.nix +++ b/users/pbsds/home/profiles/desktop.nix @@ -14,10 +14,9 @@ "spotify" ]; - # TODO: doesn't work? - nixpkgs.config.permittedInsecurePackages = [ - "pulsar-1.106.0" - "zotero-6.0.26" + nixpkgs.config.allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ + "pulsar" + "zotero" ]; home.packages = with pkgs; [ @@ -38,9 +37,8 @@ discord element-desktop #element-desktop-wayland - nheko - slack - telegram-desktop + #nheko + #fluffychat (pkgs.zxtune or null) @@ -54,6 +52,8 @@ transgui #transmission-remote-gtk ] ++ builtins.filter (drv: (builtins.tryEval drv.outPath).success) [ + slack + telegram-desktop teams zoom-us ];