nix optimise; restructure packages

config.nix

@@ -13,6 +13,9 @@ in {
     configs/retiolum.nix
   ];
 
+  nix.optimise.automatic = true;
+  nix.gc.automatic = true;
+
   time.timeZone = "Europe/Berlin";
 
   sound.enable = true;

configs/packages.nix

@@ -1,5 +1,7 @@
 { config, pkgs, lib, ... }:
-let scripts = import ../dot/scripts.nix { inherit pkgs lib; };
+let
+  scripts = import ../dot/scripts.nix { inherit pkgs lib; };
+  daybook = pkgs.callPackage ../packages/daybook.nix {};
 in with pkgs;
 {
   nixpkgs.config.allowUnfree = true;
@@ -7,56 +9,73 @@ in with pkgs;
   fonts.enableDefaultFonts = true;
   fonts.fonts = [
     corefonts
-    xlibs.fontschumachermisc
     eb-garamond
     fira
-    font-awesome-ttf
     libertine
     lmodern
     powerline-fonts
     roboto
+    xlibs.fontschumachermisc
   ];
 
   environment.systemPackages = [
+  ] ++ [ # office
     abiword
-    arandr
+    gnumeric
-    bat
+  ] ++ [ # theme
-    blueman
-    chromium
     config.constants.theme.gtk.package
     config.constants.theme.icon.package
     config.constants.theme.cursor.package
-    dos2unix
+  ] ++ [ # internet
-    ffmpeg
+    aria2
-    file
+    chromium
     firefox
-    git
-    gnumake
-    gnumeric
-    gthumb
-    htop
-    imagemagick
-    libnotify
-    lsof
-    lxappearance
-    mpv
-    pamixer
-    pavucontrol
-    pmount
-    ranger
-    ripgrep
-    tree
-    rlwrap
     tor-browser-bundle-bin
-    unzip
     w3m
     wget
     whois
-    xclip
+  ] ++ [ # media
+    ffmpeg
+    mpv
+    pamixer
+    pavucontrol
+    gthumb
+    imagemagick
     sxiv
+    blueman
+    zathura
+  ] ++ [ # archive
+    unzip
+    unrar
+    p7zip
+  ] ++ [ # monitor
+    htop
+    iotop
+    iftop
+    lsof
+    psmisc
+  ] ++ [ # shell
+    bat
+    dos2unix
+    file
+    git
+    manpages
+    posix_man_pages
+    most
+    ranger
+    ripgrep
+    rlwrap
+    tree
+  ] ++ [ # hardware
+    pmount
+    usbutils
+    pciutils
+  ] ++ [ # graphical
+    arandr
+    libnotify
+    xclip
     xorg.xkill
     wpa_supplicant_gui
-    zathura
   ];
 
   programs.command-not-found.enable = true;
@@ -69,6 +88,7 @@ in with pkgs;
   services.dbus.packages = [ pkgs.gnome3.dconf ];
 
   users.users.kfm.packages = scripts ++ [
+  ] ++ [ # typesetting
     (texlive.combine { inherit (pkgs.texlive)
       scheme-tetex
       latexmk
@@ -90,49 +110,53 @@ in with pkgs;
       stdclsdv
       xstring;
     })
-    (callPackage ../packages/daybook {})
+    pandoc
-    audacity
+    haskellPackages.pandoc-citeproc
-    cabal-install
+  ] ++ [ # programming
-    cabal2nix
-    calibre
     cloc
+    gnumake
+    cabal2nix
     clojure
-    dropbox-cli
-    fsharp
     gcc
     ghc
-    gnuplot
-    graphviz
-    grive2
     haskellPackages.ghcid
     haskellPackages.hakyll
     haskellPackages.hasktags
     haskellPackages.hindent
     haskellPackages.hoogle
-    pandoc
-    haskellPackages.pandoc-citeproc
     hlint
-    inkscape
-    jo jq
     lua
-    maxima
-    memo
     mypy
     nix-prefetch-git
     nodejs
     ocaml
-    par
     python3
     python36Packages.black
     python36Packages.flake8
     racket-minimal
     rustup
     scala
-    seafile-client
     shellcheck
+    stack
+  ] ++ [ # media
+    audacity
+    calibre
     youtubeDL
     spotify
-    stack
+    inkscape
-    # zeroad
+  ] ++ [ # cloud
+    dropbox-cli
+    grive2
+    seafile-client
+  ] ++ [ # math
+    bc
+    graphviz
+    maxima
+  ] ++ [ # shell
+    daybook
+    jo
+    jq
+    memo
+    par
   ];
 }

packages/daybook.nix

@@ -4,17 +4,17 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "daybook";
-    rev = "370c62bc19d514efc55451fca19d6aa26ba5e893";
+    rev = "cad1aef158b0df36861434eb04c953d99a122e80";
-    sha256 = "0dqah4ml561xbizkbah0s7n4mqn7y5dcpwbp3x7cj5ypr7y225gp";
+    sha256 = "07qippyry0yjf971pnqxm9i0xpvih8mvbhxwfwpwq980jik1hbl1";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ pandoc ];
   buildPhase = ''
-    pandoc --standalone --to man daybook.1.md -o daybook.1
+    mkdir -p $out/share/man/man1
+    pandoc --standalone --to man daybook.1.md -o $out/share/man/man1/daybook.1
   '';
   installPhase = ''
-    mkdir -p $out/{bin,share/man/man1}
+    mkdir -p $out/bin
-    install daybook.1 $out/share/man/man1
     install daybook $out/bin
     wrapProgram $out/bin/daybook --prefix PATH ":" ${pandoc}/bin ;
   '';