cleanup the default devshell

Signed-off-by: Brian McGillion <[email protected]>
tiiuae · Jan 31, 2025 · e19b985 · e19b985
1 parent 45b135b
commit e19b985
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -10,7 +10,6 @@
     {
       config,
       pkgs,
-      inputs',
       system,
       ...
     }:
@@ -22,38 +21,22 @@
             name = "Ghaf devshell";
             meta.description = "Ghaf development environment";
             packages =
-              builtins.attrValues {
-                inherit (pkgs)
-                  git
-                  mdbook
-                  nix
-                  nixci
-                  nixos-rebuild
-                  nix-output-monitor
-                  nix-tree
-                  reuse
-                  nix-eval-jobs
-                  jq
-                  ;
-              }
-              ++ [
-                inputs'.nix-fast-build.packages.default
+              [
+                pkgs.jq
+                pkgs.mdbook
+                pkgs.nix-eval-jobs
+                pkgs.nix-fast-build
+                pkgs.nix-output-monitor
+                pkgs.nix-tree
+                pkgs.nixVersions.latest
+                pkgs.reuse
                 config.treefmt.build.wrapper
-              ]
-              ++ [
                 (pkgs.callPackage ../packages/flash { })
-                (pkgs.callPackage ../packages/make-checks { })
               ]
               ++ lib.attrValues config.treefmt.build.programs # make all the trefmt packages available
               ++ lib.optional (pkgs.hostPlatform.system != "riscv64-linux") pkgs.cachix;
           };
           commands = [
-            {
-              help = "Check flake evaluation";
-              name = "check-eval";
-              command = "make-checks";
-              category = "checker";
-            }
             {
               help = "Format";
               name = "format-repo";

diff --git a/nix/devshell/kernel.nix b/nix/devshell/kernel.nix
@@ -51,6 +51,8 @@
         };
     in
     {
+      #TODO: use devshell not devShells
+      # also is this needed with nix develop doing all of these tasks
       devShells.kernel-x86 = mkKernelShell {
         platform = "x86_64-generic";
         arch = "x86";

diff --git a/nix/treefmt.nix b/nix/treefmt.nix
@@ -82,6 +82,7 @@
             "*.git*"
             "*.hbs"
             "*.md"
+            "*.toml"
           ];
         };
       };
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,6 +82,7 @@ @@
                 "*.git*"
                 "*.hbs"
                 "*.md"
+                "*.toml"
               ];
             };
           };
@@ Expand Down @@