From a98539b9cc62a4d352ce7fe1cedb5a497d3185d0 Mon Sep 17 00:00:00 2001
From: ChaotiCryptidz <chaoticryptidz@owo.monster>
Date: Sun, 26 Dec 2021 13:29:24 +0000
Subject: [PATCH] change how tree and user profiles works.

---
 home/base/zsh.nix                             |  2 +-
 home/default.nix                              | 18 ----------
 home/vscode/code.nix                          |  3 +-
 hosts/lappy.nix                               | 33 +++++++++++--------
 outputs.nix                                   |  2 +-
 profiles/dev/programming.nix                  |  2 +-
 .../chaoticryptidz/chaoticryptidz.nix         |  0
 7 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100644 home/default.nix
 rename home/nixos.nix => users/chaoticryptidz/chaoticryptidz.nix (100%)

diff --git a/home/base/zsh.nix b/home/base/zsh.nix
index 61ba7af..8d122da 100644
--- a/home/base/zsh.nix
+++ b/home/base/zsh.nix
@@ -1,7 +1,7 @@
 { ... }: {
   programs.zsh = {
     enable = true;
-    oh-my-zsh = {
+    ohMyZsh = {
       enable = true;
       theme = "afowler";
       plugins = [ ];
diff --git a/home/default.nix b/home/default.nix
deleted file mode 100644
index d9631f7..0000000
--- a/home/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, tree, ... }: with lib; let
-  wrapImports = imports: mapAttrs
-    (_: paths: { config, ... }: {
-      config.home-manager.users.chaoticryptidz = {
-        imports = singleton paths;
-      };
-    })
-    imports;
-  dirImports = wrapImports tree.prev;
-in
-dirImports // {
-  base = {
-    imports = [
-      dirImports.base
-      tree.prev.nixos
-    ];
-  };
-}
diff --git a/home/vscode/code.nix b/home/vscode/code.nix
index 03e0bc1..a84132d 100644
--- a/home/vscode/code.nix
+++ b/home/vscode/code.nix
@@ -5,7 +5,7 @@
     enable = true;
     extensions = with pkgs; [
       vscode-extensions.bbenoist.nix
-      vscode-extensions.b4dm4n.vscode-nixpkgs-fmt
+      vscode-extensions.brettm12345.nixfmt-vscode
       vscode-extensions.tiehuis.zig
       vscode-extensions.golang.go
     ];
@@ -19,6 +19,7 @@
       "markdown.preview.fontFamily" = "'Comic Code'";
       "terminal.integrated.fontFamily" = "'Comic Code'";
       "files.autoSave" = "afterDelay";
+      "[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; };
     };
   };
 }
diff --git a/hosts/lappy.nix b/hosts/lappy.nix
index 5845a44..7cd2597 100644
--- a/hosts/lappy.nix
+++ b/hosts/lappy.nix
@@ -2,6 +2,8 @@
 
 {
   imports = with tree; [
+    users.chaoticryptidz
+
     profiles.dev
     profiles.gui
     profiles.laptop
@@ -11,20 +13,25 @@
     profiles.sway
     profiles.dnscrypt
     profiles.gaming
-
-    home.gui
-    home.dev
-    home.dev
-    home.network_manager
-    home.sway
-    home.vscode
   ];
 
-  networking.hostName = "lappy";
-  time.timeZone = "Europe/London";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  config.home-manager.users.chaoticryptidz = {
+    imports = with tree; [
+      home.gui
+      home.dev
+      home.dev
+      home.network_manager
+      home.sway
+      home.vscode
+    ];
+  };
 
-  boot = {
+
+  config.networking.hostName = "lappy";
+  config.time.timeZone = "Europe/London";
+  config.powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  config.boot = {
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -33,7 +40,7 @@
     kernelModules = [ "kvm-intel" ];
   };
 
-  fileSystems = {
+  config.fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/491ec94c-5e6a-4d23-a2a6-bcf4971a6e7b";
       fsType = "ext4";
@@ -44,6 +51,6 @@
     };
   };
 
-  system.stateVersion = "21.11";
+  config.system.stateVersion = "21.11";
 }
 
diff --git a/outputs.nix b/outputs.nix
index 328ae72..76129a3 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -6,7 +6,7 @@ let
     folder = ./.;
     config = {
       "profiles/*".functor.enable = true;
-      "home".evaluateDefault = true;
+      "users/*".functor.enable = true;
       "home/*".functor.enable = true;
     };
   };
diff --git a/profiles/dev/programming.nix b/profiles/dev/programming.nix
index 3ee20d2..57185e6 100644
--- a/profiles/dev/programming.nix
+++ b/profiles/dev/programming.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     # Nix
-    nixpkgs-fmt
+    nixfmt
     # Go
     go
     gopls
diff --git a/home/nixos.nix b/users/chaoticryptidz/chaoticryptidz.nix
similarity index 100%
rename from home/nixos.nix
rename to users/chaoticryptidz/chaoticryptidz.nix