From 52c3f11b41f7c43824adcbd2162c9463817a0cbf Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 28 Jun 2024 22:04:37 -0500
Subject: [PATCH] Laptops building again

---
 flake.nix                        | 14 +++++++++++---
 modules/home-manager/default.nix | 10 +++++-----
 modules/nixos/default.nix        |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3206761..c8a2bde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -180,7 +180,7 @@
         modules = with nixosModules; [
           common
 
-          diskoConfigurations.standard
+          outputs.diskoConfigurations.standard
           hardware.nixosModules.common-cpu-amd
           hardware.nixosModules.common-pc-ssd
 
@@ -217,7 +217,6 @@
           hardware.nixosModules.framework-13-7040-amd
 
           graphical-workstation
-          development-tools
           laptop
           gaming
 
@@ -248,11 +247,20 @@
           hardware.nixosModules.lenovo-thinkpad-x1-yoga
 
           graphical-workstation
-          development-tools
           laptop
           gaming
 
           ./nixos/thablet.nix
+
+          {
+            home-manager.users.daniel = {
+              imports = with homeManagerModules; [
+                iex
+                cargo
+                linux-desktop-environment-config
+              ];
+            };
+          }
         ];
       };
 
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index aaec67e..8abfa19 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -90,7 +90,7 @@
         gnupg
         (pkgs.buildEnv {
           name = "my-common-scripts";
-          paths = [./modules/home-manager/scripts/common];
+          paths = [./scripts/common];
         })
       ];
     };
@@ -241,8 +241,8 @@
     programs.fish = {
       enable = true;
       # I load long scripts from files for a better editing experience
-      shellInit = builtins.readFile ./modules/home-manager/fish/shellInit.fish;
-      interactiveShellInit = builtins.readFile ./modules/home-manager/fish/interactiveShellInit.fish;
+      shellInit = builtins.readFile ./fish/shellInit.fish;
+      interactiveShellInit = builtins.readFile ./fish/interactiveShellInit.fish;
       loginShellInit = "";
       functions = {
         # TODO: I think these should be loaded from fish files too for better editor experience?
@@ -1104,7 +1104,7 @@
     home.packages = [
       (pkgs.buildEnv {
         name = "my-linux-scripts";
-        paths = [./modules/home-manager/scripts/linux];
+        paths = [./scripts/linux];
       })
     ];
   };
@@ -1195,7 +1195,7 @@
     # docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors
     programs.wezterm = with colors.withHashPrefix; {
       enable = true;
-      extraConfig = builtins.readFile ./modules/home-manager/wezterm/config.lua;
+      extraConfig = builtins.readFile ./wezterm/config.lua;
       colorSchemes = {
         catppuccin-mocha-sapphire = {
           ansi = map (x: colors.withHashPrefix.${toString x}) (pkgs.lib.lists.range 0 7);
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index c48b03c..403269e 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -720,7 +720,7 @@
 
   family-users = {
     imports = with nixosModules; [
-      daniel
+      # daniel # part of common
       valerie
       flanfam
     ];