gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire sound in VM is fixed

Browse source 
various fixes
This commit is contained in:
Gerg-L 2023-07-30 10:26:24 -04:00
parent b343c564b2
commit 1debd48ceb
6 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -4,7 +4,6 @@
master.url = "github:nixos/nixpkgs"; master.url = "github:nixos/nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
stable.url = "github:nixos/nixpkgs/nixos-23.05"; stable.url = "github:nixos/nixpkgs/nixos-23.05";
pipewire_fix.url = "github:nixos/nixpkgs/45a55711fe12d0aada3aa04746082cf1b83dfbf3";
#nix 2.17 #nix 2.17
nix.url = "github:nixos/nix/7b39a388b382e7912de3c5951faad42fe2d72f48"; nix.url = "github:nixos/nix/7b39a388b382e7912de3c5951faad42fe2d72f48";

10
hosts/gerg-desktop/disko.nix
View file

@ -90,10 +90,7 @@ in {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/"; mountpoint = "/";
postCreateHook = '' postCreateHook = "zfs snapshot rpool/root@empty";
zfs snapshot rpool/root@empty
zfs snapshot rpool/root@lastboot
'';
}; };
"nix" = { "nix" = {
type = "zfs_fs"; type = "zfs_fs";
@ -105,10 +102,7 @@ in {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/var"; mountpoint = "/var";
postCreateHook = '' postCreateHook = "zfs snapshot rpool/var@empty";
zfs snapshot rpool/var@empty
zfs snapshot rpool/var@lastboot
'';
}; };
"persist" = { "persist" = {
type = "zfs_fs"; type = "zfs_fs";

2
hosts/gerg-desktop/spicetify.nix
View file

@ -2,7 +2,7 @@
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
ex = spicePkgs.extensions; ex = spicePkgs.extensions;
in { in {
imports = [spicetify-nix.nixosModule]; imports = [spicetify-nix.nixosModules.default];
local.allowedUnfree = ["spotify"]; local.allowedUnfree = ["spotify"];
programs.spicetify = { programs.spicetify = {
enable = true; enable = true;

6
hosts/gerg-desktop/vfio.nix
View file

@ -1,4 +1,4 @@
{pipewire_fix, ...}: { {...}: {
pkgs, pkgs,
lib, lib,
config, config,
@ -9,7 +9,7 @@ let
xcfg = config.services.xserver; xcfg = config.services.xserver;
xserverbase = let xserverbase = let
fontsForXServer = fontsForXServer =
config.fonts.fonts config.fonts.packages
++ [ ++ [
pkgs.xorg.fontadobe100dpi pkgs.xorg.fontadobe100dpi
pkgs.xorg.fontadobe75dpi pkgs.xorg.fontadobe75dpi
@ -52,8 +52,6 @@ in {
'' ''
); );
}; };
####VM SOUND BORKED
services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
boot = { boot = {
kernelParams = [ kernelParams = [
"amd_iommu=on" "amd_iommu=on"

10
hosts/gerg-desktop/zfs.nix
View file

@ -30,15 +30,9 @@ _: {
availableKernelModules = ["hid_generic"]; availableKernelModules = ["hid_generic"];
#wipe / and /var on boot #wipe / and /var on boot
postDeviceCommands = lib.mkAfter '' 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 #wipe everything
zfs rollback -r rpool/root@empty zfs rollback -r rpool/root@empty
zfs rollback -r rpool/var@empty zfs rollback -r rpool/var@empty
''; '';
}; };
plymouth.enable = false; plymouth.enable = false;

4
modules/theming.nix
View file

@ -58,8 +58,8 @@ in {
xrdb -load /etc/xdg/Xresources xrdb -load /etc/xdg/Xresources
''; '';
fonts = { fonts = {
fonts = [pkgs.overpass]; packages = [pkgs.overpass];
enableDefaultFonts = false; enableDefaultPackages = false;
fontDir.enable = true; fontDir.enable = true;
fontconfig = { fontconfig = {
enable = true; enable = true;