fix(packages): reorganize

configs/packages/default.nix

@@ -2,32 +2,55 @@
 {
   imports = [
     ./krebs.nix
-    ./programming.nix
     ./writing.nix
     ./python.nix
     ./haskell
     {
-      environment =
+      environment.systemPackages =
+      let
+        nightly = pkgs.rustChannelOf {
+          date = "2019-12-27";
+          channel = "nightly";
+        };
+      in with pkgs; [
+        htmlTidy
+        nodePackages.csslint
+        nodePackages.jsonlint
+        nodePackages.prettier
+        nodePackages.typescript
+        nodePackages.yarn
+        nodejs
+        nodePackages.javascript-typescript-langserver
+
+        tokei # count lines of code
+        gnumake
+        binutils # for strip, ld, ...
+        nightly.rust
+        shellcheck
+      ];
+    }
+    {
+      /*
+      environment.systemPackages =
       let
         package = pkgs.fetchFromGitHub {
           owner = "kmein";
           repo = "mahlzeit";
-          rev = "85cb6d41e31fdfccbc3f83fd61cce8ef35112562";
+          rev = "954c0fb3f45815999bc65d003794af6a850b069c";
-          sha256 = "0n6kc782dqbi64ya5jx5x8dcay2axrz1qbrlk4lyr6qnh241rr73";
+          sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg";
         };
         mahlzeit = pkgs.haskellPackages.callPackage package {};
-      in {
+      in [ mahlzeit ];
-        systemPackages = [ mahlzeit ];
+      */
-      };
     }
-    {
+  ];
+
   environment.systemPackages = with pkgs; [
-      ] ++ [ # internet
+    # INTERNET
     aria2
     firefox
     tor-browser-bundle-bin
     qutebrowser
-        # thunderbird
     tdesktop
     w3m
     wget
@@ -35,75 +58,66 @@
     whois
     ddgr
     ix
+    # thunderbird
     # python3Packages.instaloader
     # mtr # my traceroute
-      ] ++ [
+    # FILE MANAGERS
+    ranger
     gnome3.nautilus
-      ] ++ [ # media
+    # MEDIA
     ffmpeg
     imagemagick
     sxiv
-      ] ++ [ # archive
+    # ARCHIVE TOOLS
     unzip
     unrar
     p7zip
     zip
-      ] ++ [ # monitor
+    # MONITORS
     htop
-        iotop
+    iotop # I/O load monitor
-        iftop
+    iftop # interface bandwidth monitor
-        lsof
+    lsof # list open files
-        psmisc
+    psmisc # for killall, pstree
-      ] ++ [ # shell
+    # SHELL
-        bat
+    bat # better cat
+    du-dust # better du
+    fd # better find
+    file # determine file type
     dos2unix
-        ncdu
+    ncdu # ncurses disk usage
-        du-dust
-        fd
-        file
     python3Packages.jsonschema # json validation
-        jq # json manipulation
+    jq # json toolkit
     jo # json creation
-        kmein.nav # json navigation
+    xsv # csv toolkit
-        xsv
+    xmlstarlet # xml toolkit
-        xmlstarlet
     manpages
     posix_man_pages
-        moreutils
+    moreutils # for parallel, sponge, combine
-        ranger
+    ripgrep # better grep
-        ripgrep
     rlwrap
     progress # display progress bars for pipes
     up # universal plumber (piping tool)
-      ] ++ [ # hardware
+    # HARDWARE TOOLS
-        usbutils
+    usbutils # for lsusb
-        pciutils
+    pciutils # for lspci
-        lshw
+    lshw # for lshw
-      ] ++ [ # graphical
+    arandr # xrandr for noobs
-        arandr
+    libnotify # for notify-send
-        libnotify
+    xclip # clipboard CLI
-        xclip
+    xorg.xkill # kill by clicking
-        xorg.xkill
-      ] ++ [ # programming
-        nix-prefetch-git
-      ] ++ [ # media
     audacity
     calibre
     inkscape
-        xpdf
+    pdfgrep # search in pdf
-        pdfgrep
+    pdftk # pdf toolkit
-        pdftk
     spotify
     python3Packages.spotify-cli-linux
     youtubeDL
-      ] ++ [ # math
+    bc # calculator
-        bc
-      ] ++ [ # shell
-        pass
-        # (pass.withExtensions (ext: [ext.pass-otp]))
     fzf
+    pass
     gnupg
-        # kmein.mnemosyne
     kmein.favicon
     # kmein.bvg
     kmein.daybook
@@ -112,18 +126,21 @@
     kmein.genius
     kmein.instaget
     kmein.literature-quote
+    kmein.nav # json navigation
     kmein.n
+    kmein.vf
+    kmein.vg
+    kmein.fkill
     kmein.odyssey
     kmein.wttr
     # kmein.slide
     kmein.tolino-screensaver
     memo
+    nix-prefetch-git
     nix-git
-        # fzf-wrappers
     par
     qrencode
     wtf
   ];
-    }
+
-  ];
 }

configs/packages/programming.nix

@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-let
-  nightly = pkgs.rustChannelOf {
-    date = "2019-12-27";
-    channel = "nightly";
-  };
-in {
-  imports = [
-    {
-      environment.systemPackages = with pkgs; [
-        htmlTidy
-        nodePackages.csslint
-        nodePackages.jsonlint
-        nodePackages.prettier
-        nodePackages.typescript
-        nodePackages.yarn
-        nodejs
-        nodePackages.javascript-typescript-langserver
-      ];
-    }
-  ];
-
-  environment.systemPackages = with pkgs; [
-    tokei # count lines of code
-    gnumake
-    gcc
-    binutils # strip, ld, ...
-    # rustup
-    nightly.rust
-    shellcheck
-  ];
-}