Structural changes

configuration.nix

@@ -2,98 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ lib, config, pkgs, ... }: let
-  py3Opt = pkgs.python310.override {
-    #    enableOptimizations = true;
-    #    reproducibleBuild = false;
-    #    self = py3Opt;
-  };
-  py3OptPkgs = py3Opt.pkgs;
-  # For 3D CNC machining
-  opencamlib = py3OptPkgs.toPythonModule (pkgs.stdenv.mkDerivation rec {
-    pname = "opencamlib";
-    version = "2019.07";
-    nativeBuildInputs = (with pkgs;[
-      cmake
-      git
-      doxygen
-      boost
-      texlive.combined.scheme-full
-    ]);
-    propagatedNativeBuildInputs = (with pkgs; [
-      py3Opt
-      py3Opt.pkgs.boost
-      py3Opt.pkgs.vtk
-    ]);
-    postPatch = ''
-        mkdir -p $out/${py3Opt.sitePackages}/{lib,ocl}
-        sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py3Opt.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-        sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py3Opt.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-      '';
-    cmakeFlags = [
-      "-DVERSION_STRING=2019.07"
-      "-DBUILD_CXX_LIB=ON"
-      "-DBUILD_PY_LIB=ON"
-      "-DUSE_PY_3=ON"
-      "-DCMAKE_BUILD_TYPE=Release"
-    ];
-    src = pkgs.fetchFromGitHub {
-      owner = "aewallin";
-      repo = "opencamlib";
-      rev = "2019.07";
-      sha256 = "1a8pxp1mh8x3bfsb0l97vgxrpk482p7q9jprkd4m9hv69vva2bdz";
-    };
-  });
-  equation = py3OptPkgs.buildPythonPackage {
-    pname = "Equation";
-    version = "1.2.01";
-    nativeBuildInputs = [
-      py3OptPkgs.setuptools
-      py3OptPkgs.numpy
-    ];
-    src = pkgs.fetchzip {
-      url = "https://files.pythonhosted.org/packages/2e/cc/115fb1722051f99b9699864586e7f96ca0080645387698af922fade4f7b2/Equation-1.2.01.zip";
-      sha256 = "YFxZB3vaC5s49K1AQLFF4WGUr2RpomJTLQdZ24ITXr4=";
-    };
-  };
-  morphio = py3Opt.pkgs.toPythonModule ( pkgs.stdenv.mkDerivation rec {
-    pname = "MorphIO";
-    version = "3.3.4";
-    nativeBuildInputs = (with pkgs; [
-      cmake
-      ninja
-      py3Opt
-      py3Opt.pkgs.numpy
-      hdf5
-    ]);
-    cmakeFlags = [
-      "-DMorphIO_CXX_WARNINGS=OFF"
-    ];
-    postInstall = ''
-      mkdir -p $out/${py3Opt.sitePackages}
-      mv ../morphio $out/${py3Opt.sitePackages}
-      cp binds/python/_morphio.* $out/${py3Opt.sitePackages}/morphio/
-    '';
-    src = pkgs.fetchFromGitHub {
-      owner = "BlueBrain";
-      repo = "MorphIO";
-      rev = "v${version}";
-      deepClone = true;
-      fetchSubmodules = true;
-      sha256 = "C3zDziG7LF7v22ZvplBrtOYq7iKGnAavfpiBCcShHaQ=";
-    };
-  });
-  py3 = py3Opt.withPackages (p: (with p; [
-    numpy
-    scipy
-    seaborn
-    pandas
-    matplotlib
-    python-lsp-server
-    opencamlib
-  ]));
-in
-  {
+{ lib, config, pkgs, ... }: {
     nix.settings.auto-optimise-store = true;
     imports =
       [ # Include the results of the hardware scan.
@@ -237,53 +146,12 @@ in
     environment.pathsToLink = [
       "/share/nix-direnv"
     ];
+    
     # if you also want support for flakes 
     nixpkgs.overlays = [(self: super: rec {
       nix-direnv = super.nix-direnv.override {
         enableFlakes = true;
       };
-      # Discord fix
-      discord = super.discord.override {
-        nss = super.pkgs.nss_latest;
-      };
-      discord-canary = super.discord-canary.override {
-        nss = super.pkgs.nss_latest;
-      };
-      # Add CUDA Support to Blender
-      blender_cuda = super.blender.override {
-        cudaSupport = true;
-      };
-      # Add Opencamlib for BlenderCAM Support
-      blender = blender_cuda.overrideAttrs (old: {
-        pythonPath = old.pythonPath ++ (with py3OptPkgs; [
-          # OpenCAMLib support
-          shapely
-          equation
-          opencamlib
-          # NeuroMorphoVis support
-          matplotlib
-          seaborn
-          pandas
-          pillow
-          h5py
-          morphio
-          # TODO add BluePy support?
-        ]);
-      });
-      # Update RX and Aseprite
-      rx = super.rx.overrideAttrs (old: {
-        version = "git";
-        src = super.fetchFromGitHub {
-          owner = "cloudhead";
-          repo = old.pname;
-          rev = "18625a68921873ebe21a7ea8096409a9f0314541";
-          sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
-        };
-      });
-      # Add to FreeCAD too, why not
-      freecad = super.freecad.override {
-        python = py3;
-      };
     })];
 
     nixpkgs.config.allowUnfree = true;
@@ -294,23 +162,7 @@ in
     hardware.opengl.driSupport = true;
     
     services.fwupd.enable = true;
-    # For steam
-    services.flatpak.enable = true;
-    # Game compat
-    programs.gamemode.enable = true;
-
-    virtualisation = {
-      podman = {
-        enable = true;
-        dockerCompat = true;
-        enableNvidia = true;
-        extraPackages = [
-          pkgs.zfs
-          pkgs.nvidia-podman
-        ];
-      };
-    };
-    
+        
     programs.adb.enable = true;
 
     # GTK Support
@@ -326,100 +178,6 @@ in
     environment.systemPackages = with pkgs; [
       direnv
       nix-direnv
-
-      cbqn-replxx
-
-      # GTK theme support (basic) for GTK apps e.g. inkscape
-      gnome.adwaita-icon-theme
-      
-      firefox
-      chromium
-
-      bitwarden
-      bitwarden-cli
-
-      tidal-hifi
-
-      nextcloud-client
-      libsForQt5.kdeconnect-kde
-      
-      # Fonts
-      julia-mono
-
-      discord-canary
-      discord
-      betterdiscordctl
-      slack
-      teams
-      signal-desktop
-
-      cudaPackages.cudatoolkit
-      cudaPackages.cudnn
-
-      openjdk17
-      
-      prismlauncher
-      pcsx2
-
-      blender
-
-      musescore
-      
-      rx
-      aseprite-unfree
-      gimp
-      
-      synfigstudio
-      inkscape-with-extensions
-
-      vlc
-      ffmpeg_5-full
-
-      openscad
-      freecad
-      kicad
-      
-      godot_4
-
-      kitty
-      emacs
-      rnix-lsp
-      texlive.combined.scheme-full
-      pandoc
-      libreoffice-qt
-      
-      pandoc
-      ispell
-      wget
-      curl
-      git
-
-      qemu
-
-      podman-compose
-      buildah
-      x11docker
-      # needs python
-      py3
-      weston
-
-      turbovnc
-      awesome
-      xpra
-
-      easyeffects
-      helvum
-
-      zip
-      unzip
-
-      lsof
-      htop
-      btop
-      xclip
-      screen
-      man-pages
-      man-pages-posix
     ];
 
     documentation.dev.enable = true;