modified: configuration.nix

modified:   flake.nix
	deleted:    flake.lock
This commit is contained in:
Gregory Bednov 2026-02-16 22:55:16 +03:00
commit a70e76f3c9
2 changed files with 46 additions and 9 deletions

View file

@ -2,7 +2,6 @@
lib, lib,
config, config,
pkgs, pkgs,
#simintech,
stm32cubemx, stm32cubemx,
packettracer7, packettracer7,
inputs, inputs,
@ -603,8 +602,12 @@ in
PGUSER = "postgres"; PGUSER = "postgres";
}; };
}; };
services.grdcontrol.enable = true;
imports = [ ./hardware-configuration.nix ]; imports = [
inputs.grdcontrol-flake.nixosModules.grdcontrol
./hardware-configuration.nix
];
programs.tmux = { programs.tmux = {
enable = true; enable = true;
withUtempter = true; withUtempter = true;

View file

@ -1,12 +1,41 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
inputs.simintech.url = "git://10.0.174.12/simintech_nix"; inputs.simintech = {
inputs.mireadesktop.url = "git://10.0.174.12/mireadesktop"; url = "git://10.0.174.12/simintech_nix";
inputs.stm32cubemx.url = "git://10.0.174.12/stm32cubemx"; inputs.nixpkgs.follows = "nixpkgs";
inputs.packettracer7.url = "git://10.0.174.12/packettracer7"; }
inputs.gostfont.url = "git://10.0.174.12/gostfont"; inputs.mireadesktop = {
inputs.nix-jetbrains-plugins.url = "git://10.0.174.12/nix-jetbrains-plugins"; url = "git://10.0.174.12/mireadesktop";
inputs.mireapython.url = "git://10.0.174.12/mireapython"; inputs.nixpkgs.follows = "nixpkgs";
}
inputs.stm32cubemx = {
url = "git://10.0.174.12/stm32cubemx";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.packettracer7= {
url = "git://10.0.174.12/packettracer7";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.gostfont = {
url= "git://10.0.174.12/gostfont";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.nix-jetbrains-plugins = {
url = "git://10.0.174.12/nix-jetbrains-plugins";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.mireapython = {
url = "git://10.0.174.12/mireapython";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.kompas3d = {
url = "git://10.0.174.12/kompas3d";
inputs.nixpkgs.follows = "nixpkgs";
}
inputs.guardant = {
url = "git://10.0.174.12/guardant";
inputs.nixpkgs.follows = "nixpkgs";
}
outputs = outputs =
{ {
@ -15,6 +44,8 @@
simintech, simintech,
stm32cubemx, stm32cubemx,
packettracer7, packettracer7,
guardant,
kompas3d,
... ...
}@inputs: }@inputs:
{ {
@ -23,6 +54,9 @@
inherit simintech; inherit simintech;
inherit stm32cubemx; inherit stm32cubemx;
inherit packettracer7; inherit packettracer7;
inherit guardant;
inherit kompas3d;
...
inherit inputs; inherit inputs;
}; };
modules = [ modules = [