All: cleanup downgrade to stable
This commit is contained in:
parent
4f3d0a8203
commit
2980202261
19
flake.lock
19
flake.lock
|
@ -138,15 +138,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721852138,
|
"lastModified": 1720042825,
|
||||||
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
|
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
|
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -248,11 +249,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721911538,
|
"lastModified": 1722017959,
|
||||||
"narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=",
|
"narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f",
|
"rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +297,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721821769,
|
"lastModified": 1721949857,
|
||||||
"narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=",
|
"narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6",
|
"rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
# Home-manager support
|
# Home-manager support
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ in
|
||||||
ui = {
|
ui = {
|
||||||
desktops.gnome = {
|
desktops.gnome = {
|
||||||
enable = true;
|
enable = true;
|
||||||
tripleBuffering.enable = true;
|
tripleBuffering.enable = false; # FIXME: Weird build error
|
||||||
};
|
};
|
||||||
flatpak = {
|
flatpak = {
|
||||||
# Enable Flatpak support.
|
# Enable Flatpak support.
|
||||||
|
|
|
@ -17,10 +17,10 @@ in
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
|
|
||||||
hardware.graphics = {
|
hardware.opengl = {
|
||||||
extraPackages = [ pkgs.amdvlk ];
|
extraPackages = [ pkgs.amdvlk ];
|
||||||
# 32-bit application compatibility
|
# 32-bit application compatibility
|
||||||
enable32Bit = true;
|
driSupport32Bit = true;
|
||||||
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,7 +19,7 @@ in
|
||||||
|
|
||||||
environment.variables.VDPAU_DRIVER = "va_gl";
|
environment.variables.VDPAU_DRIVER = "va_gl";
|
||||||
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
(
|
(
|
||||||
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
||||||
vaapiIntel
|
vaapiIntel
|
||||||
|
@ -30,7 +30,7 @@ in
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.graphics.extraPackages32 = with pkgs.driversi686Linux; [
|
hardware.opengl.extraPackages32 = with pkgs.driversi686Linux; [
|
||||||
(
|
(
|
||||||
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
||||||
vaapiIntel
|
vaapiIntel
|
||||||
|
|
|
@ -57,7 +57,7 @@ in
|
||||||
aux.system.allowUnfree = true;
|
aux.system.allowUnfree = true;
|
||||||
|
|
||||||
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
|
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
|
||||||
hardware.graphics.extraPackages = with pkgs; [ vaapiVdpau ];
|
hardware.opengl.extraPackages = with pkgs; [ vaapiVdpau ];
|
||||||
|
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue