config/fonts.nix

@@ -15,14 +15,10 @@ 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

fn.nix

@@ -45,7 +45,6 @@ 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; }

pkgs/nixpkgs.nix

@@ -12,7 +12,6 @@ in {
       theme_sddm_midnight = callPackage ./sddm_midnight { };
       xdiskusage = callPackage ./xdiskusage { };
       django3 = pkgs.python3Packages.callPackage ./django3 { };
-      gitpkgs = import /nixpkgs {};
     };
   };
 }

pkgsets/emacs.nix

@@ -3,6 +3,7 @@
 with lib;
 
 let
+  gitpkgs = import /nixpkgs {};
   fn = import (toString ../fn.nix) { inherit lib; };
   modefiles = fn.lst { p = (toString ./emacs); b = true; };
 in rec {

pkgsets/mail_utils.nix

@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
-{
+let
+  gitpkgs = import /nixpkgs {};
+in {
   config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
     fetchmail
     isync

pkgsets/nodejs.nix

@@ -1,14 +0,0 @@
-{ 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
-                                       ]);
-}

pkgsets/python3.nix

@@ -4,10 +4,10 @@ with lib;
 
 let
   fn = import ../fn.nix { inherit lib; };
-  # ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; };
+  gitpkgs = import /nixpkgs {};
 in {
-  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; [
+  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; [
     GitPython
     bpython
     configparser
@@ -15,21 +15,16 @@ in {
     epc
     flake8
     genanki
-    matplotlib ipywidgets
-    python-docx
     mypy
     numpy
-    mysqlclient
-    pandas
-    # ocv3 scipy scikitimage (imutils.override { opencv3 = ocv3; })
+    opencv3
     paho-mqtt
     pep8
     pillow
     pip
     plotly
     pyflakes
-    pypdf2
-    # pygame pygame_sdl2
+    pygame pygame_sdl2
     pylama
     pylint toml
     pyopengl
@@ -39,12 +34,10 @@ in {
     schedule
     scipy
     selenium
-    setuptools
     telegram
     tkinter
     toolz
-    tifffile
     virtualenv
-    # xdot
+    xdot
   ];
 }

services/desktop.nix

@@ -46,13 +46,11 @@ in mkIf (elem "desktop" cfg.services) {
     };
     libinput = {
       enable = true;
-      touchpad = {
-        tapping = true;
-        disableWhileTyping = false;
-        naturalScrolling = false;
-        horizontalScrolling = true;
-      };
+      tapping = true;
+      disableWhileTyping = false;
+      naturalScrolling = false;
+      horizontalScrolling = true;
     };
   };
-  machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ];
+  machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ py3status pytz tzlocal ];
 }