configurations: Add stable nixpkgs for other hosts, use one Arg

This commit is contained in:
2023-10-27 14:01:54 +02:00
parent 154d850e49
commit 2f0a613381
39 changed files with 367 additions and 148 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
{
imports =
[
+4 -4
View File
@@ -1,4 +1,4 @@
{ config, pkgs, materusPkgs, lib, ... }:
{ config, pkgs, materusArg, lib, ... }:
{
home.stateVersion = "23.05";
home.homeDirectory = "/home/materus";
@@ -67,13 +67,13 @@
home.packages = [
pkgs.papirus-icon-theme
materusPkgs.ffmpeg6-amf-full
(materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; })
materusArg.pkgs.ffmpeg6-amf-full
(materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; })
];
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ];
package = materusPkgs.obs-amf;
package = materusArg.pkgs.obs-amf;
};
}
+1 -1
View File
@@ -1,5 +1,5 @@
{ config, pkgs, lib, inputs, materusFlake, materusPkgs, ... }:
{ config, pkgs, lib,... }:
{
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
let
video = [
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, materusPkgs, ... }:
{ config, pkgs, lib, materusArg, ... }:
{
imports =
[
@@ -7,8 +7,8 @@
];
hardware.firmware = with pkgs; [
#materusPkgs.amdgpu-pro-libs.firmware.vcn
#materusPkgs.amdgpu-pro-libs.firmware
#materusArg.pkgs.amdgpu-pro-libs.firmware.vcn
#materusArg.pkgs.amdgpu-pro-libs.firmware
linux-firmware
alsa-firmware
sof-firmware
@@ -37,13 +37,13 @@
amdvlk
rocmPackages.clr.icd
rocmPackages.clr
materusPkgs.amdgpu-pro-libs.vulkan
materusPkgs.amdgpu-pro-libs.amf
materusArg.pkgs.amdgpu-pro-libs.vulkan
materusArg.pkgs.amdgpu-pro-libs.amf
];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
vaapiVdpau
pkgs.driversi686Linux.amdvlk
materusPkgs.i686Linux.amdgpu-pro-libs.vulkan
materusArg.pkgs.i686Linux.amdgpu-pro-libs.vulkan
libvdpau-va-gl
];
services.udev.extraRules = ''
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
{
zramSwap = {
enable = true;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, materusPkgs, ... }:
{ config, pkgs, lib, ... }:
let
westonSddm = pkgs.writeText "weston.ini"
''
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
{
networking.useDHCP = lib.mkDefault true;
networking.hostName = "materusPC";
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
let
valkyrie-sync = pkgs.writeShellScriptBin "valkyrie-sync" ''
${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/nixos-config materus@valkyrie:/materus/config/ && \
+3 -3
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, materusPkgs, ... }:
{ config, pkgs, lib, materusArg, ... }:
{
virtualisation.lxc.enable = false;
@@ -193,7 +193,7 @@
firefox
gamescope
#(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
materusPkgs.amdgpu-pro-libs.prefixes
materusArg.pkgs.amdgpu-pro-libs.prefixes
(pkgs.bottles.override { extraPkgs = pkgs: with pkgs; [ pkgs.libsForQt5.breeze-qt5 pkgs.libsForQt5.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
glibc
glib
@@ -251,7 +251,7 @@
# pgcli
# litecli
materusPkgs.alvr
materusArg.pkgs.alvr
#zenmonitor
nix-du
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
{
imports = [
./win10
@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, materusFlake, ... }:
{ config, pkgs, lib, ... }:
let
startHook = /*''