fix: fix outdated workarounds
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
0e2e586338
commit
cc4ad85325
7 changed files with 5 additions and 68 deletions
|
@ -1,6 +1,5 @@
|
||||||
{nixpkgs-wayland, ...} @ inputs: [
|
{nixpkgs-wayland, ...} @ inputs: [
|
||||||
(import ./dracula-theme inputs)
|
(import ./dracula-theme inputs)
|
||||||
(import ./spotifywm inputs)
|
|
||||||
(import ./squeekboard)
|
(import ./squeekboard)
|
||||||
|
|
||||||
nixpkgs-wayland.overlay
|
nixpkgs-wayland.overlay
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{...} @ inputs: (final: prev: {
|
|
||||||
spotifywm = final.callPackage ./spotifywm.nix inputs;
|
|
||||||
})
|
|
|
@ -1,54 +0,0 @@
|
||||||
# https://github.com/NixOS/nixpkgs/blob/77b27fdb6a9ba01f60b8f5c48038938cf14b7d2f/pkgs/applications/audio/spotifywm/default.nix
|
|
||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
spotifywm-src,
|
|
||||||
libX11,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
spotify,
|
|
||||||
symlinkJoin,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
spotifywm = stdenv.mkDerivation {
|
|
||||||
pname = "spotifywm";
|
|
||||||
version = spotifywm-src.rev;
|
|
||||||
|
|
||||||
src = spotifywm-src;
|
|
||||||
|
|
||||||
buildInputs = [libX11];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
install -Dm644 spotifywm.so $out/lib/spotifywm.so
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
symlinkJoin {
|
|
||||||
inherit (spotifywm) name;
|
|
||||||
|
|
||||||
nativeBuildInputs = [makeBinaryWrapper];
|
|
||||||
|
|
||||||
paths = [
|
|
||||||
spotify
|
|
||||||
spotifywm
|
|
||||||
];
|
|
||||||
|
|
||||||
postBuild = ''
|
|
||||||
wrapProgram $out/bin/spotify \
|
|
||||||
--suffix LD_PRELOAD : "$out/lib/spotifywm.so"
|
|
||||||
|
|
||||||
ln -sf $out/bin/spotify $out/bin/spotifywm
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://github.com/dasJ/spotifywm";
|
|
||||||
description = "Wrapper around Spotify that correctly sets class name before opening the window";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
platforms = lib.platforms.linux;
|
|
||||||
maintainers = with lib.maintainers; [jqueiroz the-argus];
|
|
||||||
mainProgram = "spotify";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,20 +2,14 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
modulesPath,
|
modulesPath,
|
||||||
nixpkgs-nvidia,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
nvidiaPkgs = import nixpkgs-nvidia {
|
|
||||||
inherit (pkgs) system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = nvidiaPkgs.linuxPackages_zen;
|
kernelPackages = pkgs.linuxPackages_zen;
|
||||||
|
|
||||||
kernelParams = ["amd_pstate=active"];
|
kernelParams = ["amd_pstate=active"];
|
||||||
kernelModules = ["kvm-amd"];
|
kernelModules = ["kvm-amd"];
|
||||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
@ -64,8 +64,9 @@ in {
|
||||||
|
|
||||||
package = with config.boot.kernelPackages.nvidiaPackages;
|
package = with config.boot.kernelPackages.nvidiaPackages;
|
||||||
if cfg.enableWayland
|
if cfg.enableWayland
|
||||||
# Vulkan is much more stable in Wayland
|
# Keep the driver version at 535.xx.xx for Wayland desktop
|
||||||
then vulkan_beta
|
# games stutter on more recent versions
|
||||||
|
then production
|
||||||
else stable;
|
else stable;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue