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

Compare commits

base: nki:73764de6f415f808d1971aec6401d8efe34bfdd0
Branches Tags
nki:master
nki:kakoune-package
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:b8dee3e2081384f947c84ec55b2d4e14454092ed
Branches Tags
nki:kakoune-package
nki:master
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

No commits in common. "73764de6f415f808d1971aec6401d8efe34bfdd0" and "b8dee3e2081384f947c84ec55b2d4e14454092ed" have entirely different histories.
73764de6f4 ... b8dee3e208

3 changed files with 2 additions and 7 deletions
Show stats Expand all files Collapse all files

2
home/common.nix
View file

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

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

@ -131,8 +131,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
@ -169,10 +167,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

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

@ -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"