From 9bc5d2e85d79d6529c4b35509902882e67de63ec Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 11 Nov 2022 21:23:25 +0100
Subject: [PATCH] home: several changes

- add TEXMFHOME variable
- Include mutable_config to ssh config
- add package `kondo`
- mpd uses xdg music userdir
---
 home/home.nix         |  9 ++++++++-
 home/packages.nix     |  1 +
 home/programs/git.nix | 12 ++++++++++--
 home/services/mpd.nix |  3 +--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 782bd54..d26f30a 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -68,6 +68,10 @@ in {
       '';
     };
 
+    sessionVariables = {
+      TEXMFHOME = "$HOME/documents/texmf";
+    };
+
     pointerCursor = mkIf graphics  {
       package = pkgs.capitaine-cursors;
       name = "capitaine-cursors";
@@ -99,7 +103,10 @@ in {
     };
     mpv.enable = mkIf graphics true;
     obs-studio.enable = mkIf graphics true;
-    ssh.enable = true;
+    ssh = {
+      enable = true;
+      includes = [ "mutable_config" ];
+    };
     skim = {
       enable = true;
       defaultCommand ="fd --type f";
diff --git a/home/packages.nix b/home/packages.nix
index 90b2e8c..30ecb56 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -38,6 +38,7 @@ in {
     kepubify
     keybase
     keymapviz
+    kondo
     lastpass-cli
     lazydocker
     libwebp
diff --git a/home/programs/git.nix b/home/programs/git.nix
index 58fea8f..7ac5049 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}:
+{ pkgs, ... }:
 {
   programs.git = {
     enable = true;
@@ -12,6 +12,15 @@
       signByDefault = true;
     };
 
+    delta = {
+      enable = true;
+      options = {
+        line-numbers = true;
+        side-by-side = true;
+        theme = "Monokai Extended Origin";
+      };
+    };
+
     aliases = {
         aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
         uncommit = "reset --soft HEAD^";
@@ -39,7 +48,6 @@
         untrackedCache = true;
 
         editor = "nvim";
-        pager = "less";
       };
 
       "color \"branch\"".upstream = "cyan";
diff --git a/home/services/mpd.nix b/home/services/mpd.nix
index f206682..89c4e8e 100644
--- a/home/services/mpd.nix
+++ b/home/services/mpd.nix
@@ -2,8 +2,7 @@
 {
   services.mpd = rec {
     enable = true;
-    musicDirectory = "${config.services.dropbox.path}/music/music";
-    # musicDirectory = "${config.home.homeDirectory}/music";
+    musicDirectory = config.xdg.userDirs.music;
     playlistDirectory = "${musicDirectory}/playlists/MPD";
   };
 }