Move devenvs into main flake

flake.nix

@@ -66,5 +66,7 @@
 
       lenovo-impure = self.nixosConfigurations.lenovo.extendModules { modules = [ { impurity.enable = true; } ]; };
     };
+
+    devShells = import ./modules/devenv/flakepart.nix inputs;
   };
 }

modules/devenv/default.nix

@@ -1,9 +1,5 @@
-outerInputs @ { inputs, system, pkgs, ... }: {
+outerInputs @ { self, inputs, system, pkgs, ... }: {
-  nix.registry.devenv.flake.outPath = pkgs.runCommand "devenvs" {} ''
+  nix.registry.system.flake = self;
-    mkdir $out
-    cp -r ${./.}/* $out
-    cp ${inputs.self}/flake.lock $out/flake.lock
-  '';
 
   system.extraDependencies = [
     (import ./rust.nix outerInputs)

modules/devenv/flake.nix

@@ -1,62 +0,0 @@
-{
-  # locked by the copied lockfile. inputs must match the main flake
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-    stable.url = "nixpkgs/nixos-23.05";
-    flake-utils.url = "github:numtide/flake-utils";
-
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    impurity.url = "github:outfoxxed/impurity.nix";
-
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay?rev=b7a065e692e944e6b68d4285013ca426a8de6663";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland-hy3 = {
-      url = "github:outfoxxed/hy3";
-      inputs.hyprland.follows = "hyprland";
-    };
-
-    hyprpaper = {
-      url = "github:hyprwm/Hyprpaper";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    ironbar = {
-      url = "github:JakeStanger/ironbar";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.rust-overlay.follows = "rust-overlay";
-    };
-
-    nur.url = "github:nix-community/NUR";
-
-    # devenv
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-  };
-
-  outputs = finputs @ { nixpkgs, ... }: let
-    systems = [ "x86_64-linux" ];
-  in builtins.foldl' (a: b: a // b) {} (builtins.map (system: let
-      pkgs = import nixpkgs { inherit system; };
-      inputs = finputs // { inherit system pkgs inputs; };
-    in {
-      devShells.${system} = {
-        rust = import ./rust.nix inputs;
-      };
-    }) systems);
-}

modules/devenv/flakepart.nix

@@ -0,0 +1,10 @@
+finputs @ { nixpkgs, ... }: let
+  systems = [ "x86_64-linux" ];
+in builtins.foldl' (a: b: a // b) {} (builtins.map (system: let
+    pkgs = import nixpkgs { inherit system; };
+    inputs = finputs // { inherit system pkgs inputs; };
+  in {
+    ${system} = {
+      rust-env = import ./rust.nix inputs;
+    };
+  }) systems)

systems/lenovo/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./hardware.nix
     ./mullvad.nix
+    ./hyprland
   ];
   system.stateVersion = "23.11";
   networking.hostName = "lenovo";