Skip to content

Commit

Permalink
back to latest kernel and cleaned up TODOs
Browse files Browse the repository at this point in the history
Note: nvidia open issue should be fixed
(NixOS/nixpkgs#344460)
  • Loading branch information
gerwin3 committed Oct 21, 2024
1 parent 7777ab3 commit 7adfa33
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{
nixpkgs.overlays = [
inputs.nur.overlay
# FIXME: Temporarily overlay sway and wlroots so we get the latest
# TODO: Temporarily overlay sway and wlroots so we get the latest
# master version which fixes the tearing issue, until Sway 1.10 is
# released. Took this excellent overlay from here:
# https://github.com/lovesegfault/nix-config/blob/c6bff2fde78b7b68d143bb78886e73b68b6eb0c0/nix/overlays/sway-unstable.nix
Expand Down
5 changes: 0 additions & 5 deletions home/modules/sway.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{ pkgs, ... }:

{
# TODO: Switch to master branch of Sway. This may fix flickering on desktop
# since the master branch has a newer wl-roots version that has fixes for it.
# Would need to do some overlay tricks or something. Probably will do this
# once I get really annoyed by the flickering.

wayland.windowManager.sway = {
enable = true;
config =
Expand Down
5 changes: 1 addition & 4 deletions nixos/hardware/desktop-custom-Ryzen.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
boot = {
extraModulePackages = [ ];
kernelModules = [ "kvm-amd" ];
# TODO: Temporarily holding back on 6.11 because of an issue with NVIDIA
# modesetting which makes everything break. See this Arch wiki thread:
# https://bbs.archlinux.org/viewtopic.php?id=299450
kernelPackages = pkgs.linuxPackages_6_10;
kernelPackages = pkgs.linuxPackages_latest;
loader.efi.canTouchEfiVariables = true;
initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
Expand Down

0 comments on commit 7adfa33

Please sign in to comment.