Compare commits
No commits in common. "9cefcd2509b73fc1ae8925a08a939ccdde939010" and "528fec2f0d967315f52aee4be3a997df5d8dbc6d" have entirely different histories.
9cefcd2509
...
528fec2f0d
|
@ -15,14 +15,10 @@ mkIf (elem "fonts" config.machine.conffiles) {
|
||||||
fonts = with pkgs; [
|
fonts = with pkgs; [
|
||||||
arphic-ukai
|
arphic-ukai
|
||||||
arphic-uming
|
arphic-uming
|
||||||
crimson
|
|
||||||
corefonts # Microsoft free fonts
|
corefonts # Microsoft free fonts
|
||||||
dejavu_fonts
|
dejavu_fonts
|
||||||
font-awesome-ttf
|
font-awesome-ttf
|
||||||
inconsolata # monospaced
|
inconsolata # monospaced
|
||||||
inter
|
|
||||||
manrope
|
|
||||||
montserrat
|
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
|
|
1
fn.nix
1
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" "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 = ["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)
|
# 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.
|
# , 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; }
|
{ path = [ "outPath" ]; msg = (warn "Package ${p.name} has no outPath" true); check = m: !(tryEval m).success; }
|
||||||
|
|
|
@ -12,7 +12,6 @@ in {
|
||||||
theme_sddm_midnight = callPackage ./sddm_midnight { };
|
theme_sddm_midnight = callPackage ./sddm_midnight { };
|
||||||
xdiskusage = callPackage ./xdiskusage { };
|
xdiskusage = callPackage ./xdiskusage { };
|
||||||
django3 = pkgs.python3Packages.callPackage ./django3 { };
|
django3 = pkgs.python3Packages.callPackage ./django3 { };
|
||||||
gitpkgs = import /nixpkgs {};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
gitpkgs = import /nixpkgs {};
|
||||||
fn = import (toString ../fn.nix) { inherit lib; };
|
fn = import (toString ../fn.nix) { inherit lib; };
|
||||||
modefiles = fn.lst { p = (toString ./emacs); b = true; };
|
modefiles = fn.lst { p = (toString ./emacs); b = true; };
|
||||||
in rec {
|
in rec {
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
gitpkgs = import /nixpkgs {};
|
||||||
|
in {
|
||||||
config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
|
config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
|
||||||
fetchmail
|
fetchmail
|
||||||
isync
|
isync
|
||||||
|
|
|
@ -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
|
|
||||||
]);
|
|
||||||
}
|
|
|
@ -4,10 +4,10 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
fn = import ../fn.nix { inherit lib; };
|
fn = import ../fn.nix { inherit lib; };
|
||||||
# ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; };
|
gitpkgs = import /nixpkgs {};
|
||||||
in {
|
in {
|
||||||
config.machine.pkgsets.python3.pkgwrap = (pkgs.gitpkgs.python38.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
|
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.gitpkgs.python38Packages; [
|
config.machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [
|
||||||
GitPython
|
GitPython
|
||||||
bpython
|
bpython
|
||||||
configparser
|
configparser
|
||||||
|
@ -15,21 +15,16 @@ in {
|
||||||
epc
|
epc
|
||||||
flake8
|
flake8
|
||||||
genanki
|
genanki
|
||||||
matplotlib ipywidgets
|
|
||||||
python-docx
|
|
||||||
mypy
|
mypy
|
||||||
numpy
|
numpy
|
||||||
mysqlclient
|
opencv3
|
||||||
pandas
|
|
||||||
# ocv3 scipy scikitimage (imutils.override { opencv3 = ocv3; })
|
|
||||||
paho-mqtt
|
paho-mqtt
|
||||||
pep8
|
pep8
|
||||||
pillow
|
pillow
|
||||||
pip
|
pip
|
||||||
plotly
|
plotly
|
||||||
pyflakes
|
pyflakes
|
||||||
pypdf2
|
pygame pygame_sdl2
|
||||||
# pygame pygame_sdl2
|
|
||||||
pylama
|
pylama
|
||||||
pylint toml
|
pylint toml
|
||||||
pyopengl
|
pyopengl
|
||||||
|
@ -39,12 +34,10 @@ in {
|
||||||
schedule
|
schedule
|
||||||
scipy
|
scipy
|
||||||
selenium
|
selenium
|
||||||
setuptools
|
|
||||||
telegram
|
telegram
|
||||||
tkinter
|
tkinter
|
||||||
toolz
|
toolz
|
||||||
tifffile
|
|
||||||
virtualenv
|
virtualenv
|
||||||
# xdot
|
xdot
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,13 +46,11 @@ in mkIf (elem "desktop" cfg.services) {
|
||||||
};
|
};
|
||||||
libinput = {
|
libinput = {
|
||||||
enable = true;
|
enable = true;
|
||||||
touchpad = {
|
tapping = true;
|
||||||
tapping = true;
|
disableWhileTyping = false;
|
||||||
disableWhileTyping = false;
|
naturalScrolling = false;
|
||||||
naturalScrolling = false;
|
horizontalScrolling = true;
|
||||||
horizontalScrolling = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ];
|
machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ py3status pytz tzlocal ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue