From a51d20153b81807aa389112c6a8dc8d539348a04 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 8 Nov 2023 09:19:18 +0300 Subject: [PATCH] Make git diff use bat and use "" more consistently with '' --- machines/enka/bat/default.nix | 8 ++++++-- machines/enka/helix/default.nix | 14 +++++++------- machines/enka/nushell/configuration.nu | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix index 1bf63c1..4b6e9da 100644 --- a/machines/enka/bat/default.nix +++ b/machines/enka/bat/default.nix @@ -6,8 +6,12 @@ (homeConfiguration "nixos" { programs.nushell.environmentVariables = { - MANPAGER = "\"sh -c 'col --spaces --no-backspaces | bat --plain --language man'\""; - PAGER = "\"bat --plain\""; + MANPAGER = ''"sh -c 'col --spaces --no-backspaces | bat --plain --language man'"''; + PAGER = "'bat --plain'"; + }; + + programs.nushell.shellAliases = { + "'git diff'" = "sh -c 'git diff --name-only --relative --diff-filter=d | xargs bat --diff'"; }; programs.bat = enabled { diff --git a/machines/enka/helix/default.nix b/machines/enka/helix/default.nix index 1ee61cc..e98f2a2 100644 --- a/machines/enka/helix/default.nix +++ b/machines/enka/helix/default.nix @@ -17,13 +17,13 @@ }; settings.editor.auto-pairs = { - "(" = ")"; - "{" = "}"; - "[" = "]"; - "\"" = "\""; - "'" = "'"; - "<" = ">"; - "`" = "`"; + "(" = ")"; + "{" = "}"; + "[" = "]"; + '"' = '"'; + "'" = "'"; + "<" = ">"; + "`" = "`"; }; settings.editor.statusline.mode = { diff --git a/machines/enka/nushell/configuration.nu b/machines/enka/nushell/configuration.nu index 7103bec..474b8d7 100644 --- a/machines/enka/nushell/configuration.nu +++ b/machines/enka/nushell/configuration.nu @@ -152,7 +152,7 @@ $env.config = { $choice } } - } else if ($completions | where value =~ '^.*ERR$' | is-empty) { + } else if ($completions | where value =~ "^.*ERR$" | is-empty) { $completions } else { null