From 2f1df249a462220ea614bb4fbea343ae2c022e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Tue, 3 Jan 2023 16:09:39 +0100
Subject: [PATCH] add more programs

---
 config/home-manager/base.nix |   6 +-
 config/programs/git.nix      |   2 +
 config/programs/theming.nix  |   1 +
 extra/mc-catppuccin.ini      | 140 +++++++++++++++++++++++++++++++++++
 4 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 extra/mc-catppuccin.ini

diff --git a/config/home-manager/base.nix b/config/home-manager/base.nix
index 8e78b188..170eb270 100644
--- a/config/home-manager/base.nix
+++ b/config/home-manager/base.nix
@@ -22,6 +22,8 @@ desktop: {pkgs, ...}: {
     };
     atuin.enable = true;
     autojump.enable = true;
+    jq.enable = true;
+    ledger.enable = true;
   };
   home.file.".p10k.zsh".source = ./.p10k.zsh;
 
@@ -40,13 +42,13 @@ desktop: {pkgs, ...}: {
       [
         yubico-piv-tool
         ripgrep
-        jq
         gh
         htop
         sops
         ncdu
         progress
         hexyl
+        mc
       ]
       ++ (
         if desktop
@@ -55,6 +57,8 @@ desktop: {pkgs, ...}: {
           yt-dlp
           oxipng
           jpegoptim
+          picard
+          easytag
         ]
         else []
       );
diff --git a/config/programs/git.nix b/config/programs/git.nix
index 5334871f..48307923 100644
--- a/config/programs/git.nix
+++ b/config/programs/git.nix
@@ -11,5 +11,7 @@
       init.defaultBranch = "main";
       merge.conflictstyle = "diff3";
     };
+    delta.enable = true;
   };
+  programs.gitui.enable = true;
 }
diff --git a/config/programs/theming.nix b/config/programs/theming.nix
index ed8311e5..de3caa0b 100644
--- a/config/programs/theming.nix
+++ b/config/programs/theming.nix
@@ -573,4 +573,5 @@ in {
     color sidebar_flagged   color1 default    # Mailboxes with flagged mails are Red
     color sidebar_new       color10 default   # Mailboxes with new mail are Green
   '';
+  home.file.".local/share/mc/skins/catppuccin.ini".source = ../../extra/mc-catppuccin.ini;
 }
diff --git a/extra/mc-catppuccin.ini b/extra/mc-catppuccin.ini
new file mode 100644
index 00000000..4d162669
--- /dev/null
+++ b/extra/mc-catppuccin.ini
@@ -0,0 +1,140 @@
+[skin]
+    description = Catppuccin
+
+[Lines]
+    horiz = ─
+    vert = │
+    lefttop = ╭
+    righttop = ╮
+    leftbottom = ╰
+    rightbottom = ╯
+    topmiddle = ┬
+    bottommiddle = ┴
+    leftmiddle = ├
+    rightmiddle = ┤
+    cross = ┼
+    dhoriz = ─
+    dvert = │
+    dlefttop = ╭
+    drighttop = ╮
+    dleftbottom = ╰
+    drightbottom = ╯
+    dtopmiddle = ┬
+    dbottommiddle = ┴
+    dleftmiddle = ├
+    drightmiddle = ┤
+
+[filehighlight]
+    directory = blue;
+    executable = red;
+    symlink = cyan;
+    hardlink = cyan;
+    stalelink = cyan;
+    device = brightgreen;
+    special = green;
+    core = red;
+    temp = brightgreen;
+    archive = red;
+    doc = yellow;
+    source = brightcyan;
+    media = brightgreen;
+    graph = cyan;
+    database = brightred;
+
+[core]
+    _default_ = magenta;default
+    selected = black;cyan
+    marked = black;cyan
+    markselect = black;blue
+    gauge = black;magenta
+    input = blue;black
+    inputmark = black;red
+    inputunchanged = red;black
+    commandlinemark = white;red
+    reverse = black;magenta
+    header = black;magenta
+
+[dialog]
+    _default_ = magenta;gray
+    dfocus = black;magenta
+    dhotnormal = gray;magenta
+    dhotfocus = gray;magenta
+    dtitle = magenta;gray
+
+[error]
+    _default_ = red;gray
+    errdfocus = black;red
+    errdhotnormal = red;black
+    errdhotfocus = yellow;red
+    errdtitle = gray;red
+
+[menu]
+    _default_ = white;black
+    menusel = black;cyan
+    menuhot = black;cyan
+    menuhotsel = cyan;black
+    menuinactive = white;black
+
+[help]
+    _default_ = magenta;gray
+    helpitalic = red;black;italic
+    helpbold = brightgreen;black;bold
+    helplink = blue;black
+    helpslink = gray;blue
+    helptitle = gray;magenta
+
+[editor]
+    _default_ = magenta;default
+    editbold = brightgreen;black
+    editmarked = black;cyan
+    editwhitespace = brightblue;black
+    editlinestate = white;black
+    bookmark = black;red
+    bookmarkfound = black;brightgreen
+    editrightmargin = brightblue;black
+    editframe = brightgreen;
+    editframeactive = white;
+    editframedrag = brightblue;
+
+[viewer]
+    _default_ = magenta;default
+    viewbold = green;black;bold
+    viewunderline = red;black
+    viewselected = blue;black
+
+[popupmenu]
+    _default_ = white;black
+    menusel = black;cyan
+    menutitle = white;black
+
+[buttonbar]
+    hotkey = black;cyan
+    button = white;black
+
+[statusbar]
+    _default_ = white;black
+
+[diffviewer]
+    added = black;green
+    changedline = black;cyan
+    changednew = red;cyan
+    changed = black;yellow
+    removed = black;red
+    error = red;white
+
+[widget-common]
+    sort-sign-up = ↑
+    sort-sign-down = ↓
+
+[widget-panel]
+    hiddenfiles-sign-show = •
+    hiddenfiles-sign-hide = ○
+    history-prev-item-sign = «
+    history-next-item-sign = »
+    history-show-list-sign = ^
+    filename-scroll-left-char = «
+    filename-scroll-right-char = »
+
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕