some fixes

This commit is contained in:
Dmitriy Kholkin 2021-10-24 23:15:08 +03:00
parent df24c1bc3b
commit 5541c1fa12
4 changed files with 18 additions and 14 deletions

View File

@ -69,10 +69,10 @@ with config.deviceSpecific; {
] ++ lib.optionals (!(isVM || isISO)) [ ] ++ lib.optionals (!(isVM || isISO)) [
libreoffice libreoffice
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
ceserver # ceserver
ckan # ckan
goverlay goverlay
multimc # multimc
lutris lutris
obs-studio obs-studio
reshade-shaders reshade-shaders

View File

@ -3,11 +3,11 @@
let let
yt-mpv = pkgs.writeShellScriptBin "yt-mpv" '' yt-mpv = pkgs.writeShellScriptBin "yt-mpv" ''
if [[ "$1" != "--no-video" ]]; then if [[ "$1" != "--no-video" ]]; then
${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Video" "$(xclip -o)" ${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Video" "$(${pkgs.xclip}/bin/xclip -o)"
${pkgs.mpv}/bin/mpv --fs "$(xclip -o)" ${pkgs.mpv}/bin/mpv --fs "$(${pkgs.xclip}/bin/xclip -o)"
else else
${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Audio" "$(xclip -o)" ${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Audio" "$(${pkgs.xclip}/bin/xclip -o)"
${term} -e ${pkgs.mpv}/bin/mpv --no-video "$(xclip -o)" ${term} -e ${pkgs.mpv}/bin/mpv --no-video "$(${pkgs.xclip}/bin/xclip -o)"
fi fi
''; '';
in in

View File

@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }:
# virtualisation.docker.enable = enableVirtualisation; with config.deviceSpecific; {
# environment.systemPackages = lib.mkIf (enableVirtualisation) [ pkgs.docker-compose ]; # virtualisation.docker.enable = enableVirtualisation && (config.device == "AMD-Workstation");
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = config.deviceSpecific.enableVirtualisation; enable = enableVirtualisation;
qemuOvmf = true; qemuOvmf = true;
qemuRunAsRoot = true; qemuRunAsRoot = true;
onBoot = "ignore"; onBoot = "ignore";
@ -11,7 +11,7 @@
qemuPackage = pkgs.qemu; qemuPackage = pkgs.qemu;
}; };
virtualisation.spiceUSBRedirection.enable = config.deviceSpecific.enableVirtualisation; virtualisation.spiceUSBRedirection.enable = enableVirtualisation;
networking.nat = { networking.nat = {
enable = true; enable = true;

View File

@ -71,6 +71,10 @@ in {
command = "move to workspace "; command = "move to workspace ";
criteria = { class = "Spotify"; }; criteria = { class = "Spotify"; };
} }
{
command = "floating enable";
criteria = { instance = "origin.exe"; };
}
]; ];
}; };
startup = lib.mkIf (!config.deviceSpecific.isISO) (map (command: { inherit command; }) config.startupApplications); startup = lib.mkIf (!config.deviceSpecific.isISO) (map (command: { inherit command; }) config.startupApplications);
@ -126,11 +130,11 @@ in {
"${modifier}+Print" = script "screenshot" "${modifier}+Print" = script "screenshot"
"${pkgs.maim}/bin/maim ~/Pictures/$(date +%s).png"; "${pkgs.maim}/bin/maim ~/Pictures/$(date +%s).png";
"${modifier}+Control+Print" = script "screenshot-copy" "${modifier}+Control+Print" = script "screenshot-copy"
"${pkgs.maim}/bin/maim | xclip -selection clipboard -t image/png"; "${pkgs.maim}/bin/maim | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png";
"--release ${modifier}+Shift+Print" = script "screenshot-area" "--release ${modifier}+Shift+Print" = script "screenshot-area"
"${pkgs.maim}/bin/maim -s ~/Pictures/$(date +%s).png"; "${pkgs.maim}/bin/maim -s ~/Pictures/$(date +%s).png";
"--release ${modifier}+Control+Shift+Print" = script "screenshot-area-copy" "--release ${modifier}+Control+Shift+Print" = script "screenshot-area-copy"
"${pkgs.maim}/bin/maim -s | xclip -selection clipboard -t image/png"; "${pkgs.maim}/bin/maim -s | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png";
"${modifier}+x" = "move workspace to output right"; "${modifier}+x" = "move workspace to output right";
"${modifier}+F5" = "reload"; "${modifier}+F5" = "reload";