backup

2026-05-09 18:45:12 -03:00
parent 302dd4204a
commit 0a42499661
2 changed files with 0 additions and 5 deletions
@@ -12,7 +12,6 @@
    git
    vim
    wget
-    screen
    fish
    btop
    fastfetch
@@ -17,10 +17,6 @@ in
  ];

  boot = {
-<<<<<<< HEAD
-    kernelPackages = pkgs.linux_cachyos-server;
-=======
->>>>>>> 8c424e69b85789b646939b1787e64e7cb8e5a341
    loader = {
      systemd-boot.enable = true;
      efi = {