nixos refactor

flake.nix

@@ -38,18 +38,13 @@
       home = import ./home {
         inherit system pkgs modules home-manager;
       };
+      nixos = import ./nixos {
+        inherit system nixpkgs modules hosts;
+      };
     in
     {
       nixosConfigurations = {
-        laptop = nixpkgs.lib.nixosSystem {
+        laptop = nixos.laptop;
-          inherit system;
-          modules = [
-            ./hardware-configuration.nix
-            ./sys/laptop
-            ./modules/dnscrypt
-            hosts.nixosModule
-          ];
-        };
       };
       homeConfigurations = {
         ivand = home.ivand;

home/vid/default.nix

@@ -7,9 +7,5 @@
       "$HOME/.local/bin"
     ];
   };
-  programs = {
-    nv.enable = true;
-    shell.enable = true;
-  };
 }
 

modules/default.nix

@@ -1,7 +1,7 @@
 { system, pkgs, ide, my-overlay, ... }:
 {
   gaming = import ./gaming { };
-  dnscrypt = import ./dnscrypt { };
+  dnscrypt = import ./dnscrypt;
   packages = import ./packages { inherit pkgs; };
   programs = import ./programs { inherit pkgs; };
   nvim = import ./programs/neovim {

nixos/default.nix

@@ -0,0 +1,11 @@
+{ system, nixpkgs, modules, hosts }: {
+  laptop = nixpkgs.lib.nixosSystem {
+    inherit system;
+    modules = [
+      ../hardware-configuration.nix
+      ./laptop
+      modules.dnscrypt
+      hosts.nixosModule
+    ];
+  };
+}