From b8bd8612bb348439922231c432776ba8fbbfd20b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 19 Nov 2024 10:26:21 +0100
Subject: [PATCH] home: prefer modules over direct package imports

---
 home/home.nix             | 4 ++++
 home/packages.nix         | 6 ------
 home/programs/pandoc.nix  | 4 ++++
 home/programs/ripgrep.nix | 4 ++++
 home/programs/yt-dlp.nix  | 4 ++++
 home/services/keybase.nix | 5 +++++
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 home/programs/pandoc.nix
 create mode 100644 home/programs/ripgrep.nix
 create mode 100644 home/programs/yt-dlp.nix
 create mode 100644 home/services/keybase.nix

diff --git a/home/home.nix b/home/home.nix
index 41573ef..8a8e6e2 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -22,10 +22,13 @@ in {
     ./programs/less.nix
     ./programs/neovim
     ./programs/nix-index
+    ./programs/pandoc.nix
+    ./programs/ripgrep.nix
     ./programs/ssh
     ./programs/tealdeer
     ./programs/thunderbird.nix
     ./programs/tmux
+    ./programs/yt-dlp.nix
     ./programs/zsh
 
     ./services/nix-channel-update.nix
@@ -54,6 +57,7 @@ in {
     ./services/copyq.nix
     ./services/dunst.nix
     ./services/fcitx5.nix
+    ./services/keybase.nix
     ./services/mpd.nix
     ./services/picom.nix
     ./services/polybar.nix
diff --git a/home/packages.nix b/home/packages.nix
index b06911a..704559c 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -5,7 +5,6 @@
     cloc
     cyme
     czkawka
-    delta
     diskonaut
     duf
     duff
@@ -21,7 +20,6 @@
     httpie
     imagemagick
     kepubify
-    # keybase
     keymapviz
     libwebp
     lnav
@@ -41,18 +39,15 @@
     # nixops
     nmap
     ouch
-    pandoc
     parallel
     progress
     pwntools
     python3
     rclone
-    ripgrep
     rsync
     # sc-im
     slack-term
     tea
-    tealdeer
     terminal-parrot
     termtosvg
     toilet
@@ -64,7 +59,6 @@
     waifu2x-converter-cpp
     wavemon
     wiki-tui
-    yt-dlp
     yubico-pam
     yubikey-agent
     yubikey-manager
diff --git a/home/programs/pandoc.nix b/home/programs/pandoc.nix
new file mode 100644
index 0000000..6a296e1
--- /dev/null
+++ b/home/programs/pandoc.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.pandoc.enable = true;
+}
diff --git a/home/programs/ripgrep.nix b/home/programs/ripgrep.nix
new file mode 100644
index 0000000..65b1ca6
--- /dev/null
+++ b/home/programs/ripgrep.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.ripgrep.enable = true;
+}
diff --git a/home/programs/yt-dlp.nix b/home/programs/yt-dlp.nix
new file mode 100644
index 0000000..540fa1d
--- /dev/null
+++ b/home/programs/yt-dlp.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.yt-dlp.enable = true;
+}
diff --git a/home/services/keybase.nix b/home/services/keybase.nix
new file mode 100644
index 0000000..a22f883
--- /dev/null
+++ b/home/services/keybase.nix
@@ -0,0 +1,5 @@
+{ ... }:
+{
+  services.keybase.enable = true;
+  services.kbfs.enable = true;
+}