diff --git a/profiles/applications/packages.nix b/profiles/applications/packages.nix index f078bb3..abc6d4c 100644 --- a/profiles/applications/packages.nix +++ b/profiles/applications/packages.nix @@ -69,10 +69,10 @@ with config.deviceSpecific; { ] ++ lib.optionals (!(isVM || isISO)) [ libreoffice ] ++ lib.optionals isGaming [ - ceserver - ckan + # ceserver + # ckan goverlay - multimc + # multimc lutris obs-studio reshade-shaders diff --git a/profiles/packages/youtube-to-mpv.nix b/profiles/packages/youtube-to-mpv.nix index 1319aef..7c0b971 100644 --- a/profiles/packages/youtube-to-mpv.nix +++ b/profiles/packages/youtube-to-mpv.nix @@ -3,11 +3,11 @@ let yt-mpv = pkgs.writeShellScriptBin "yt-mpv" '' if [[ "$1" != "--no-video" ]]; then - ${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Video" "$(xclip -o)" - ${pkgs.mpv}/bin/mpv --fs "$(xclip -o)" + ${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Video" "$(${pkgs.xclip}/bin/xclip -o)" + ${pkgs.mpv}/bin/mpv --fs "$(${pkgs.xclip}/bin/xclip -o)" else - ${pkgs.libnotify}/bin/notify-send -t 3000 --icon=video-television "Playing Audio" "$(xclip -o)" - ${term} -e ${pkgs.mpv}/bin/mpv --no-video "$(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 "$(${pkgs.xclip}/bin/xclip -o)" fi ''; in diff --git a/profiles/virtualisation.nix b/profiles/virtualisation.nix index b25b1eb..cc91f17 100644 --- a/profiles/virtualisation.nix +++ b/profiles/virtualisation.nix @@ -1,9 +1,9 @@ -{ config, lib, pkgs, ... }: { - # virtualisation.docker.enable = enableVirtualisation; - # environment.systemPackages = lib.mkIf (enableVirtualisation) [ pkgs.docker-compose ]; +{ config, lib, pkgs, ... }: +with config.deviceSpecific; { + # virtualisation.docker.enable = enableVirtualisation && (config.device == "AMD-Workstation"); virtualisation.libvirtd = { - enable = config.deviceSpecific.enableVirtualisation; + enable = enableVirtualisation; qemuOvmf = true; qemuRunAsRoot = true; onBoot = "ignore"; @@ -11,7 +11,7 @@ qemuPackage = pkgs.qemu; }; - virtualisation.spiceUSBRedirection.enable = config.deviceSpecific.enableVirtualisation; + virtualisation.spiceUSBRedirection.enable = enableVirtualisation; networking.nat = { enable = true; diff --git a/profiles/workspace/i3/default.nix b/profiles/workspace/i3/default.nix index 9b5564d..c5a450b 100644 --- a/profiles/workspace/i3/default.nix +++ b/profiles/workspace/i3/default.nix @@ -71,6 +71,10 @@ in { command = "move to workspace "; criteria = { class = "Spotify"; }; } + { + command = "floating enable"; + criteria = { instance = "origin.exe"; }; + } ]; }; startup = lib.mkIf (!config.deviceSpecific.isISO) (map (command: { inherit command; }) config.startupApplications); @@ -126,11 +130,11 @@ in { "${modifier}+Print" = script "screenshot" "${pkgs.maim}/bin/maim ~/Pictures/$(date +%s).png"; "${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" "${pkgs.maim}/bin/maim -s ~/Pictures/$(date +%s).png"; "--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}+F5" = "reload";