diff --git a/configuration.nix b/configuration.nix index ea9bf73..e62a852 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,5 @@ { + lib, config, pkgs, simintech, @@ -34,6 +35,52 @@ in dontUnpack = true; installPhase = "unzip $src; mkdir -p $out; mv ./${nam}/* $out"; }; + ptFiles = pkgs.stdenv.mkDerivation { + name = "PacketTracer7drv"; + version = "7.3.1"; + dontUnpack = true; + src = pkgs.fetchurl { + url = "http://kafpi.local/PacketTracer_731_amd64.deb"; + hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8="; + }; + nativeBuildInputs = with pkgs; [ + dpkg + makeWrapper + ]; + + installPhase = '' + dpkg-deb -x $src $out + makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \ + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" + ''; + }; + ptFhsEnv = pkgs.buildFHSEnv { + name = "packettracer7"; + runScript = "${ptFiles}/bin/packettracer7 -guest"; + + targetPkgs = + pkgs: with pkgs; [ + alsa-lib + dbus + expat + fontconfig + glib + libglvnd + libpulseaudio + libudev0-shim + libxkbcommon + libxml2 + libxslt + nspr + nss + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXScrnSaver + ]; + }; + + in with pkgs; [ @@ -154,7 +201,31 @@ in stm32loader ##### СЕТЕВЫЕ УТИЛИТЫ ####### - nodePackages.node-red # - лоукод-платформа программирования устройств, в частности интернета вещей + (pkgs.stdenv.mkDerivation { + pname = "ciscoPacketTracer7"; + version = "7.3.1"; + dontUnpack = true; + installPhase = '' + mkdir $out + ${pkgs.xorg.lndir}/bin/lndir -silent ${ptFhsEnv} $out + ''; + desktopItems = [ + (pkgs.makeDesktopItem { + name = "cisco-pt7.desktop"; + desktopName = "Cisco Packet Tracer 7"; + icon = "${ptFiles}/opt/pt/art/app.png"; + exec = "packettracer7 %f"; + mimeTypes = [ + "application/x-pkt" + "application/x-pka" + "application/x-pkz" + ]; + })]; + + nativeBuildInputs = [ copyDesktopItems pkgs.xorg.lndir ]; +}) + + nodePackages.node-red # - лоукод-платформа программирования устройств, в частности интернета вещей httpie httpie-desktop # - передовой клиент HTTP-запросов netcat socat # - низкоуровневые простейшие утилиты установления TCP или UDP между компьютерами или с ПЛК opcua-client-gui # - простой графический клиент OPC UA @@ -163,6 +234,61 @@ in logisim-evolution unityhub # UnityHub - 3D-моделирование, визуализация, геймдев, AR/VR + (pkgs.stdenv.mkDerivation rec { + pname = "cnc_vmc_sim"; + version = "1.0.0-share"; + src = builtins.fetchTarball { + url = "http://kafpi.local/linux_cnc_vmc_share.tar.xz"; + sha256 = "sha256:1hjkm2wq6dfmddb2van1q8hdvf41bp4snslcbkj0b1myi3zpi1md"; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/applications + mkdir -p $out/share/icons + cp ${src}/icon.png $out/share/icons/${pname}.png + cp ${fhsEnv}/bin/${pname}-fhs $out/bin/${pname} + cp ${desktopItem}/share/applications/*.desktop $out/share/applications + ''; + + fhsEnv = pkgs.buildFHSEnv { + name = "${pname}-fhs"; + targetPkgs = p: with p; [ + eudev.out + libGL.out + openal.out + xorg.libX11.out + ]; + runScript = "${src}/${pname}"; + }; + + desktopItem = pkgs.makeDesktopItem { + name = "CNC VMC (free)"; + exec = "${pname}"; + desktopName = "CNC VMC (free)"; + categories = [ "Development" ]; + icon = "${pname}"; + terminal = false; + startupNotify = false; + }; + }) + (pkgs.stdenv.mkDerivation rec { + pname = "ramus"; + version = "0.1.3"; + src = builtins.fetchTarball { + url = "http://10.0.174.12:30000/ramus.tar.xz"; + sha256 = "sha256:1a9fha7zwyyag0q4glk58pzigqdczshxpnax7cdzg1bry4aw6f9d"; + }; + installPhase = '' + sed -e "s~ramus.ico~$out/share/icons/ramus.ico~;" -i share/applications/ramus.desktop + mkdir $out + cp -r share bin lib $out + echo "JDK_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' ${pkgs.jre8}/bin/java -jar $out/bin/ramus-startup.jar" > $out/bin/ramus + chmod +x $out/bin/ramus + ''; + }) + # поставка SimInTech. Кодогенерация библиотек для ПК работает, # но несовместима с .dll из windows! @@ -253,11 +379,13 @@ in time.hardwareClockInLocalTime = hasBootPartition; # настройки Nix - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + allowUnfree = true; + nvidia.acceptLicense = true; + }; nix.settings = { substituters = [ "https://cache.nixos.org" - "http://10.0.174.12:5000" ]; trusted-public-keys = ["kafpi.local:PttR9S1eDyint3v0LCp5zfBGG+xfxzQ+cxKAQARNpyw="]; auto-optimise-store = true; @@ -270,15 +398,37 @@ in hardware.graphics = { enable = true; enable32Bit = true; + extraPackages = with pkgs; [ nvidia-vaapi-driver ]; }; services.xserver = { enable = true; + videoDrivers = [ + "nvidia" + "modesetting" + "fbdev" + ]; xkb.layout = "us,ru"; xkb.options = "grp:alt_shift_toggle"; }; + hardware.enableAllFirmware = true; + hardware.nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.legacy_470; + modesetting.enable = true; + powerManagement.enable = true; + open = false; + nvidiaSettings = false; + }; + boot.blacklistedKernelModules = [ "nouveau" ]; + boot.extraModprobeConfig = "options nvidia " + lib.concatStringsSep " " [ + "NVreg_UsePageAttributeTable=1" + "NVreg_EnablePCIeGen3=1" + "NVreg_RegistryDwords=RMUseSwI2c=0x01;RMI2cSpeed=100" + ]; + services.displayManager.autoLogin.user = "student"; services.getty.autologinUser = "student"; services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.startx.enable = true; services.displayManager.defaultSession = "MIREA-WindowsLike+Metacity"; services.xserver.displayManager.session = [ {