chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fix] broken git stuff oops

Browse source
This commit is contained in:
Chris Cochrun 2026-05-08 14:50:40 -05:00
parent bc0987c09a
commit 20ff907a08
6 changed files with 0 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/desktop.nix
View file

@ -19,11 +19,7 @@ in
boot = {
<<<<<<< HEAD
kernelPackages = pkgs.linuxPackages_zen;
=======
kernelPackages = pkgs.linuxPackages_6_18;
>>>>>>> 4827e2d (updates?)
kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
};

4
modules/gaming.nix
View file

@ -107,11 +107,7 @@ with lib;
};
environment.systemPackages = with pkgs; [
airshipper
<<<<<<< HEAD
lutris
=======
# lutris
>>>>>>> 4827e2d (updates?)
heroic
protonup-qt
winePackages.waylandFull