mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
switch to unstable
This commit is contained in:
parent
ac289cdfb1
commit
727793c1a2
2 changed files with 6 additions and 8 deletions
|
|
@ -1,11 +1,11 @@
|
||||||
inputs@{
|
inputs@{
|
||||||
stable,
|
unstable,
|
||||||
self,
|
self,
|
||||||
disko,
|
disko,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (stable) lib;
|
inherit (unstable) lib;
|
||||||
in
|
in
|
||||||
# Only good use case for rec
|
# Only good use case for rec
|
||||||
rec {
|
rec {
|
||||||
|
|
@ -173,12 +173,12 @@ rec {
|
||||||
hostName:
|
hostName:
|
||||||
# Whats lib.nixosSystem? never heard of her
|
# Whats lib.nixosSystem? never heard of her
|
||||||
lib.evalModules {
|
lib.evalModules {
|
||||||
specialArgs.modulesPath = "${stable}/nixos/modules";
|
specialArgs.modulesPath = "${unstable}/nixos/modules";
|
||||||
|
|
||||||
modules = builtins.concatLists [
|
modules = builtins.concatLists [
|
||||||
(builtins.attrValues self.nixosModules)
|
(builtins.attrValues self.nixosModules)
|
||||||
(map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}"))
|
(map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}"))
|
||||||
(import "${stable}/nixos/modules/module-list.nix")
|
(import "${unstable}/nixos/modules/module-list.nix")
|
||||||
(lib.singleton {
|
(lib.singleton {
|
||||||
networking = {
|
networking = {
|
||||||
inherit hostName;
|
inherit hostName;
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,13 @@ in
|
||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf (!cfg.gpuAcceleration.disable) {
|
(lib.mkIf (!cfg.gpuAcceleration.disable) {
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport = true;
|
enable32Bit = true;
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(lib.mkIf (!cfg.sound.disable) {
|
(lib.mkIf (!cfg.sound.disable) {
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
sound.enable = lib.mkForce false; # disable alsa
|
|
||||||
hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio
|
hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue