materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

materusPC: updates to work on unstable

This commit is contained in:
Mateusz Słodkowicz 2024-03-16 19:24:04 +01:00
parent bec5c7e764
commit 14349441ac
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configurations/host/materusPC/extraHome.nix
View File

@ -34,7 +34,9 @@
binutils binutils
coreutils coreutils
util-linux util-linux
openssl
openssl.dev
pkg-config
dotnet-sdk_8 dotnet-sdk_8
mono mono
mold mold
@ -82,7 +84,7 @@
]; ];
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = false;
plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ]; plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ];
package = materusArg.pkgs.obs-amf; package = materusArg.pkgs.obs-amf;
}; };

2
configurations/host/materusPC/gnome.nix
View File

@ -17,7 +17,7 @@
services.gnome.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true; services.gnome.core-os-services.enable = true;
programs.gnupg.agent.pinentryFlavor = "gnome3"; #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
programs.gnome-terminal.enable = true; programs.gnome-terminal.enable = true;

4
configurations/host/materusPC/hardware/boot.nix
View File

@ -18,7 +18,7 @@ in
#Kernel #Kernel
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_zen;
boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "vfio_iommu_type1.allow_unsafe_interrupts=1" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video; boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "vfio_iommu_type1.allow_unsafe_interrupts=1" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video;
boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "v4l2loopback" ]; boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci"];
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options kvm_amd nested=1 avic=1 npt=1 sev=0 options kvm_amd nested=1 avic=1 npt=1 sev=0
options vfio_iommu_type1 allow_unsafe_interrupts=1 options vfio_iommu_type1 allow_unsafe_interrupts=1
@ -32,7 +32,7 @@ in
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ /*v4l2loopback*/ ];
boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ]; boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ];

2
configurations/host/materusPC/kde.nix
View File

@ -42,7 +42,7 @@ in
}; };
services.xserver.desktopManager.plasma6.enable = true; services.xserver.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.plasma6.enableQt5Integration = true; services.xserver.desktopManager.plasma6.enableQt5Integration = true;
programs.gnupg.agent.pinentryFlavor = "gnome3"; #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ]; environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
environment.variables = { environment.variables = {

2
configurations/host/materusPC/tmp.nix
View File

@ -254,7 +254,7 @@
protontricks protontricks
gnupg gnupg
pinentry pinentry
pinentry-gnome pinentry-gnome3
pinentry-curses pinentry-curses
ncurses ncurses
monkeysphere monkeysphere

3
configurations/profile/home/default.nix
View File

@ -60,8 +60,7 @@ in
enableZshIntegration = lib.mkDefault config.programs.zsh.enable; enableZshIntegration = lib.mkDefault config.programs.zsh.enable;
}; };
programs.exa.enable = lib.mkDefault cfg.enableTerminalExtra; programs.eza.enable = lib.mkDefault cfg.enableTerminalExtra;
programs.exa.enableAliases = lib.mkDefault config.programs.exa.enable;
programs.yt-dlp.enable = lib.mkDefault cfg.enableTerminalExtra; programs.yt-dlp.enable = lib.mkDefault cfg.enableTerminalExtra;