mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
pipewire sound in VM is fixed
various fixes
This commit is contained in:
parent
b343c564b2
commit
1debd48ceb
6 changed files with 9 additions and 24 deletions
|
|
@ -4,7 +4,6 @@
|
|||
master.url = "github:nixos/nixpkgs";
|
||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
stable.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||
pipewire_fix.url = "github:nixos/nixpkgs/45a55711fe12d0aada3aa04746082cf1b83dfbf3";
|
||||
#nix 2.17
|
||||
nix.url = "github:nixos/nix/7b39a388b382e7912de3c5951faad42fe2d72f48";
|
||||
|
||||
|
|
|
|||
|
|
@ -90,10 +90,7 @@ in {
|
|||
type = "zfs_fs";
|
||||
options.mountpoint = "legacy";
|
||||
mountpoint = "/";
|
||||
postCreateHook = ''
|
||||
zfs snapshot rpool/root@empty
|
||||
zfs snapshot rpool/root@lastboot
|
||||
'';
|
||||
postCreateHook = "zfs snapshot rpool/root@empty";
|
||||
};
|
||||
"nix" = {
|
||||
type = "zfs_fs";
|
||||
|
|
@ -105,10 +102,7 @@ in {
|
|||
type = "zfs_fs";
|
||||
options.mountpoint = "legacy";
|
||||
mountpoint = "/var";
|
||||
postCreateHook = ''
|
||||
zfs snapshot rpool/var@empty
|
||||
zfs snapshot rpool/var@lastboot
|
||||
'';
|
||||
postCreateHook = "zfs snapshot rpool/var@empty";
|
||||
};
|
||||
"persist" = {
|
||||
type = "zfs_fs";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
|
||||
ex = spicePkgs.extensions;
|
||||
in {
|
||||
imports = [spicetify-nix.nixosModule];
|
||||
imports = [spicetify-nix.nixosModules.default];
|
||||
local.allowedUnfree = ["spotify"];
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pipewire_fix, ...}: {
|
||||
{...}: {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
xcfg = config.services.xserver;
|
||||
xserverbase = let
|
||||
fontsForXServer =
|
||||
config.fonts.fonts
|
||||
config.fonts.packages
|
||||
++ [
|
||||
pkgs.xorg.fontadobe100dpi
|
||||
pkgs.xorg.fontadobe75dpi
|
||||
|
|
@ -52,8 +52,6 @@ in {
|
|||
''
|
||||
);
|
||||
};
|
||||
####VM SOUND BORKED
|
||||
services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
|
||||
boot = {
|
||||
kernelParams = [
|
||||
"amd_iommu=on"
|
||||
|
|
|
|||
|
|
@ -30,12 +30,6 @@ _: {
|
|||
availableKernelModules = ["hid_generic"];
|
||||
#wipe / and /var on boot
|
||||
postDeviceCommands = lib.mkAfter ''
|
||||
#destroy last snapshot
|
||||
zfs destroy rpool/root@lastboot
|
||||
zfs destroy rpool/var@lastboot
|
||||
#create new snapshot
|
||||
zfs snapshot rpool/root@lastboot
|
||||
zfs snapshot rpool/var@lastboot
|
||||
#wipe everything
|
||||
zfs rollback -r rpool/root@empty
|
||||
zfs rollback -r rpool/var@empty
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ in {
|
|||
xrdb -load /etc/xdg/Xresources
|
||||
'';
|
||||
fonts = {
|
||||
fonts = [pkgs.overpass];
|
||||
enableDefaultFonts = false;
|
||||
packages = [pkgs.overpass];
|
||||
enableDefaultPackages = false;
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue