diff --git a/devices/binto/home/packages.nix b/devices/binto/home/packages.nix index 7fcce0b6..43dbeeb3 100644 --- a/devices/binto/home/packages.nix +++ b/devices/binto/home/packages.nix @@ -1,5 +1,63 @@ -{...}: { - # Disable compositor in X11 for best performance +{ + pkgs, + nixpkgs-wayland, + ... +}: let + waypkgs = nixpkgs-wayland.packages.x86_64-linux; +in { + programs = { + obs-studio = { + enable = true; + plugins = with waypkgs; [ + obs-wlrobs + ]; + }; + + btop.enable = true; + }; + home.packages = + (with pkgs; [ + # FIXME: vlc stutters + mpv + nextcloud-client + libreoffice-fresh + photoqt + hunspell + hunspellDicts.en_CA + jellyfin-media-player + spotifywm + thunderbird + prismlauncher-qt5 + (pkgs.discord.override { + withOpenASAR = true; + withVencord = true; + }) + + # School + virt-manager + bluej + xournalpp + ]) + ++ (with pkgs.plasma5Packages; [ + ark + kcharselect + kdenlive + okular + + # Dolphin & co + dolphin + dolphin-plugins + kdegraphics-thumbnailers + ffmpegthumbs + kio + kio-admin # needs to be both here and in system pkgs + kio-extras + kmime + ]) + ++ (with pkgs.gnome; [ + gnome-calculator + ]); + # TODO: add mic sound xdg.configFile."gsr.sh" = { executable = true; @@ -15,6 +73,7 @@ export MAKEFOLDERS=yes # export ADDITIONAL_ARGS= + # Disable compositor in X11 for best performance exec /bin/sh -c 'AUDIO="''${AUDIO_DEVICE:-$(pactl get-default-sink).monitor}"; gpu-screen-recorder -v no -w $WINDOW -c $CONTAINER -q $QUALITY -k $CODEC -ac $AUDIO_CODEC -a "$AUDIO" -f $FRAMERATE -r $REPLAYDURATION -o "$OUTPUTDIR" -mf $MAKEFOLDERS $ADDITIONAL_ARGS' ''; }; diff --git a/devices/binto/modules/desktop.nix b/devices/binto/modules/desktop.nix index a6db0bf7..c547bfd2 100644 --- a/devices/binto/modules/desktop.nix +++ b/devices/binto/modules/desktop.nix @@ -42,29 +42,11 @@ in { }; environment.systemPackages = with pkgs; [ + qemu + alsa-utils + plasma5Packages.kio-admin + plasma5Packages.ksshaskpass p7zip # for reshade - xclip - wl-clipboard - - # FIXME: vlc stutters - mpv - flat-remix-icon-theme - nextcloud-client - libreoffice-qt - hunspell - hunspellDicts.en_CA - jellyfin-media-player - spotifywm - thunderbird - prismlauncher-qt5 - (pkgs.discord.override { - withOpenASAR = true; - withVencord = true; - }) - - # School - virt-manager - bluej - xournalpp + kio-admin ]; } diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix index 26eaa172..008b13e3 100644 --- a/devices/binto/modules/nix-gaming.nix +++ b/devices/binto/modules/nix-gaming.nix @@ -11,6 +11,7 @@ steam = { # Disable HW accel to fix flickers enable = true; + remotePlay.openFirewall = true; extraCompatPackages = [ nix-gaming.packages.${pkgs.system}.proton-ge diff --git a/devices/wim/home/packages.nix b/devices/wim/home/packages.nix index 50d3a332..42441c74 100644 --- a/devices/wim/home/packages.nix +++ b/devices/wim/home/packages.nix @@ -44,7 +44,7 @@ in { # School virt-manager bluej - #camunda-modeler + camunda-modeler # Misc Apps thunderbird # TODO: use programs.thunderbird diff --git a/devices/wim/modules/desktop.nix b/devices/wim/modules/desktop.nix index e93f9202..4cd65875 100644 --- a/devices/wim/modules/desktop.nix +++ b/devices/wim/modules/desktop.nix @@ -44,13 +44,11 @@ in { }; environment.systemPackages = with pkgs; [ - # for sddm - plasma5Packages.plasma-framework - plasma5Packages.plasma-workspace - qemu alsa-utils plasma5Packages.kio-admin - plasma5Packages.ksshaskpass + plasma5Packages.ksshaskpas + p7zip # for reshade + kio-admins ]; }