From 52287631d2d07c00c92d5f795014d02c1f680b52 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Sat, 8 Aug 2020 17:38:29 +0400
Subject: [PATCH] new packages

---
 modules/applications/bpytop.nix   | 30 ++++++++++++++++++++++++++++++
 modules/applications/nomino.nix   | 26 ++++++++++++++++++++++++++
 modules/applications/packages.nix | 11 +++++++----
 modules/packages.nix              |  4 ++++
 modules/workspace/zsh.nix         | 10 ++++++++--
 5 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 modules/applications/bpytop.nix
 create mode 100644 modules/applications/nomino.nix

diff --git a/modules/applications/bpytop.nix b/modules/applications/bpytop.nix
new file mode 100644
index 0000000..ed4c24c
--- /dev/null
+++ b/modules/applications/bpytop.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+stdenv.mkDerivation rec {
+  name = "bpytop";
+  version = "1.0.7";
+
+  src = fetchFromGitHub {
+    owner = "aristocratos";
+    repo = "${name}";
+    rev = "v${version}";
+    sha256 = "08hi55wh423j1rfdivnil94sg9admxygzv1diibfygwvknilv9qj";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ psutil ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -p bpytop.py "$out/bin/bpytop"
+    mkdir -p "$out/share/bpytop/doc"
+    cp -p README.md "$out/share/bpytop/doc"
+    cp -pr themes "$out/share/bpytop"
+    chmod 755 "$out/bin/bpytop"
+  '';
+
+  meta = {
+    homepage = "https://github.com/aristocratos/bpytop";
+    description = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes.";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ alukardbf ];
+  };
+}
\ No newline at end of file
diff --git a/modules/applications/nomino.nix b/modules/applications/nomino.nix
new file mode 100644
index 0000000..0876c0f
--- /dev/null
+++ b/modules/applications/nomino.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  pname = "nomino";
+  version = "0.4.2";
+
+  cargoSha256 = "sha256-9p/HD16yreWdjbCaUaan07fnVpPwOCiHaVemfXP6L8c=";
+
+  src = fetchFromGitHub {
+    owner = "yaa110";
+    repo = "nomino";
+    rev = "8f437051ea51d333aa685679f0e5902d6709d7ef";
+    sha256 = "1qmy73gmmf0i9svzrw2jz7nlypfybyd1izwd1a13fgm9dn7amja3";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Batch rename utility for developers";
+    homepage = "https://github.com/yaa110/nomino";
+    license = licenses.mit;
+    maintainers = with maintainers; [ alukardbf ];
+  };
+}
\ No newline at end of file
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 5c40e92..6b4386d 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -42,7 +42,6 @@ in {
     libva-utils
     lm_sensors
     libnotify
-    tree
     gparted
     neofetch
     bashmount
@@ -50,14 +49,18 @@ in {
     feh
 
     # new tools
-    tldr
+    tealdeer
+    pinfo
     ncdu
     fd
     ripgrep
     lnav
-    advance-touch
+    advance-touch # python3 pip
     exa
-    vimv
+    nomino # rust build
+    bpytop
+    nnn
+    # vimv
     # cli
     ranger
     youtube-dl
diff --git a/modules/packages.nix b/modules/packages.nix
index cc901e0..65cc853 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -20,6 +20,10 @@
 
         advance-touch = pkgs.callPackage ./applications/advance-touch.nix { };
 
+        nomino = pkgs.callPackage ./applications/nomino.nix { };
+
+        bpytop = pkgs.callPackage ./applications/bpytop.nix { };
+
         # git-with-libsecret = super.git.override { withLibsecret = true; };
 
         # spotifyd = super.spotifyd.override { withPulseAudio = true; };
diff --git a/modules/workspace/zsh.nix b/modules/workspace/zsh.nix
index e8bf191..c91ab23 100644
--- a/modules/workspace/zsh.nix
+++ b/modules/workspace/zsh.nix
@@ -29,7 +29,7 @@
     shellAliases = {
       "clr" = "clear";
       "weather" = "curl wttr.in/Volzhskiy";
-      "l" = "ls -lah --group-directories-first";
+      # "l" = "ls -lah --group-directories-first";
       "rede" = "systemctl --user start redshift.service &";
       "redd" = "systemctl --user stop redshift.service &";
       "bare" = "systemctl --user start barrier-client.service &";
@@ -41,7 +41,13 @@
       "nsp" = "nix-shell --run zsh -p";
       "find" = "fd";
       "grep" = "rg";
-      "mkdir" = "ad";
+      # "mkdir" = "ad";
+      "man" = "pinfo";
+      "l" = "exa -lahgGF@ --git --group-directories-first";
+      "tree" = "exa -T";
+      "ltree" = "exa -lhgFT@ --git";
+      "atree" = "exa -aT";
+      "latree" = "exa -lahgFT@ --git";
     };
     initExtra = ''
       nixify() {