From d5cba4f6046a1c27de33bb26a6c7f31908e286a6 Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Mon, 31 Oct 2022 15:50:02 +0100
Subject: [PATCH] email, move programs from fish to default, abbrs

---
 home/christoph/default.nix | 77 +++++++++++++++++++++++++++++++++-----
 home/modules/fish.nix      | 41 +++-----------------
 2 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 3c4117d6..aefcd0ee 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -38,6 +38,10 @@ in rec {
       doom.autoUpgrade = false; # Very volatile as the upgrade fails sometimes with bleeding edge emacs
     };
 
+    email = {
+      enable = true;
+    }
+
     firefox = {
       enable = true;
       wayland = true;
@@ -226,7 +230,7 @@ in rec {
     # Web stuff
     signal-desktop
     protonvpn-cli
-    yt-dlp # download videos (from almost anywhere)
+    # yt-dlp # download videos (from almost anywhere) # HM program
     cyberdrop-dl # TODO: Make this somehow only available in the needed folder (but keep derivation here?)
     filezilla
 
@@ -240,7 +244,7 @@ in rec {
 
     # Office
     jabref # manage bibilography
-    sioyek # Scientific pdf reader
+    # sioyek # Scientific pdf reader # HM program
     xournalpp # Write with a pen
     libreoffice-qt
     hunspell # I cna't type
@@ -265,7 +269,7 @@ in rec {
     libsForQt5.kate
     libsForQt5.kwrited # Already included by default
     libsForQt5.ark
-    libsForQt5.kdeconnect-kde
+    libsForQt5.kdeconnect-kde # NOTE: Also has HM program
     libsForQt5.kcalc
     libsForQt5.ksystemlog
     libsForQt5.kfind
@@ -291,9 +295,47 @@ in rec {
   # Packages with extra options managed by HomeManager natively
   programs = {
     home-manager.enable = true;
+
+    # Potential future enables
+    # mangohud.enable = true;
+    # matplotlib.enable = true;
+    # kdeconnect.enable = true;
+
     bat.enable = true;
+    btop.enable = true;
+
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    # TODO: Configure this
+    # editorconfig.enable = true;
+
     exa.enable = true;
-    ssh.enable = true;
+
+    fzf = {
+      enable = true;
+      enableFishIntegration = config.modules.fish.enable;
+    };
+
+    gallery-dl.enable = true; # TODO: Alternative to cyberdrop-dl?
+
+    git = {
+      enable = true;
+      delta.enable = true;
+      userEmail = "christoph.urlacher@protonmail.com";
+      userName = "ChUrl";
+    };
+
+    # NOTE: If error occurs after system update on fish init run "ssh-add"
+    keychain = {
+      enable = true;
+      enableFishIntegration = config.modules.fish.enable;
+      enableXsessionIntegration = true;
+      agents = [ "ssh" ];
+      keys = [ "id_ed25519" ];
+    };
 
     # Realtime Motion Interpolation: https://gist.github.com/phiresky/4bfcfbbd05b3c2ed8645
     mpv = {
@@ -309,16 +351,31 @@ in rec {
       };
     };
 
-    direnv = {
+    nix-index = {
       enable = true;
-      nix-direnv.enable = true;
+      enableFishIntegration = config.modules.fish.enable;
     };
 
-    git = {
+    # Scientific pdf reader
+    sioyek = {
       enable = true;
-      delta.enable = true;
-      userEmail = "christoph.urlacher@protonmail.com";
-      userName = "ChUrl";
+      # bindings = {};
+      # config = {};
+    };
+
+    ssh.enable = true;
+
+    starship = {
+      enable = true;
+      enableFishIntegration = config.modules.fish.enable;
+    };
+
+    # TODO: Check HM module options
+    yt-dlp.enable = true;
+
+    zoxide = {
+      enable = true;
+      enableFishIntegration = config.modules.fish.enable;
     };
   };
 
diff --git a/home/modules/fish.nix b/home/modules/fish.nix
index 24b09627..d3052f30 100644
--- a/home/modules/fish.nix
+++ b/home/modules/fish.nix
@@ -45,15 +45,13 @@ in {
           kerrors = "journalctl -p 3 -xb -k";
 
           xxhamster = "TERM=ansi ssh christoph@217.160.142.51";
-
-          mp4 = "yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' --recode-video mp4"; # the -f options are yt-dlp defaults
-          mp3 = "yt-dlp -f 'ba' --extract-audio --audio-format mp3";
         }
 
         (optionalAttrs (contains config.home.packages pkgs.lazygit) { lg = "lazygit"; })
         (optionalAttrs (contains config.home.packages pkgs.gping) { ping = "gping"; })
         (optionalAttrs (contains config.home.packages pkgs.duf) { df = "duf"; })
         (optionalAttrs (contains config.home.packages pkgs.gdu) { du = "gdu"; })
+        (optionalAttrs config.programs.btop.enable { top = "btop"; })
         (optionalAttrs (contains config.home.packages pkgs.fzf) {
           fz = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";
         })
@@ -83,43 +81,16 @@ in {
           vpnkr = "protonvpn-cli c --cc kr";
           vpnoff = "protonvpn-cli d";
         })
+
+        (optionalAttrs config.programs.yt-dlp.enable {
+          mp4 = "yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' --recode-video mp4"; # the -f options are yt-dlp defaults
+          mp3 = "yt-dlp -f 'ba' --extract-audio --audio-format mp3";
+        })
       ];
 
       shellInit = ''
         set -e fish_greeting
       '';
     };
-
-    # I put these programs here as they all have fish integration and are connected to the shell,
-    # don't know if I will keep it that way
-
-    programs.fzf = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
-    # NOTE: If error occurs after system update on fish init run "ssh-add"
-    programs.keychain = {
-      enable = true;
-      enableFishIntegration = true;
-      enableXsessionIntegration = true;
-      agents = [ "ssh" ];
-      keys = [ "id_ed25519" ];
-    };
-
-    programs.nix-index = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
-    programs.starship = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
-    programs.zoxide = {
-      enable = true;
-      enableFishIntegration = true;
-    };
   };
 }