a bunch of code cleanup

This commit is contained in:
Gerg-L 2023-04-22 01:57:28 -04:00
parent 977d1ad6d2
commit 016a347d5e
19 changed files with 92 additions and 100 deletions

View file

@ -1,17 +1,17 @@
{spicetify-nix, ...}: {pkgs, ...}: let
sp-nix = spicetify-nix;
spicePkgs = sp-nix.packages.${pkgs.system}.default;
spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
ex = spicePkgs.extensions;
in {
nixpkgs.allowedUnfree = ["spotify"];
imports = [sp-nix.nixosModule];
imports = [spicetify-nix.nixosModule];
programs.spicetify = {
spotifyPackage = pkgs.spotify-unwrapped;
spicetifyPackage = pkgs.spicetify-cli;
enable = true;
enabledExtensions = with spicePkgs.extensions; [
adblock
hidePodcasts
shuffle
enabledExtensions = [
ex.adblock
ex.hidePodcasts
ex.shuffle
];
theme = spicePkgs.themes.Dribbblish;
colorScheme = "custom";

View file

@ -42,8 +42,8 @@ _: {
echo 'EndSection' >> $out
echo >> $out
'';
oneMonitor = pkgs.writeText "1-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/1-monitor.conf")]);
twoMonitor = pkgs.writeText "2-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/2-monitor.conf")]);
oneMonitor = pkgs.writeText "1-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]);
twoMonitor = pkgs.writeText "2-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]);
in {
boot = {
kernelParams = ["amd_iommu=on" "iommu=pt" "vfio_iommu_type1.allow_unsafe_interrupts=1" "kvm.ignore_msrs=1"];
@ -57,7 +57,6 @@ in {
patches =
old.patches
++ [
# "${self}/misc/qemu.diff"
(pkgs.writeText "qemu.diff" ''
diff --git a/ui/input-linux.c b/ui/input-linux.c
index e572a2e..a9d76ba 100644
@ -111,7 +110,7 @@ in {
'';
systemd.tmpfiles.rules = let
xml = pkgs.writeText "Windows.xml" (builtins.readFile "${self}/misc/Windows.xml");
xml = pkgs.writeText "Windows.xml" (builtins.readFile (self + /misc/Windows.xml));
qemuHook = pkgs.writeShellScript "qemu-hook" ''
GUEST_NAME="$1"
OPERATION="$2"