From 9d2192008510b338b69f4092b3fb0b395d89c488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 18 Aug 2019 11:17:28 +0200 Subject: [PATCH] reorganize packages --- configs/default.nix | 185 +++++-------------------------- configs/packages/default.nix | 102 ++++++++++++++++- configs/packages/krebs.nix | 1 + configs/packages/programming.nix | 28 +++++ configs/packages/writing.nix | 17 +++ 5 files changed, 177 insertions(+), 156 deletions(-) create mode 100644 configs/packages/programming.nix create mode 100644 configs/packages/writing.nix diff --git a/configs/default.nix b/configs/default.nix index 3a9f46f..ac1fa47 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -81,39 +81,40 @@ sncli = new.callPackage {}; }; }; - haskellPackages = - let mnemosyne-package = pkgs.fetchFromGitHub { - repo = "mnemosyne"; - owner = "kmein"; - rev = "6bfa13c88db176af80be90840ff03573d67d679f"; - sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca"; + haskellPackages = pkgs.haskellPackages.override { + overrides = new: old: { + blessings = new.callPackage {}; + scanner = new.callPackage {}; }; - in pkgs.haskellPackages.override { - overrides = new: old: { - mnemosyne = new.callPackage mnemosyne-package {}; - blessings = new.callPackage {}; - scanner = new.callPackage {}; - }; - }; - - autorenkalender = pkgs.callPackage {}; - bvg = pkgs.callPackage {}; - daybook = pkgs.callPackage {}; - font-size = pkgs.callPackage { font = config.niveum.fonts.terminal; }; - genius = pkgs.callPackage {}; - instaget = pkgs.callPackage {}; - iolanguage = pkgs.callPackage {}; - literature-quote = pkgs.callPackage {}; - n = pkgs.callPackage {}; - depp = pkgs.callPackage {}; - nix-git = pkgs.callPackage {}; - odyssey = pkgs.callPackage {}; - wttr = pkgs.callPackage {}; - nav = pkgs.callPackage {}; - git-preview = pkgs.callPackage {}; + }; git-quick-stats = pkgs.callPackage {}; writeDash = pkgs.writers.writeDash; writeDashBin = pkgs.writers.writeDashBin; + iolanguage = pkgs.callPackage {}; + nix-git = pkgs.callPackage {}; + + kmein = { + autorenkalender = pkgs.callPackage {}; + bvg = pkgs.callPackage {}; + daybook = pkgs.callPackage {}; + font-size = pkgs.callPackage { font = config.niveum.fonts.terminal; }; + genius = pkgs.callPackage {}; + instaget = pkgs.callPackage {}; + literature-quote = pkgs.callPackage {}; + n = pkgs.callPackage {}; + depp = pkgs.callPackage {}; + odyssey = pkgs.callPackage {}; + wttr = pkgs.callPackage {}; + nav = pkgs.callPackage {}; + haskellPackages.mnemosyne = + let mnemosyne-package = pkgs.fetchFromGitHub { + repo = "mnemosyne"; + owner = "kmein"; + rev = "6bfa13c88db176af80be90840ff03573d67d679f"; + sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca"; + }; + in pkgs.haskellPackages.callPackage mnemosyne-package {}; + }; }; }; } @@ -261,131 +262,5 @@ package = pkgs.openjdk; }; } - { - environment.systemPackages = with pkgs; [ - ] ++ [ # office - libreoffice - ] ++ [ # internet - aria2 - firefox - tor-browser-bundle-bin - thunderbird - tdesktop - w3m - wget - httpie - whois - ddgr - python3Packages.instaloader - mtr - ] ++ [ # media - ffmpeg - imagemagick - sxiv - ] ++ [ # archive - unzip - unrar - p7zip - zip - ] ++ [ # monitor - htop - iotop - iftop - lsof - psmisc - ] ++ [ # shell - bat - dos2unix - ncdu - du-dust - fd - file - jq - manpages - moreutils - posix_man_pages - ranger - ripgrep - rlwrap - tree - progress - up - reptyr - ] ++ [ # hardware - usbutils - pciutils - lshw - ] ++ [ # graphical - arandr - libnotify - xclip - xorg.xkill - ] ++ [ # typesetting - (texlive.combine { - inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo; - pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo"; - }) - pandoc - haskellPackages.pandoc-citeproc - # haskellPackages.patat - unstable.asciidoctor - proselint - ] ++ [ # programming - tokei - gnumake - gcc - binutils-unwrapped - htmlTidy - iolanguage - nix-prefetch-git - nodePackages.csslint - nodePackages.prettier - nodePackages.jsonlint - ruby - rubocop - rustup - shellcheck - ] ++ [ # media - audacity - calibre - inkscape - xpdf - pdfgrep - pdftk - spotify - python3Packages.spotify-cli-linux - youtubeDL - ] ++ [ # math - bc - ] ++ [ # shell - (aspellWithDicts (dict: [dict.de dict.en dict.la dict.en-computers dict.ru])) - bvg - autorenkalender - font-size - odyssey - haskellPackages.mnemosyne - literature-quote - daybook - gnupg - jo - memo - par - fzf - (pass.withExtensions (ext: [ext.pass-otp])) - qrencode - unstable.zola - unstable.hugo - wordnet - xsv - wttr - nav - instaget - genius - nix-git - n - wtf - depp - ]; - } ]; } diff --git a/configs/packages/default.nix b/configs/packages/default.nix index f73a88e..7b2e63e 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -1,6 +1,106 @@ -{ config, ... }: +{ pkgs, ... }: { imports = [ ./krebs.nix + ./programming.nix + ./writing.nix + { + environment.systemPackages = with pkgs; [ + ] ++ [ # internet + aria2 + firefox + tor-browser-bundle-bin + thunderbird + tdesktop + w3m + wget + httpie + whois + ddgr + python3Packages.instaloader + mtr # my traceroute + ] ++ [ # media + ffmpeg + imagemagick + sxiv + ] ++ [ # archive + unzip + unrar + p7zip + zip + ] ++ [ # monitor + htop + iotop + iftop + lsof + psmisc + ] ++ [ # shell + bat + dos2unix + ncdu + du-dust + fd + file + jq # json manipulation + jo # json creation + kmein.nav # json navigation + xsv + xmlstarlet + manpages + posix_man_pages + moreutils + ranger + ripgrep + rlwrap + progress # display progress bars for pipes + up # universal plumber (piping tool) + ] ++ [ # hardware + usbutils + pciutils + lshw + ] ++ [ # graphical + arandr + libnotify + xclip + xorg.xkill + ] ++ [ # programming + nix-prefetch-git + ] ++ [ # media + audacity + calibre + inkscape + xpdf + pdfgrep + pdftk + spotify + python3Packages.spotify-cli-linux + youtubeDL + ] ++ [ # math + bc + ] ++ [ # shell + (pass.withExtensions (ext: [ext.pass-otp])) + fzf + gnupg + kmein.haskellPackages.mnemosyne + kmein.autorenkalender + kmein.bvg + kmein.daybook + kmein.depp + kmein.font-size + kmein.genius + kmein.instaget + kmein.literature-quote + kmein.n + kmein.odyssey + kmein.wttr + memo + nix-git + par + qrencode + unstable.hugo + unstable.zola + wtf + ]; + } ]; } diff --git a/configs/packages/krebs.nix b/configs/packages/krebs.nix index 35266c1..f93e4f7 100644 --- a/configs/packages/krebs.nix +++ b/configs/packages/krebs.nix @@ -10,6 +10,7 @@ let krebs-packages = pkgs: { krebspaste = pkgs.callPackage {}; bepasty-client-cli = pkgs.callPackage {}; irc-announce = pkgs.callPackage {}; + git-preview = pkgs.callPackage {}; }; in { nixpkgs.config.packageOverrides = krebs-packages; diff --git a/configs/packages/programming.nix b/configs/packages/programming.nix new file mode 100644 index 0000000..7e46244 --- /dev/null +++ b/configs/packages/programming.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: +{ + imports = [ + { + environment.systemPackages = with pkgs; [ + htmlTidy + nodePackages_10_x.csslint + nodePackages_10_x.jsonlint + nodePackages_10_x.prettier + nodePackages_10_x.typescript + nodePackages_10_x.yarn + nodejs-10_x + ]; + } + ]; + + environment.systemPackages = with pkgs; [ + tokei # count lines of code + gnumake + gcc + binutils # strip, ld, ... + iolanguage + ruby + rubocop + rustup + shellcheck + ]; +} diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix new file mode 100644 index 0000000..c4a8c30 --- /dev/null +++ b/configs/packages/writing.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + (texlive.combine { + inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo; + pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo"; + }) + # haskellPackages.patat + (aspellWithDicts (dict: [dict.de dict.en dict.la dict.en-computers dict.ru])) + haskellPackages.pandoc-citeproc + libreoffice + pandoc + proselint + unstable.asciidoctor + wordnet + ]; +}