From bd87765fc470681cb0793260bedcc733d3bf5300 Mon Sep 17 00:00:00 2001
From: Konstantin Nazarov <mail@knazarov.com>
Date: Sat, 23 Nov 2024 09:51:10 +0000
Subject: [PATCH] Update notes.sh and q.sh

---
 configuration.nix | 13 ++++++++++++-
 flake.lock        | 16 ++++++++--------
 flake.nix         |  2 +-
 nil_cli.nix       |  6 +++---
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 94f36c2..d841680 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -129,6 +129,7 @@ in {
     wayland
     xdg-utils
     glib
+    bc
     dracula-theme
     adwaita-icon-theme
     swaylock
@@ -220,6 +221,9 @@ in {
     networkmanagerapplet
 
     qpwgraph
+
+    bat
+    chafa
   ];
 
   services.blueman.enable = true;
@@ -473,6 +477,13 @@ in {
 
     };
 
+    programs.bat = {
+      enable = true;
+      config = {
+        theme = "ansi";
+      };
+    };
+
     programs.bash = {
       enable = true;
       bashrcExtra = ''
@@ -485,7 +496,7 @@ in {
       shellAliases = {
         nn = "notes.sh -n";
         ne =
-          ''notes.sh -l | fzf --tac --with-nth="2..-1" | xargs -o notes.sh -e'';
+          ''notes.sh -l | fzf --tac --with-nth="2..-1" --preview "notes.sh -p {}" --print-query --bind 'alt-enter:print-query' | xargs -o -d "\n" -n 2 notes.sh -f'';
         vim = "emacs -nw --no-splash";
 
       };
diff --git a/flake.lock b/flake.lock
index 33d9f1b..44db1ff 100755
--- a/flake.lock
+++ b/flake.lock
@@ -140,16 +140,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1696170164,
-        "narHash": "sha256-ew+zhK/okYJdOdl3yWcRzi0NHfVbnXzS+EjlOf8vN6k=",
+        "lastModified": 1731919109,
+        "narHash": "sha256-v2PcqyIHui4Nb5lZHs46CltQAJ8f+FjQR27L2fbNzS4=",
         "owner": "~knazarov",
-        "repo": "notes.sh",
-        "rev": "342615a128cf96f1d6cb69a9c09e408d9ff0ab11",
+        "repo": "notes2.sh",
+        "rev": "76038af8020ba4e5c4bf285fb75a127bfe335923",
         "type": "sourcehut"
       },
       "original": {
         "owner": "~knazarov",
-        "repo": "notes.sh",
+        "repo": "notes2.sh",
         "type": "sourcehut"
       }
     },
@@ -160,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730676982,
-        "narHash": "sha256-U3CN8+gSAUl5WVHZl5PxgXufIJ3VzoqngL5NgYbQ0S4=",
+        "lastModified": 1732088708,
+        "narHash": "sha256-OPoY+eqXhMAxk49cMQiADK5xx1gEXA5XSWIaK1htVrI=",
         "owner": "~knazarov",
         "repo": "q.sh",
-        "rev": "cc9cf1f36067bb5e5d1acbb5d9b8b2dbea6e7100",
+        "rev": "0ebd7c228cf34a0f60789a2a957bba0dca8e2773",
         "type": "sourcehut"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4dbb052..d9d7406 100755
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
     q-sh.url = "sourcehut:~knazarov/q.sh";
     q-sh.inputs.nixpkgs.follows = "nixpkgs";
-    notes-sh.url = "sourcehut:~knazarov/notes.sh";
+    notes-sh.url = "sourcehut:~knazarov/notes2.sh";
     notes-sh.inputs.nixpkgs.follows = "nixpkgs";
     knazarovcom.url = "sourcehut:~knazarov/knazarov.com";
     knazarovcom.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nil_cli.nix b/nil_cli.nix
index 927ced1..56dd1ba 100644
--- a/nil_cli.nix
+++ b/nil_cli.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nil_cli";
-  version = "2024.11.06";
+  version = "2024.11.20";
 
   src = fetchzip {
-    url = "https://github.com/NilFoundation/nil_cli/releases/download/2024.10.15/nil-linux-x64.zip";
-    sha256 = "sha256-KAPvRDo++q2g6vWPOrJcksVyBjEoNznjQlKGweD6rVg=";
+    url = "https://github.com/NilFoundation/nil_cli/releases/download/2024.11.20/nil-linux-x64.zip";
+    sha256 = "sha256-7WaUzsxe3u/0pu4cqvLvH7JESBpTixLu5GhBx0dLEsE=";
   };
 
   phases = ["installPhase" "patchPhase"];