From 4146f35a5b7fbd85dccec7d6d343c63d06c51414 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sat, 11 Nov 2023 10:59:07 +0300
Subject: [PATCH] Move python3full to base.nix to fix some things

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 common/base.nix | 7 +++----
 roles/devel.nix | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/common/base.nix b/common/base.nix
index 44d96c6..ebb17dc 100644
--- a/common/base.nix
+++ b/common/base.nix
@@ -24,15 +24,14 @@ in {
     man.enable = true;
   };
 
-  # mkDefaulting due to python3Minimal and python3Full collision
-  environment.systemPackages = lib.mkDefault (with pkgs;
-    [ wget curl git git-crypt neovim python3Minimal ]
+  environment.systemPackages = with pkgs;
+    [ wget curl git git-crypt neovim python3Full ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       usbutils
       pciutils
       coreutils
       killall
-    ]);
+    ];
   # Inject secrets through module arguments while evaluating configs.
   _module.args.secrets = secrets;
 }
diff --git a/roles/devel.nix b/roles/devel.nix
index 4ea5ad2..8e74668 100644
--- a/roles/devel.nix
+++ b/roles/devel.nix
@@ -14,7 +14,6 @@ in {
         clang
         llvm
         lld
-        python3Full
         gnumake
         automake
         autoconf
@@ -36,9 +35,6 @@ in {
     (lib.mkIf (!pkgs.stdenv.isx86_64) {
       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
         (lib.mkIf (pkgs.stdenv.isx86_64) {