aboutsummaryrefslogtreecommitdiff
path: root/home.nix
diff options
context:
space:
mode:
authorAdrian Kummerlaender2025-12-12 13:11:38 +0100
committerAdrian Kummerlaender2025-12-12 13:11:38 +0100
commit07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495 (patch)
treea8cc3b2b715dbdc73900a1b1b70880684331aa2d /home.nix
parentef560bb1d546766e64b666b16377c3b06d4c1ce1 (diff)
downloadnixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar.gz
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar.bz2
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar.lz
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar.xz
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.tar.zst
nixos_home-07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495.zip
Update to 25.11, manually pull in deprecated stuff for emacswayland
I do not understand why helm-ag and helm-sweep were removed in MELPA… They work perfectly fine.
Diffstat (limited to 'home.nix')
-rw-r--r--home.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/home.nix b/home.nix
index 2e068c4..c2377fb 100644
--- a/home.nix
+++ b/home.nix
@@ -29,14 +29,15 @@
programs.git = {
enable = true;
- package = pkgs.gitAndTools.gitFull;
+ package = pkgs.gitFull;
lfs.enable = true;
- difftastic.enable = true;
- userName = "Adrian Kummerlaender";
- userEmail = "adrian@kummerlaender.eu";
+ settings.user = {
+ name = "Adrian Kummerlaender";
+ email = "adrian@kummerlaender.eu";
+ };
- extraConfig = {
+ settings = {
core.editor = "vim";
merge.tool = "${pkgs.meld}/bin/meld";
pull.ff = "only";
@@ -45,6 +46,8 @@
};
};
+ programs.difftastic.enable = true;
+
programs.ssh = {
enable = true;
matchBlocks = {