move things around

flake.nix

@@ -13,10 +13,9 @@
         system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
         nix.registry.nixpkgs.flake = nixpkgs;
       };
-      hm-module = {
+      hm-base = {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
-        home-manager.users.rin = import ./cfg/winter/rin/home.nix; # TODO: decoupling
       };
       overlays = {
         linux = import ./overlays/linux.nix;
@@ -40,8 +39,9 @@
         system = "x86_64-linux";
         modules = [
           base
-          ./cfg/winter
+          home-manager.nixosModules.home-manager
-          home-manager.nixosModules.home-manager hm-module
+          hm-base
+          ./hosts/winter
           secrets.nixosModules.winter
         ];
         specialArgs = { inherit inputs overlays; };

hosts/winter/default.nix

@@ -21,7 +21,7 @@
     ./packages.nix
     ./security.nix
 
-    ./rin
+    ../../users/rin
   ];
   nix = {
     package = pkgs.nixUnstable;

overlays/linux.nix

@@ -23,9 +23,9 @@ self: super: {
     };
   in {
     inherit (super) lib stdenv;
-    version = "${major}.${minor}.${patch}-tkg-Lava";
+    version = "${mmp}-tkg-Lava";
     allowImportFromDerivation = true;
-    configfile = ./kernel.config;
+    configfile = ./misc/kernel.config;
     isZen = true;
 
     src = kernelUrl "linux-${mm}.tar" "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04";

overlays/winetricks.nix

@@ -7,6 +7,6 @@ self: super: {
       rev = "b90e0c4e7cea9acc2c9e89bc4afe873086bbd8a1";
       sha256 = "11adhgd8zavz4c9yzj0m5570fq7wv6am2wq4j9xkz2655fw2412l";
     };
-    patches = [ ./winetricks.patch ];
+    patches = [ ./misc/winetricks.patch ];
   });
 }

users/rin/default.nix

@@ -5,4 +5,5 @@
     shell = pkgs.zsh;
     uid = 1001;
   };
+  home-manager.users.rin = import ./home.nix;
 }