From 5f4edfeb2a98b72f6f5d9998af0f933bfd1a0eef Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 28 Oct 2021 09:46:12 +0200 Subject: [PATCH 1/5] Move gitpkgs into pkg overrides. --- pkgs/nixpkgs.nix | 1 + pkgsets/emacs.nix | 1 - pkgsets/mail_utils.nix | 4 +--- pkgsets/python3.nix | 19 +++++++++++++------ services/desktop.nix | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/nixpkgs.nix b/pkgs/nixpkgs.nix index 82a0048..25f335a 100644 --- a/pkgs/nixpkgs.nix +++ b/pkgs/nixpkgs.nix @@ -12,6 +12,7 @@ in { theme_sddm_midnight = callPackage ./sddm_midnight { }; xdiskusage = callPackage ./xdiskusage { }; django3 = pkgs.python3Packages.callPackage ./django3 { }; + gitpkgs = import /nixpkgs {}; }; }; } diff --git a/pkgsets/emacs.nix b/pkgsets/emacs.nix index a7a21a8..dcbe93a 100644 --- a/pkgsets/emacs.nix +++ b/pkgsets/emacs.nix @@ -3,7 +3,6 @@ with lib; let - gitpkgs = import /nixpkgs {}; fn = import (toString ../fn.nix) { inherit lib; }; modefiles = fn.lst { p = (toString ./emacs); b = true; }; in rec { diff --git a/pkgsets/mail_utils.nix b/pkgsets/mail_utils.nix index f3c4f42..e7b1dfb 100644 --- a/pkgsets/mail_utils.nix +++ b/pkgsets/mail_utils.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: -let - gitpkgs = import /nixpkgs {}; -in { +{ config.machine.pkgsets.mail_utils.pkgs = with pkgs; [ fetchmail isync diff --git a/pkgsets/python3.nix b/pkgsets/python3.nix index ba555f4..f6169c0 100644 --- a/pkgsets/python3.nix +++ b/pkgsets/python3.nix @@ -4,10 +4,10 @@ with lib; let fn = import ../fn.nix { inherit lib; }; - gitpkgs = import /nixpkgs {}; + # ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; }; in { - config.machine.pkgsets.python3.pkgwrap = (pkgs.python38Full.withPackages (ps: with ps; (fn.pkgFilter config.machine.pkgsets.python3.pkgs))); - config.machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ + config.machine.pkgsets.python3.pkgwrap = (pkgs.gitpkgs.python38.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs))); + config.machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ GitPython bpython configparser @@ -15,16 +15,21 @@ in { epc flake8 genanki + matplotlib ipywidgets + python-docx mypy numpy - opencv3 + mysqlclient + pandas + # ocv3 scipy scikitimage (imutils.override { opencv3 = ocv3; }) paho-mqtt pep8 pillow pip plotly pyflakes - pygame pygame_sdl2 + pypdf2 + # pygame pygame_sdl2 pylama pylint toml pyopengl @@ -34,10 +39,12 @@ in { schedule scipy selenium + setuptools telegram tkinter toolz + tifffile virtualenv - xdot + # xdot ]; } diff --git a/services/desktop.nix b/services/desktop.nix index b461b5b..cdd7b45 100644 --- a/services/desktop.nix +++ b/services/desktop.nix @@ -52,5 +52,5 @@ in mkIf (elem "desktop" cfg.services) { horizontalScrolling = true; }; }; - machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ py3status pytz tzlocal ]; + machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ]; } From d6641e36c0761d6add59443acc03727a175cadbc Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 28 Oct 2021 09:50:49 +0200 Subject: [PATCH 2/5] Libinput options have been renamed. --- services/desktop.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/desktop.nix b/services/desktop.nix index cdd7b45..cc2edbc 100644 --- a/services/desktop.nix +++ b/services/desktop.nix @@ -46,10 +46,12 @@ in mkIf (elem "desktop" cfg.services) { }; libinput = { enable = true; - tapping = true; - disableWhileTyping = false; - naturalScrolling = false; - horizontalScrolling = true; + touchpad = { + tapping = true; + disableWhileTyping = false; + naturalScrolling = false; + horizontalScrolling = true; + }; }; }; machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ]; From 3ea886674867998e1fa93e3d5945acc5903cb040 Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 28 Oct 2021 10:19:20 +0200 Subject: [PATCH 3/5] pkgsets: add javascript packages --- pkgsets/nodejs.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pkgsets/nodejs.nix diff --git a/pkgsets/nodejs.nix b/pkgsets/nodejs.nix new file mode 100644 index 0000000..063a242 --- /dev/null +++ b/pkgsets/nodejs.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + config.machine.pkgsets.nodejs.pkgs = [ pkgs.nodejs pkgs.deno ] ++ + (with pkgs.nodePackages; [ + autoprefixer + browserify + serve parcel-bundler webpack webpack-cli + create-react-app + prettier + typescript + typescript-language-server + ]); +} From 2a0550566a4af35e400a9a899d5fd61eca3ef2a5 Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 28 Oct 2021 10:21:42 +0200 Subject: [PATCH 4/5] Add more cool fonts. --- config/fonts.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/fonts.nix b/config/fonts.nix index 1c042c3..552276e 100644 --- a/config/fonts.nix +++ b/config/fonts.nix @@ -15,10 +15,14 @@ mkIf (elem "fonts" config.machine.conffiles) { fonts = with pkgs; [ arphic-ukai arphic-uming + crimson corefonts # Microsoft free fonts dejavu_fonts font-awesome-ttf inconsolata # monospaced + inter + manrope + montserrat noto-fonts noto-fonts-cjk noto-fonts-emoji From 9cefcd2509b73fc1ae8925a08a939ccdde939010 Mon Sep 17 00:00:00 2001 From: derped Date: Thu, 28 Oct 2021 10:36:06 +0200 Subject: [PATCH 5/5] Update filter for python2. --- fn.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/fn.nix b/fn.nix index a8e75df..42fc3be 100644 --- a/fn.nix +++ b/fn.nix @@ -45,6 +45,7 @@ rec { [ { path = ["meta" "broken"]; msg = (warn "Package ${p.name} is marked as broken." true); check = m: m; } { path = ["meta" "knownVulnerabilities" ]; msg = (warn "Package ${p.name} has known Vulnerabilities.." true); check = m: m != []; } + { path = ["name"]; msg = (warn "${p.name}: python2 is depricated." false); check = m: (strings.hasInfix "python2" m) || (strings.hasInfix "python-2" m); } # not sure if the following test creates false positives (AFAIK every derivation/package needs to have an outPath) # , definitely should catch all corner cases/everything that fails to evaluate. { path = [ "outPath" ]; msg = (warn "Package ${p.name} has no outPath" true); check = m: !(tryEval m).success; }