From 7a283f4bbca19eb8d4e9ea3ec1721e40717f27df Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 30 Dec 2024 13:50:29 +0100 Subject: [PATCH 1/3] Use latest kernel on framework --- nki-framework/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nki-framework/hardware-configuration.nix b/nki-framework/hardware-configuration.nix index e88c852..c814573 100644 --- a/nki-framework/hardware-configuration.nix +++ b/nki-framework/hardware-configuration.nix @@ -12,7 +12,6 @@ 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" From 65410deb2fa1519a784c89d4b5a4f81f22169443 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 30 Dec 2024 13:52:43 +0100 Subject: [PATCH 2/3] Add associations for telegram --- home/modules/linux/graphical/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix index 35a29eb..499088a 100644 --- a/home/modules/linux/graphical/default.nix +++ b/home/modules/linux/graphical/default.nix @@ -131,6 +131,8 @@ 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 @@ -167,6 +169,10 @@ 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 From 73764de6f415f808d1971aec6401d8efe34bfdd0 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sat, 4 Jan 2025 15:48:03 +0100 Subject: [PATCH 3/3] Set diff conflictStyle to zdiff3 https://github.blog/open-source/git/highlights-from-git-2-35/ https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle --- home/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index 2034fce..4d34941 100644 --- a/home/common.nix +++ b/home/common.nix @@ -106,7 +106,7 @@ .kakrc ''}"; safe.directory = "*"; - merge.conflictstyle = "diff3"; + merge.conflictstyle = "zdiff3"; }; };