citadel

commit 5ce1980d19d1b233c072517860b890c394c4fe1e
parent ace4c34954c0c1f75c73202201030577437239af
Author: William Casarin <jb55@jb55.com>
Date:   Sat,  2 Jan 2021 10:10:59 -0800

nix: add define

Diffstat:
A
jb55pkgs/pkgs/define/default.nix
 | 
42
++++++++++++++++++++++++++++++++++++++++++
M
nix-config/environment/default.nix
 | 
4
+---
M
nix-config/environment/desktop/default.nix
 | 
1
+

3 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/jb55pkgs/pkgs/define/default.nix b/jb55pkgs/pkgs/define/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, fetchurl
+, zstd
+, bash
+, less
+, sdcv
+, gnutar
+, writeScript
+}:
+let
+  dictd = stdenv.mkDerivation rec {
+    pname = "define-dict";
+    version = "0.1";
+
+    src = fetchurl {
+      url = "https://jb55.com/files/dict.tar";
+      sha256 = "fcaf90833b777a1fd9e62282deb245ad62f6ce536f78c6ef503c2d78c3084ab3";
+    };
+
+    installPhase = ''
+      mkdir -p $out/share
+      ${gnutar}/bin/tar xvf $src -C $out/share
+    '';
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "define";
+  version = "0.1";
+
+  src = writeScript "define" ''
+    #!${bash}/bin/bash
+    export LESS="$LESS --quit-if-one-screen"
+    ${sdcv}/bin/sdcv -n --data-dir=${dictd}/share "$@" | ${less}/bin/less
+  '';
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src $out/bin/define
+  '';
+}
diff --git a/nix-config/environment/default.nix b/nix-config/environment/default.nix
@@ -7,7 +7,6 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
       rev = "0.2.1";
       sha256 = "0xd86s2smjvlc7rlb6rkgx2hj3c3sbcz3gs8rf93x69jqdvwb6rr";
     }) {};
-    nixify = pkgs.nur.repos.kampka.nixify;
     myPackages = with jb55pkgs; [
        bcalc
        btcs
@@ -26,6 +25,7 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
        viscal
        zebra
        zoom-link-opener
+       define
     ];
     myHaskellPackages = with pkgs.haskellPackages; [
       #skeletons
@@ -71,7 +71,6 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
       minisign
       neovim
       network-tools
-      nixify
       nodejs
       opentimestamps-client
       par
@@ -79,7 +78,6 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
       patchelf
       pv
       python
-      ranger
       ripgrep
       rsync
       screen
diff --git a/nix-config/environment/desktop/default.nix b/nix-config/environment/desktop/default.nix
@@ -31,6 +31,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       dynamic-colors
       emacs
       feh
+      todo-txt-cli
       getmail # for getmail-gmail-xoauth-tokens
       gnome3.gnome-calculator
       gtk-engine-murrine