home/common.nix

@@ -108,7 +108,7 @@
           .kakrc
         ''}";
         safe.directory = "*";
-        merge.conflictstyle = "zdiff3";
+        merge.conflictstyle = "diff3";
       };
     };
 

home/modules/linux/graphical/default.nix

@@ -142,8 +142,6 @@ in
       "x-scheme-handler/feed" = [ "thunderbird.desktop" ];
       "application/rss+xml" = [ "thunderbird.desktop" ];
       "application/x-extension-rss" = [ "thunderbird.desktop" ];
-      "x-scheme-handler/tg2" = [ "org.telegram.desktop.desktop" ];
-      "x-scheme-handler/tonsite2" = [ "org.telegram.desktop.desktop" ];
     };
     xdg.mimeApps.defaultApplications = {
       # Email
@@ -180,10 +178,6 @@ in
 
       # Files
       "inode/directory" = [ "dolphin.desktop" ];
-
-      # Telegram
-      "x-scheme-handler/tg2" = "org.telegram.desktop.desktop";
-      "x-scheme-handler/tonsite2" = "org.telegram.desktop.desktop";
     };
 
     # Add one for kakoune

nki-framework/hardware-configuration.nix

@@ -12,6 +12,7 @@
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelPackages = pkgs.linuxPackages; # until mesa fixed
   boot.kernelParams = [
     # Hibernation
     "resume=UUID=fa8aaf51-b99f-4fb4-9230-8c0957d8af3f"