modified: configuration.nix

modified:   flake.lock
	modified:   flake.nix

configuration.nix

@@ -2,8 +2,6 @@
   lib,
   config,
   pkgs,
-  stm32cubemx,
-  packettracer7,
   inputs,
   ...
 }:
@@ -113,6 +111,8 @@ in
           builtins.readFile inputs.mireadesktop.packages.x86_64-linux.resethome
         ))
 
+        inputs.kompas3d.packages.${pkgs.system}.default
+
         inputs.stm32cubemx.packages.x86_64-linux.stm32cubemx
 
         pandoc
@@ -605,7 +605,7 @@ in
   services.grdcontrol.enable = true;
 
   imports = [
-    inputs.grdcontrol-flake.nixosModules.grdcontrol
+    inputs.guardant.nixosModules.grdcontrol
     ./hardware-configuration.nix 
   ];
   programs.tmux = {
@@ -815,7 +815,7 @@ in
       enable = true;
       wrappedBinaries = {
         packettracer7 = {
-          executable = "${packettracer7.packages.x86_64-linux.default}/bin/packettracer7";
+          executable = "${inputs.packettracer7.packages.x86_64-linux.default}/bin/packettracer7";
           extraArgs = [
             "--net=none"
             "--noprofile"

flake.lock

@@ -40,7 +40,9 @@
     },
     "gostfont": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1736170321,
@@ -56,9 +58,51 @@
         "url": "git://10.0.174.12/gostfont"
       }
     },
+    "guardant": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771271444,
+        "narHash": "sha256-tN8hBh6zr7xT0lYWLiJLLDXVNAjdjxoklStbJbJoZl4=",
+        "ref": "refs/heads/master",
+        "rev": "e20554b30029b6d84f04cdf7fb226aff3be7e5d5",
+        "revCount": 1,
+        "type": "git",
+        "url": "git://10.0.174.12/guardant"
+      },
+      "original": {
+        "type": "git",
+        "url": "git://10.0.174.12/guardant"
+      }
+    },
+    "kompas3d": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771306148,
+        "narHash": "sha256-6waxhcHMzmReOp5KUCAkycTR4YHgPCKF/C+3r5lCGkQ=",
+        "ref": "refs/heads/master",
+        "rev": "6e1860b78382cbd42f43663b459487e457abd251",
+        "revCount": 13,
+        "type": "git",
+        "url": "git://10.0.174.12/kompas3d"
+      },
+      "original": {
+        "type": "git",
+        "url": "git://10.0.174.12/kompas3d"
+      }
+    },
     "mireadesktop": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1737932603,
@@ -76,7 +120,9 @@
     },
     "mireapython": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1737741645,
@@ -95,7 +141,9 @@
     "nix-jetbrains-plugins": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems"
       },
       "locked": {
@@ -114,59 +162,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745742390,
+        "lastModified": 1751274312,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1737299813,
-        "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1733412085,
-        "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
         "type": "github"
       },
       "original": {
@@ -176,74 +176,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1745742390,
-        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "packettracer7": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1740143112,
@@ -262,10 +200,12 @@
     "root": {
       "inputs": {
         "gostfont": "gostfont",
+        "guardant": "guardant",
+        "kompas3d": "kompas3d",
         "mireadesktop": "mireadesktop",
         "mireapython": "mireapython",
         "nix-jetbrains-plugins": "nix-jetbrains-plugins",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs",
         "packettracer7": "packettracer7",
         "simintech": "simintech",
         "stm32cubemx": "stm32cubemx"
@@ -273,7 +213,9 @@
     },
     "simintech": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1736199151,
@@ -291,7 +233,9 @@
     },
     "stm32cubemx": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1735908219,
@@ -341,4 +285,3 @@
   "root": "root",
   "version": 7
 }
-

flake.nix

@@ -3,39 +3,39 @@
   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 =
     {
@@ -50,15 +50,7 @@
     }@inputs:
     {
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-        specialArgs = {
+        specialArgs = { inherit inputs; };
-          inherit simintech;
-          inherit stm32cubemx;
-          inherit packettracer7;
-          inherit guardant;
-          inherit kompas3d;
-      ...
-          inherit inputs;
-        };
         modules = [
           ./configuration.nix
         ];