From 31a0b52f4f91756612e7c6c570e0f53e91e582d0 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sun, 1 Jan 2023 21:05:32 -0500
Subject: add some pkgs and readline config

Change-Id: I3f40661ebbe5b5d1aa95fb5241995e7596f94034
---
 lib/common.nix   | 26 ++++++++++++++++++++++++++
 lib/linux.nix    |  5 +++--
 lib/packages.nix |  3 +++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/common.nix b/lib/common.nix
index ff7edd6..7d5f520 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -70,6 +70,32 @@ in {
       enable = true;
     };
 
+    readline = {
+      enable = true;
+      variables = {
+        keyseq-timeout = 1200;
+        colored-stats = true;
+        colored-completion-prefix = true;
+        expand-tilde = true;
+      };
+      bindings = {
+        # wrap a command in '$(...| fzf)'
+        "\\C-xf" = ''"\C-e | fzf)\C-a(\C-a$\C-b\C-a"'';
+        "\\e\\C-f" = "dump-functions"; # help
+        "\\e\\C-o" = "dabbrev-expand"; # expand
+        "\\e\\C-v" = "dump-variables"; # help
+        "\\em" = "beginning-of-line";
+        # emacs-like history navigation
+        "\\en" = "next-history";
+        "\\ep" = "previous-history";
+      };
+      extraConfig = ''
+        $if Guile
+          "\C-o": "()\C-b"
+        $endif
+      '';
+    };
+
     fzf = {
       enable = true;
       enableBashIntegration = true;
diff --git a/lib/linux.nix b/lib/linux.nix
index a4af6c2..91c0c33 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -70,6 +70,7 @@ in
       dict
       dmenu
       feh
+      firefox
       flameshot
       gajim
       glibcLocales # rofi locale fix -- https://github.com/rycee/home-manager/issues/354#issuecomment-415914278
@@ -99,7 +100,7 @@ in
       xterm
       yank
       youtube-dl
-      yubioath-desktop
+      yubioath-flutter
       zathura
     ];
   };
@@ -319,7 +320,7 @@ in
     };
 
     random-background = {
-      enable = true;
+      enable = false;
       enableXinerama = true;
       imageDirectory = "%h/wallpaper";
       interval = "30m";
diff --git a/lib/packages.nix b/lib/packages.nix
index 6761da3..c0a1565 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -42,12 +42,14 @@ let
 in {
   home.packages = [
     amfora
+    ansifilter
     asciinema
     aspellDicts.en
     bat
     barrier
     bc
     cava
+    chafa
     cloc
     cmatrix
     direnv
@@ -77,6 +79,7 @@ in {
     ncdu
     nmap
     ncmpc
+    nix-index
     nix-prefetch-scripts
     nixos-generators
     noto-fonts-emoji
-- 
cgit v1.2.3