nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into niri

Browse source
This commit is contained in:
Natsu Kagami 2025-01-16 18:57:49 +01:00
parent 3e6aa971bf 73764de6f4
commit d7a35463fe
Signed by: nki
GPG key ID: 55A032EB38B49ADB
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/common.nix
View file

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

6
home/modules/linux/graphical/default.nix
View file

@ -142,6 +142,8 @@ in
"x-scheme-handler/feed" = [ "thunderbird.desktop" ]; "x-scheme-handler/feed" = [ "thunderbird.desktop" ];
"application/rss+xml" = [ "thunderbird.desktop" ]; "application/rss+xml" = [ "thunderbird.desktop" ];
"application/x-extension-rss" = [ "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 = { xdg.mimeApps.defaultApplications = {
# Email # Email
@ -178,6 +180,10 @@ in
# Files # Files
"inode/directory" = [ "dolphin.desktop" ]; "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 # Add one for kakoune

1
nki-framework/hardware-configuration.nix
View file

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