Restructure the configuration

flake.nix

@@ -45,7 +45,7 @@
 
           modules = [
             home-manager.darwinModules.default
-            ./machines/macbook/configuration.nix
+            ./machines/macbook
             nix-rosetta-builder.darwinModules.default
             { nix-rosetta-builder.onDemand = true; }
           ];
@@ -61,7 +61,7 @@
         };
         modules = [
           home-manager.nixosModules.default
-          ./machines/thinkpad/configuration.nix
+          ./machines/thinkpad
         ];
       };
     };

machines/macbook/default.nix

@@ -1,19 +1,16 @@
 { pkgs, emacs-larstvei, ... }:
-let
-  v = import ./variables.nix;
-in
 {
   imports = [
-    ../../system
+    ../../modules/base
-    ../../system/darwin
+    ../../modules/darwin
   ];
 
-  system.primaryUser = v.username;
+  system.primaryUser = "larstvei";
 
-  networking.hostName = v.hostName;
+  networking.hostName = "larstvei-macbookpro";
 
-  users.users.${v.username} = {
+  users.users.larstvei = {
-    home = v.userHome;
+    home = "/Users/larstvei";
     shell = pkgs.fish;
   };
 
@@ -21,7 +18,7 @@ in
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = { inherit emacs-larstvei; };
-    users.${v.username}.imports = [ ../../home ];
+    users.larstvei.imports = [ ../../modules/home ];
   };
 
   homebrew = {

machines/macbook/variables.nix

@@ -1,5 +0,0 @@
-{
-  username = "larstvei";
-  userHome = "/Users/larstvei";
-  hostName = "larstvei-macbookpro";
-}

machines/thinkpad/default.nix

@@ -5,15 +5,12 @@
   zen-browser,
   ...
 }:
-let
-  v = import ./variables.nix;
-in
 {
   imports = [
-    ../../system
+    ./keyboard
-    ../../system/nixos
+    ./hardware
-    ./keyboard.nix
+    ../../modules/base
-    ./hardware-configuration.nix
+    ../../modules/nixos
   ];
 
   home-manager = {
@@ -24,9 +21,9 @@ in
       inherit emacs-larstvei;
       inherit zen-browser;
     };
-    users.${v.username}.imports = [
+    users.larstvei.imports = [
-      ../../home
+      ../../modules/home
-      ../../home/desktop
+      ../../modules/desktop
     ];
   };
 
@@ -35,15 +32,15 @@ in
     settings = {
       default_session = {
         command = "hyprland";
-        user = v.username;
+        user = "larstvei";
       };
     };
   };
 
-  users.users.${v.username} = {
+  users.users.larstvei = {
     isNormalUser = true;
     description = "Lars Tveito";
-    home = v.userHome;
+    home = "/home/larstvei";
     shell = pkgs.fish;
     extraGroups = [
       "networkmanager"
@@ -51,7 +48,7 @@ in
     ];
   };
 
-  networking.hostName = v.hostName;
+  networking.hostName = "larstvei-think";
 
   console.keyMap = "us";
 

machines/thinkpad/variables.nix

@@ -1,5 +0,0 @@
-{
-  username = "larstvei";
-  userHome = "/home/larstvei";
-  hostName = "larstvei-think";
-}

modules/darwin/default.nix

@@ -2,7 +2,7 @@
 {
 
   imports = [
-    ../../home/fonts
+    ../fonts
   ];
 
   nix.linux-builder.enable = true;

modules/home/default.nix

@@ -1,7 +1,7 @@
 {
   imports = [
-    ./languages
+    ../languages
-    ./tools
+    ../tools
   ];
 
   programs.home-manager.enable = true;

modules/nixos/default.nix

@@ -2,7 +2,7 @@
 {
 
   imports = [
-    ../../home/fonts
+    ../fonts
   ];
 
   fonts = {