Xmodmap: use Caps_Lock as compose key

[julm/julm-nix.git] / home-manager / profiles / git.nix

diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix
index 677f4a68a6340329c5dcea9c104c96f9fbb00884..645a2e8d8588b566cbd5ad07bda74da318732486 100644 (file)
--- a/home-manager/profiles/git.nix
+++ b/home-manager/profiles/git.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 {
   home.packages = lib.mkIf config.programs.git.enable [
     pkgs.b4
@@ -19,7 +24,10 @@
   ];
   programs.git = {
     enable = lib.mkDefault true;
-    ignores = [ "*~" "*.swp" ];
+    ignores = [
+      "*~"
+      "*.swp"
+    ];
     package = lib.mkDefault pkgs.gitMinimal;
     aliases = {
       a = "add";
@@ -122,38 +130,38 @@
     };
     iniContent = {
       /*
-      diff.external = lib.concatStringsSep " " [
-        "${pkgs.difftastic}/bin/difft"
-          "--color auto"
-          "--background dark"
-          "--display side-by-side"
-      ];
+        diff.external = lib.concatStringsSep " " [
+          "${pkgs.difftastic}/bin/difft"
+            "--color auto"
+            "--background dark"
+            "--display side-by-side"
+        ];
       */
       # difftastic
       /*
-      diff.tool = "difftastic";
-      difftool.prompt = false;
-      difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
-      pager.difftool = true;
+        diff.tool = "difftastic";
+        difftool.prompt = false;
+        difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
+        pager.difftool = true;
       */
 
       # delta
       /*
-      core.pager = "delta --grep-separator-symbol keep";
-      interactive.diffFilter = "delta --color-only --features=interactive";
-      delta.features = "decorations";
-      delta.interactive = {
-        keep-plus-minus-markers = false;
-      };
-      delta.decorations = {
-        commit-decoration-style = "blue ol";
-        commit-style = "raw";
-        file-style = "omit";
-        hunk-header-decoration-style = "blue box";
-        hunk-header-file-style = "red";
-        hunk-header-line-number-style = "#067a00";
-        hunk-header-style = "file line-number syntax";
-      };
+        core.pager = "delta --grep-separator-symbol keep";
+        interactive.diffFilter = "delta --color-only --features=interactive";
+        delta.features = "decorations";
+        delta.interactive = {
+          keep-plus-minus-markers = false;
+        };
+        delta.decorations = {
+          commit-decoration-style = "blue ol";
+          commit-style = "raw";
+          file-style = "omit";
+          hunk-header-decoration-style = "blue box";
+          hunk-header-file-style = "red";
+          hunk-header-line-number-style = "#067a00";
+          hunk-header-style = "file line-number syntax";
+        };
       */
     };
   };