move all the files

1 files changed, 10 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index a304694..d80f804 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    mvinkio.url = "github:mvinkio/nixpkgs/nixpkgs-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05";
     sops-nix.url = "github:Mic92/sops-nix";
     home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
   };
@@ -12,51 +10,36 @@
   outputs = inputs@{
     self,
     nixpkgs,
-    mvinkio,
-    nixpkgs-stable,
     home-manager,
     sops-nix,
     ...
   }: let
-    home = builtins.getEnv "HOME";
-    username = builtins.getEnv "USER";
-    email = builtins.getEnv "EMAIL";
     system = "x86_64-linux";
-    mvinkioPkgs = mvinkio.legacyPackages.${system};
-
     overlay = nixpkgs.lib.composeManyExtensions [
       (import ./overlays/vimPlugins.nix {inherit pkgs;})
-      (import ./overlays/suckless.nix {inherit pkgs home;})
+      (import ./overlays/suckless.nix {inherit pkgs;})
     ];
-
     pkgs = import nixpkgs {
       overlays = [
         overlay
       ];
       inherit system;
     };
-
     lib = (nixpkgs.lib.extend (_: _: home-manager.lib)).extend (import ./lib);
-
   in with lib; {
     inherit lib;
 
     nixosConfigurations.lemptop = nixpkgs.lib.nixosSystem {
       inherit system;
-      modules = [./configuration.nix ./lemptop.nix sops-nix.nixosModules.sops];
-    };
-
-    homeConfigurations.mike = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      modules =
-        (attrValues
-          (attrsets.mergeAttrsList [
-            (modulesIn ./home)
-            (modulesIn ./email)
-          ])) ++ [./home.nix];
-      extraSpecialArgs = {
-        inherit inputs username email;
-      };
+      modules = [
+        ./nixos/configuration.nix
+        ./nixos/lemptop.nix
+      ] ++ (attrValues
+        (attrsets.mergeAttrsList [
+          (modulesIn ./profiles/core)
+          (modulesIn ./profiles/station)
+          (modulesIn ./profiles/email)
+        ]));
     };
 
     templates = {