dirty commits; will be reverted x2

Signed-off-by: s0me1newithhand7s <117505144+s0me1newithhand7s@users.noreply.github.com>

flake.nix

@@ -57,7 +57,46 @@
       devShells = eachSystem (
         { pkgs, ... }:
         {
-          default = import ./shell.nix { inherit pkgs; };
+          default = pkgs.mkShellNoCC {
+            shellHook = ''
+              ${pkgs.pre-commit}/bin/pre-commit install --install-hooks --overwrite
+              export PKG_CONFIG_PATH="${
+                pkgs.lib.makeSearchPath "lib/pkgconfig" [
+                  pkgs.dbus.dev
+                  pkgs.systemdMinimal.dev
+                ]
+              }"
+              export LIBCLANG_PATH="${pkgs.llvmPackages_latest.libclang}/lib"
+              # for rust-analyzer
+              export RUST_SRC_PATH="${pkgs.rustPlatform.rustLibSrc}"
+              export RUST_BACKTRACE=1
+              export RUSTFLAGS="${
+                pkgs.lib.concatStringsSep " " [
+                  "-L${pkgs.lib.getLib pkgs.systemdMinimal}/lib"
+                  "-lsystemd"
+                ]
+              }"
+            '';
+
+            buildInputs = with pkgs; [
+              dbus
+            ];
+
+            nativeBuildInputs = with pkgs; [
+              pkgs.llvmPackages_latest.clang
+              pkg-config
+              rustc
+              cargo
+              # Formatting
+              pre-commit
+              treefmt
+              nixfmt-rfc-style
+              rustfmt
+              clippy
+              mdbook
+              mdformat
+            ];
+          };
         }
       );
 

nix/modules/upstream/nixpkgs/default.nix

@@ -18,6 +18,10 @@
       "/services/web-servers/nginx/"
       # nix settings
       "/config/nix.nix"
+
+      # things tested by hand7s
+      "/services/web-servers/caddy"
+      "/programs/yazi.nix"
     ];
 
   options =

shell.nix

@@ -1,44 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-let
-  llvm = pkgs.llvmPackages_latest;
-in
-pkgs.mkShellNoCC {
-  shellHook = ''
-    ${pkgs.pre-commit}/bin/pre-commit install --install-hooks --overwrite
-    export PKG_CONFIG_PATH="${
-      pkgs.lib.makeSearchPath "lib/pkgconfig" [
-        pkgs.dbus.dev
-        pkgs.systemdMinimal.dev
-      ]
-    }"
-    export LIBCLANG_PATH="${llvm.libclang}/lib"
-    # for rust-analyzer
-    export RUST_SRC_PATH="${pkgs.rustPlatform.rustLibSrc}"
-    export RUST_BACKTRACE=1
-    export RUSTFLAGS="${
-      pkgs.lib.concatStringsSep " " [
-        "-L${pkgs.lib.getLib pkgs.systemdMinimal}/lib"
-        "-lsystemd"
-      ]
-    }"
-  '';
-  buildInputs = with pkgs; [
-    dbus
-  ];
-  nativeBuildInputs = with pkgs; [
-    llvm.clang
-    pkg-config
-    rustc
-    cargo
-    # Formatting
-    pre-commit
-    treefmt
-    nixfmt-rfc-style
-    rustfmt
-    clippy
-    mdbook
-    mdformat
-  ];
-}