matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: fix outdated workarounds
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-03-12 19:44:05 -04:00
parent 0e2e586338
commit cc4ad85325
7 changed files with 20 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/overlays/default.nix
View file

@ -1,6 +1,5 @@
{nixpkgs-wayland, ...} @ inputs: [
(import ./dracula-theme inputs)
(import ./spotifywm inputs)
(import ./squeekboard)
nixpkgs-wayland.overlay

3
common/overlays/spotifywm/default.nix
View file

@ -1,3 +0,0 @@
{...} @ inputs: (final: prev: {
spotifywm = final.callPackage ./spotifywm.nix inputs;
})

54
common/overlays/spotifywm/spotifywm.nix
View file

@ -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";
};
}

10
devices/binto/hardware-configuration.nix
View file

@ -2,20 +2,14 @@
config,
lib,
modulesPath,
nixpkgs-nvidia,
pkgs,
...
}: let
nvidiaPkgs = import nixpkgs-nvidia {
inherit (pkgs) system;
config.allowUnfree = true;
};
in {
}: {
nixpkgs.hostPlatform = "x86_64-linux";
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot = {
kernelPackages = nvidiaPkgs.linuxPackages_zen;
kernelPackages = pkgs.linuxPackages_zen;
kernelParams = ["amd_pstate=active"];
kernelModules = ["kvm-amd"];

58
flake.lock
View file

@ -435,15 +435,15 @@
]
},
"locked": {
"lastModified": 1710125127,
"narHash": "sha256-8POeuqJpGSUWKo4Wh44x5O1R60QWT5cXjde7mCoGg78=",
"owner": "matt1432",
"lastModified": 1710281778,
"narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "df624dcb680a0e8484eaea4529e6a415dbe140d0",
"rev": "49a266d2ca59df8a03249550e73a54626181b65d",
"type": "github"
},
"original": {
"owner": "matt1432",
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
@ -838,15 +838,15 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1709324835,
"narHash": "sha256-CSuX2DsADgc2jCkEcP6OSWjgGZCw4+Q2/TEPegsTj3s=",
"owner": "NotAShelf",
"lastModified": 1710262933,
"narHash": "sha256-qd8AajOJ7jIJmDDvaUBwezJZe/E6LsttXpVGeuq11H4=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "c46aea8d46f3c97f7b47c3951ce66227d5409244",
"rev": "5777845cd7b52503c897f37f65627e44d502a969",
"type": "github"
},
"original": {
"owner": "NotAShelf",
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
@ -927,13 +927,13 @@
"locked": {
"lastModified": 1709879753,
"narHash": "sha256-zEpy3eweBus/cW/oRMBINps6Bnlazpa7TadonwWibHA=",
"owner": "t184256",
"owner": "nix-community",
"repo": "nix-on-droid",
"rev": "7b3cc6e3f9919b2d23003cfafb60c146c3f45793",
"type": "github"
},
"original": {
"owner": "t184256",
"owner": "nix-community",
"repo": "nix-on-droid",
"type": "github"
}
@ -1019,22 +1019,6 @@
"type": "github"
}
},
"nixpkgs-nvidia": {
"locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
}
},
"nixpkgs-pacemaker": {
"locked": {
"lastModified": 1707746079,
@ -1504,7 +1488,6 @@
"nix-melt": "nix-melt",
"nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs_4",
"nixpkgs-nvidia": "nixpkgs-nvidia",
"nixpkgs-wayland": "nixpkgs-wayland",
"nms": "nms",
"nur": "nur",
@ -1517,7 +1500,6 @@
"pointer-event-src": "pointer-event-src",
"pokemon-colorscripts-src": "pokemon-colorscripts-src",
"secrets": "secrets",
"spotifywm-src": "spotifywm-src",
"touch-gestures-src": "touch-gestures-src",
"trash-d-src": "trash-d-src",
"vimplugin-riscv-src": "vimplugin-riscv-src",
@ -1583,22 +1565,6 @@
"type": "github"
}
},
"spotifywm-src": {
"flake": false,
"locked": {
"lastModified": 1666732863,
"narHash": "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=",
"owner": "dasJ",
"repo": "spotifywm",
"rev": "8624f539549973c124ed18753881045968881745",
"type": "github"
},
"original": {
"owner": "dasJ",
"repo": "spotifywm",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

27
flake.nix
View file

@ -104,8 +104,7 @@
home-manager = {
type = "github";
# FIXME: wait for https://github.com/nix-community/home-manager/pull/5038
owner = "matt1432";
owner = "nix-community";
repo = "home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -120,7 +119,7 @@
nix-on-droid = {
type = "github";
owner = "t184256";
owner = "nix-community";
repo = "nix-on-droid";
inputs = {
@ -144,9 +143,7 @@
nix-gaming = {
type = "github";
# FIXME: https://github.com/fufexan/nix-gaming/issues/161
# owner = "fufexan";
owner = "NotAShelf";
owner = "fufexan";
repo = "nix-gaming";
};
@ -202,16 +199,6 @@
};
# Desktop inputs
nixpkgs-nvidia = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
# This was the last commit where my nvidia drivers
# were working correctly while gaming
rev = "1536926ef5621b09bba54035ae2bb6d806d72ac8";
};
hyprland = {
type = "github";
owner = "hyprwm";
@ -341,14 +328,6 @@
};
## Overlays
spotifywm-src = {
# FIXME: remove this input once this gets merged: https://github.com/NixOS/nixpkgs/pull/261501
type = "github";
owner = "dasJ";
repo = "spotifywm";
flake = false;
};
gpu-screen-recorder-src = {
type = "git";
url = "https://repo.dec05eba.com/gpu-screen-recorder";

5
modules/nvidia.nix
View file

@ -64,8 +64,9 @@ in {
package = with config.boot.kernelPackages.nvidiaPackages;
if cfg.enableWayland
# Vulkan is much more stable in Wayland
then vulkan_beta
# Keep the driver version at 535.xx.xx for Wayland desktop
# games stutter on more recent versions
then production
else stable;
};