diff --git a/configuration.nix b/configuration.nix index 5dfd2d3..6c1836b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,6 @@ lib, config, pkgs, - #simintech, stm32cubemx, packettracer7, inputs, @@ -603,8 +602,12 @@ in PGUSER = "postgres"; }; }; + services.grdcontrol.enable = true; - imports = [ ./hardware-configuration.nix ]; + imports = [ + inputs.grdcontrol-flake.nixosModules.grdcontrol + ./hardware-configuration.nix + ]; programs.tmux = { enable = true; withUtempter = true; diff --git a/flake.nix b/flake.nix index 0e54926..6d51afb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,41 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - inputs.simintech.url = "git://10.0.174.12/simintech_nix"; - inputs.mireadesktop.url = "git://10.0.174.12/mireadesktop"; - inputs.stm32cubemx.url = "git://10.0.174.12/stm32cubemx"; - inputs.packettracer7.url = "git://10.0.174.12/packettracer7"; - inputs.gostfont.url = "git://10.0.174.12/gostfont"; - inputs.nix-jetbrains-plugins.url = "git://10.0.174.12/nix-jetbrains-plugins"; - inputs.mireapython.url = "git://10.0.174.12/mireapython"; + inputs.simintech = { + url = "git://10.0.174.12/simintech_nix"; + inputs.nixpkgs.follows = "nixpkgs"; + } + inputs.mireadesktop = { + url = "git://10.0.174.12/mireadesktop"; + 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 = { @@ -15,6 +44,8 @@ simintech, stm32cubemx, packettracer7, + guardant, + kompas3d, ... }@inputs: { @@ -23,6 +54,9 @@ inherit simintech; inherit stm32cubemx; inherit packettracer7; + inherit guardant; + inherit kompas3d; + ... inherit inputs; }; modules = [