moved fonts to core and python to dev

This commit is contained in:
Sven Vogel 2023-12-15 22:55:04 +01:00
parent 601e8948d8
commit 826823ccf4
7 changed files with 28 additions and 19 deletions

View File

@ -2,8 +2,6 @@
let let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"; home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
# python packages to include with python3
python-packages = import ./python-packages.nix;
in in
{ {
imports = [ imports = [
@ -150,7 +148,6 @@ in
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
(python3.withPackages(python-packages))
fishPlugins.done # notifications for background process finished fishPlugins.done # notifications for background process finished
fishPlugins.fzf-fish fishPlugins.fzf-fish

View File

@ -3,7 +3,8 @@ let
settings = import ./../settings.nix; settings = import ./../settings.nix;
in in
{ {
imports = lib.optionals settings.printing.enable [ ./printing.nix ] imports = [ ./fonts.nix ]
++ lib.optionals settings.printing.enable [ ./printing.nix ]
++ lib.optionals settings.xdg.enable [ ./xdg.nix ] ++ lib.optionals settings.xdg.enable [ ./xdg.nix ]
++ lib.optionals settings.java [ ./java.nix ] ++ lib.optionals settings.java [ ./java.nix ]
++ lib.optionals settings.dotnet [ ./dotnet.nix ]; ++ lib.optionals settings.dotnet [ ./dotnet.nix ];

View File

@ -8,5 +8,6 @@ in
++ lib.optionals settings.virtualisation.qemu.enable [ ./qemu.nix ] ++ lib.optionals settings.virtualisation.qemu.enable [ ./qemu.nix ]
++ lib.optionals settings.dev.platformio [ ./platformio.nix ] ++ lib.optionals settings.dev.platformio [ ./platformio.nix ]
++ lib.optionals settings.dev.latex [ ./latex.nix ] ++ lib.optionals settings.dev.latex [ ./latex.nix ]
++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ]; ++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ]
++ lib.optionals settings.dev.python3.enable [ ./python3.nix ];
} }

9
dev/python3.nix Normal file
View File

@ -0,0 +1,9 @@
{ pkgs, config, lib, ... }:
let
settings = import ./../settings.nix;
in
{
environment.systemPackages = with pkgs; [
(python3.withPackages(settings.dev.python3.packages))
];
}

View File

@ -1,14 +0,0 @@
ps: with ps;
[
pandas
requests
pygments
tkinter
numpy
setuptools
youtube-dl
pip
setuptools
ipykernel
scipy
]

View File

@ -28,6 +28,21 @@ with import <nixpkgs> {}; {
platformio = true; platformio = true;
latex = true; latex = true;
dotnet = false; dotnet = false;
python3 = {
enable = true;
packages = ps: with ps; [
pandas
requests
pygments
tkinter
numpy
setuptools
youtube-dl
pip
ipykernel
scipy
];
};
lsp = { lsp = {
enable = true; enable = true;