corrected ip
This commit is contained in:
Gregory Bednov
parent
9b764b3582
commit
27dd0b0387
2 changed files with 80 additions and 135 deletions
|
|
@ -4,15 +4,13 @@
|
|||
pkgs,
|
||||
simintech,
|
||||
stm32cubemx,
|
||||
packettracer7,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
serverIP = "10.0.174.12";
|
||||
hasBootPartition = config.fileSystems ? "/boot";
|
||||
isNvidia = (builtins.readFile (pkgs.runCommandLocal "isNvidia" {} ''
|
||||
${pkgs.pciutils}/bin/lspci | ${pkgs.busybox}/bin/grep NVIDIA | ${pkgs.busybox}/bin/grep VGA > $out
|
||||
'')) != "";
|
||||
in
|
||||
{
|
||||
users.users.student = {
|
||||
|
|
@ -28,59 +26,13 @@ in
|
|||
name = nam;
|
||||
version = ver;
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://kafpi.local/custom-jetbrains-plugins/${nam}-${ver}.zip";
|
||||
url = "http://${serverIP}/custom-jetbrains-plugins/${nam}-${ver}.zip";
|
||||
sha256 = sha;
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [ unzip ];
|
||||
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;
|
||||
[
|
||||
|
|
@ -89,11 +41,12 @@ in
|
|||
# набор плагинов, я бы сказал, богат до избыточности, но главное есть Python
|
||||
# и Database Nagivator. Остальное - любителям и любознательным.
|
||||
(with inputs.nix-jetbrains-plugins.plugins."${system}"; [
|
||||
idea-community."2024.1"."mobi.hsz.idea.gitignore"
|
||||
#idea-community."2024.1"."mobi.hsz.idea.gitignore"
|
||||
idea-community."2024.1"."org.jetbrains.erlang"
|
||||
idea-community."2024.1"."JProfiler"
|
||||
idea-community."2024.1"."DBN"
|
||||
idea-community."2024.1"."MatlabSupport"
|
||||
#idea-community."2024.1"."com.intellij.notebooks.core"
|
||||
idea-community."2024.1"."PlantUML integration"
|
||||
idea-community."2024.1"."org.intellij.scala"
|
||||
idea-community."2024.1"."PythonCore"
|
||||
|
|
@ -105,10 +58,11 @@ in
|
|||
idea-community."2024.1"."String Manipulation"
|
||||
idea-community."2024.1"."quokka.js"
|
||||
idea-community."2024.1"."org.asciidoctor.intellij.asciidoc"
|
||||
idea-community."2024.1"."R4Intellij"
|
||||
#idea-community."2024.1"."R4Intellij"
|
||||
idea-community."2024.1"."com.redhat.devtools.lsp4ij"
|
||||
])
|
||||
++ [
|
||||
++
|
||||
[
|
||||
# поддежка языка C/C++ на уровне подсветки синтаксиса и автодополнения
|
||||
(customJBPlugin "clsp" "1.0.1" "sha256-AU/Q61YYsGn2BAYykCGm4XGNyeSwd5K/txGNzP2dJg0=")
|
||||
|
||||
|
|
@ -200,31 +154,8 @@ in
|
|||
stlink-gui
|
||||
stm32loader
|
||||
|
||||
##### СЕТЕВЫЕ УТИЛИТЫ #######
|
||||
(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 ];
|
||||
})
|
||||
|
||||
##### СЕТЕВЫЕ УТИЛИТЫ ######
|
||||
# установлен Cisco Packet Tracer, обернут в firejail чтобы не стучался на Netacad.com
|
||||
nodePackages.node-red # - лоукод-платформа программирования устройств, в частности интернета вещей
|
||||
httpie httpie-desktop # - передовой клиент HTTP-запросов
|
||||
netcat socat # - низкоуровневые простейшие утилиты установления TCP или UDP между компьютерами или с ПЛК
|
||||
|
|
@ -238,7 +169,7 @@ in
|
|||
pname = "cnc_vmc_sim";
|
||||
version = "1.0.0-share";
|
||||
src = builtins.fetchTarball {
|
||||
url = "http://kafpi.local/linux_cnc_vmc_share.tar.xz";
|
||||
url = "http://${serverIP}/linux_cnc_vmc_share.tar.xz";
|
||||
sha256 = "sha256:1hjkm2wq6dfmddb2van1q8hdvf41bp4snslcbkj0b1myi3zpi1md";
|
||||
};
|
||||
|
||||
|
|
@ -277,11 +208,11 @@ in
|
|||
pname = "ramus";
|
||||
version = "0.1.3";
|
||||
src = builtins.fetchTarball {
|
||||
url = "http://10.0.174.12:30000/ramus.tar.xz";
|
||||
url = "http://${serverIP}/ramus.tar.xz";
|
||||
sha256 = "sha256:1a9fha7zwyyag0q4glk58pzigqdczshxpnax7cdzg1bry4aw6f9d";
|
||||
};
|
||||
installPhase = ''
|
||||
sed -e "s~ramus.ico~$out/share/icons/ramus.ico~;" -i share/applications/ramus.desktop
|
||||
sed -e "s~ramus.ico~$out/share/icons/ramus.ico~; s~Other~Database~" -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
|
||||
|
|
@ -481,16 +412,16 @@ in
|
|||
|
||||
# каждый компьютер знает, что kafpi.local - это адрес нашего сервера
|
||||
networking.hosts."${serverIP}" = [ "kafpi.local" "hydra.kafpi.local" ];
|
||||
security.pki.certificateFiles = [
|
||||
(builtins.fetchurl {
|
||||
url = "http://10.0.174.12/server.crt";
|
||||
sha256 = "sha256:0qx4acdhiciffvk1l7wkxyzapjwjy9zisq0mwyl727x97zrmi5ds";
|
||||
})
|
||||
(builtins.fetchurl {
|
||||
url = "http://10.0.174.12/hydra.crt";
|
||||
sha256 = "sha256:1l5cvsikb5dnf49ajjjmz50avfkxm28jy65vnb9xidlv5vapi1zp";
|
||||
})
|
||||
];
|
||||
#security.pki.certificateFiles = [
|
||||
# (builtins.fetchurl {
|
||||
# url = "http://${serverIP}/server.crt";
|
||||
# sha256 = "sha256:0qx4acdhiciffvk1l7wkxyzapjwjy9zisq0mwyl727x97zrmi5ds";
|
||||
# })
|
||||
# (builtins.fetchurl {
|
||||
# url = "http://${serverIP}/hydra.crt";
|
||||
# sha256 = "sha256:1l5cvsikb5dnf49ajjjmz50avfkxm28jy65vnb9xidlv5vapi1zp";
|
||||
# })
|
||||
#];
|
||||
|
||||
#### ЛОКАЛИЗАЦИЯ #####
|
||||
|
||||
|
|
@ -529,6 +460,15 @@ in
|
|||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
programs = {
|
||||
firejail = {
|
||||
enable = true;
|
||||
wrappedBinaries = {
|
||||
packettracer7 = {
|
||||
executable = "${packettracer7.packages.x86_64-linux.default}/bin/packettracer7";
|
||||
extraArgs = [ "--net=none" "--noprofile" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
java.enable = true;
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
|
|
@ -549,3 +489,4 @@ in
|
|||
# НЕ МЕНЯТЬ, иначе придётся все компы переустанавливать, а не обновлять
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
||||
|
|
|
|||
56
flake.nix
56
flake.nix
|
|
@ -1,30 +1,34 @@
|
|||
{
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
inputs.simintech.url = "github:gregorybednov/simintech_nix"; # /94cb0192edb8f42e21362dae2c3712a4cfa7d71e;
|
||||
inputs.mireadesktop.url = "github:gregorybednov/mireadesktop";
|
||||
inputs.stm32cubemx.url = "github:gregorybednov/stm32cubemx";
|
||||
inputs.gostfont.url = "github:gregorybednov/gostfont";
|
||||
inputs.nix-jetbrains-plugins.url = "github:gregorybednov/nix-jetbrains-plugins";
|
||||
inputs.mireapython.url = "github:gregorybednov/mireapython";
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
inputs.simintech.url = "github:gregorybednov/simintech_nix"; # /94cb0192edb8f42e21362dae2c3712a4cfa7d71e;
|
||||
inputs.mireadesktop.url = "github:gregorybednov/mireadesktop";
|
||||
inputs.stm32cubemx.url = "github:gregorybednov/stm32cubemx";
|
||||
inputs.packettracer7.url = "github:gregorybednov/packettracer7";
|
||||
inputs.gostfont.url = "github:gregorybednov/gostfont";
|
||||
inputs.nix-jetbrains-plugins.url = "github:gregorybednov/nix-jetbrains-plugins";
|
||||
inputs.mireapython.url = "github:gregorybednov/mireapython";
|
||||
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
simintech,
|
||||
stm32cubemx,
|
||||
...
|
||||
}@inputs:
|
||||
{
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit simintech;
|
||||
inherit stm32cubemx;
|
||||
inherit inputs;
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
simintech,
|
||||
stm32cubemx,
|
||||
packettracer7,
|
||||
...
|
||||
}@inputs:
|
||||
{
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit simintech;
|
||||
inherit stm32cubemx;
|
||||
inherit packettracer7;
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./configuration.nix
|
||||
];
|
||||
};
|
||||
modules = [
|
||||
./configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue