ivabus/nixos
1
0
Fork 0
mirror of https://github.com/ivabus/nixos synced 2024-09-20 00:30:48 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move python3full to base.nix to fix some things

Browse source 
Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
This commit is contained in:
Ivan Bushchik 2023-11-11 10:59:07 +03:00
parent 9a5e3dbda2
commit 4146f35a5b
No known key found for this signature in database
GPG key ID: 2F16FBF3262E090C
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/base.nix
View file

@ -24,15 +24,14 @@ in {
man.enable = true; man.enable = true;
}; };
# mkDefaulting due to python3Minimal and python3Full collision environment.systemPackages = with pkgs;
environment.systemPackages = lib.mkDefault (with pkgs; [ wget curl git git-crypt neovim python3Full ]
[ wget curl git git-crypt neovim python3Minimal ]
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
usbutils usbutils
pciutils pciutils
coreutils coreutils
killall killall
]); ];
# Inject secrets through module arguments while evaluating configs. # Inject secrets through module arguments while evaluating configs.
_module.args.secrets = secrets; _module.args.secrets = secrets;
} }

4
roles/devel.nix
View file

@ -14,7 +14,6 @@ in {
clang clang
llvm llvm
lld lld
python3Full
gnumake gnumake
automake automake
autoconf autoconf
@ -36,9 +35,6 @@ in {
(lib.mkIf (!pkgs.stdenv.isx86_64) { (lib.mkIf (!pkgs.stdenv.isx86_64) {
boot.binfmt.emulatedSystems = [ "x86_64-linux" "i686-linux" ]; boot.binfmt.emulatedSystems = [ "x86_64-linux" "i686-linux" ];
}) })
(lib.mkIf (builtins.currentSystem != "riscv64-linux") {
boot.binfmt.emulatedSystems = [ "riscv64-linux" ];
})
/* # Install CLion only if we are on x86_64 /* # Install CLion only if we are on x86_64
(lib.mkIf (pkgs.stdenv.isx86_64) { (lib.mkIf (pkgs.stdenv.isx86_64) {