diff --git a/flake.lock b/flake.lock index 441c4fc..1a8de95 100644 --- a/flake.lock +++ b/flake.lock @@ -89,17 +89,18 @@ "inputs": { "deploy": "deploy", "devshell": "devshell", + "nixlib": "nixlib", "nixpkgs": [ "nixos" ], "utils": "utils_2" }, "locked": { - "lastModified": 1620950194, - "narHash": "sha256-3fh8kUxZ/by7QP7vop+C+X6nj/YzYHnld9epGbRWKQ0=", + "lastModified": 1621012625, + "narHash": "sha256-xRBbDpQDUz3mSwL2WoePz6c3zIUtZ2ML3qW0B9CVspU=", "owner": "divnix", "repo": "devlib", - "rev": "213afcefb2db0bb5fd3fad871303c43b158d8204", + "rev": "b0de71f4924e513e21d21a0ec60a2cb180f2187c", "type": "github" }, "original": { @@ -207,11 +208,11 @@ }, "latest": { "locked": { - "lastModified": 1620996356, - "narHash": "sha256-uP6yxaBnOOdmPz1piipZT3+AUdsVjqBjLMDCLFnw8r8=", + "lastModified": 1621018889, + "narHash": "sha256-+TP7qxrRB4uYFL9DnCehr0oaiK44nszKExr62nuE508=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89cc391728876b394c04cf53c984260c3034617e", + "rev": "cc2fc35667b5871ad8a7fc7a73d32f4e81068c4c", "type": "github" }, "original": { @@ -281,6 +282,21 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1620519687, + "narHash": "sha256-+6Dd72b2CASuXm2W7KRxZIE7AOy/dj4mU28vaF+zxcs=", + "owner": "divnix", + "repo": "nixpkgs.lib", + "rev": "c7b6169809c5f74dd0c34f3d69e9d12ba4d448de", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixos": { "locked": { "lastModified": 1620901170, @@ -365,11 +381,11 @@ }, "nur": { "locked": { - "lastModified": 1620989058, - "narHash": "sha256-nH0i0kUrAAKYs/CoJf+wwlbY3dqGdbXYVRMqLtV1aTs=", + "lastModified": 1621012357, + "narHash": "sha256-Qi1AYYeL1QCiSYPlxJQ0AsKJ8A3HGFE2ghC2nU6syLg=", "owner": "nix-community", "repo": "NUR", - "rev": "7d17ceb9815035ae55c9a66f23acbce2e7cf65ad", + "rev": "fac280e3ddb06cc9c03f9795afe35482fe96edeb", "type": "github" }, "original": { diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index 48abd5d..bd439c8 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -122,9 +122,16 @@ in sudo.extraConfig = '' Defaults lecture = never ''; + rtkit.enable = true; }; - sound.enable = true; + sound.enable = false; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; hardware = { opengl = { driSupport = true; @@ -142,11 +149,12 @@ in ++ [ pkgs.driversi686Linux.amdvlk ]; }; pulseaudio = { - enable = true; + enable = false; support32Bit = true; }; }; + environment = { systemPackages = [ btrfsDiff ]; pathsToLink = [ "/share/zsh" ]; @@ -170,13 +178,6 @@ in xserver = { videoDrivers = [ "amdgpu" ]; }; - pipewire = { - enable = false; - alsa = { - enable = true; - support32Bit = true; - }; - }; postgresql = { enable = false; enableTCPIP = true; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 6a55ee1..973b9ac 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -128,7 +128,9 @@ in "--ignore-gpu-blocklist" "--enable-gpu-rasterization" "--enable-zero-copy" - "--disable-gpu-driver-bug-workarounds" + # "--enable-features=VaapiVideoDecoder" + # "--use-gl=egl" + # "--disable-gpu-driver-bug-workarounds" ]; in pkgs.writeScriptBin "chromium-wayland" ''