From c90c05ffae5ea88bb73edf61ec9b1e95bc661685 Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Sun, 12 Jan 2025 11:19:11 -0600
Subject: [PATCH] builds on laptop

---
 flake.nix                                     | 191 ++++++++++--------
 .../configuration/laptop/default.nix          |   4 +-
 system-config/configuration/live/default.nix  |   3 +-
 3 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/flake.nix b/flake.nix
index 409759f..b2c11dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,113 +1,126 @@
 {
-  description = "Nixos config flake";
+    description = "Nixos config flake";
      
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    inputs = {
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
 
-    nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
+        nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+        disko = {
+            url = "github:nix-community/disko";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
 
-    impermanence.url = "github:nix-community/impermanence";
+        impermanence.url = "github:nix-community/impermanence";
 
-    sops-nix = {
-        url = "github:Mic92/sops-nix";
-        inputs.nixpkgs.follows = "nixpkgs";
-    };
+        sops-nix = {
+            url = "github:Mic92/sops-nix";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
 
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+        home-manager = {
+            url = "github:nix-community/home-manager/release-24.11";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
 
-    firefox-addons = {
-        url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-        inputs.nixpkgs.follows = "nixpkgs";
-    };
+        firefox-addons = {
+            url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
 
-    nix-minecraft.url = "github:Infinidoge/nix-minecraft";
+        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
-    #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
 
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     
-    tokyo-night-sddm = {
-      url = "github:siddrs/tokyo-night-sddm";
-      flake = false;
-    };    
+        tokyo-night-sddm = {
+            url = "github:siddrs/tokyo-night-sddm";
+            flake = false;
+        };    
     
-    sugar-dark-sddm = {
-      url = "github:MarianArlt/sddm-sugar-dark";
-      flake = false;
-    };
+        sugar-dark-sddm = {
+            url = "github:MarianArlt/sddm-sugar-dark";
+            flake = false;
+        };
 
-    nixvim.url = "/home/nathan/Projects/Nixvim";
+        nixvim.url = "/home/nathan/Projects/Nixvim";
 
-    ags.url = "github:Aylur/ags/v1";
+        ags.url = "github:Aylur/ags/v1";
     
-    themecord = {
-      url = "github:danihek/themecord";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-  };
-
-  outputs = { self, nixpkgs, ... } @ inputs: {
-
-     tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
-
-      name = "tokyo-night";
-
-      src = inputs.tokyo-night-sddm;
-
-      installPhase = ''
-        mkdir -p $out
-	cp -R $src/* $out/
-      '';
-
-    };   
-    sugar-dark-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
-
-      name = "sugar-dark";
-
-      src = inputs.sugar-dark-sddm;
-
-      installPhase = ''
-        mkdir -p $out
-	cp -R $src/* $out/
-      '';
+        themecord = {
+            url = "github:danihek/themecord";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
 
     };
 
+    outputs = { self, nixpkgs, ... } @ inputs: {
 
-     nixosConfigurations.homebox = nixpkgs.lib.nixosSystem {
-      specialArgs = { 
-          inputs = inputs // { 
-              nathan-home-manager = import ./home-manager/default.nix;
-              tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
-          }; 
-      };
-      modules = [
-        ./system-config/configuration/homebox
-        ./system-config
-      ];
-    };
+        tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
 
-     nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs; };
-      modules = [
-        ./system-config/configuration/laptop
-      ];
-    };
+            name = "tokyo-night";
 
-   nixosConfigurations.live = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs; };
-      modules = [
-        ./system-config/configuration/live
-      ];
+            src = inputs.tokyo-night-sddm;
+
+            installPhase = ''
+                mkdir -p $out
+	            cp -R $src/* $out/
+            '';
+
+        };   
+        
+        sugar-dark-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
+
+            name = "sugar-dark";
+
+            src = inputs.sugar-dark-sddm;
+
+            installPhase = ''
+                mkdir -p $out
+	            cp -R $src/* $out/
+            '';
+
+        };
+
+
+        nixosConfigurations.homebox = nixpkgs.lib.nixosSystem {
+            specialArgs = { 
+                inputs = inputs // { 
+                    nathan-home-manager = import ./home-manager/default.nix;
+                    tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
+                }; 
+            };
+            modules = [
+                ./system-config/configuration/homebox
+                ./system-config
+            ];
+        };
+
+        nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
+            specialArgs = { 
+                inputs = inputs // { 
+                    nathan-home-manager = import ./home-manager/default.nix;
+                    tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
+                }; 
+            };
+            modules = [
+                ./system-config/configuration/laptop
+                ./system-config
+            ];
+        };
+
+        nixosConfigurations.live = nixpkgs.lib.nixosSystem {
+            specialArgs = { 
+                inputs = inputs // { 
+                    nathan-home-manager = import ./home-manager/default.nix;
+                    tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
+                }; 
+            };
+            modules = [
+                ./system-config/configuration/live
+                ./system-config
+            ];
+        };
     };
-  };
 }
diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix
index 01c8f40..d133fde 100644
--- a/system-config/configuration/laptop/default.nix
+++ b/system-config/configuration/laptop/default.nix
@@ -5,8 +5,6 @@
     imports = [
         ./hardware-configuration.nix
 
-        inputs.system.nixosModule
-
         inputs.home-manager.nixosModules.default
 
         inputs.sops-nix.nixosModules.sops
@@ -89,7 +87,7 @@
                         firefox.enable = true;
                     };
                 }
-                inputs.nathan.homeManagerModule
+                inputs.nathan-home-manager
             ];
         };
     };
diff --git a/system-config/configuration/live/default.nix b/system-config/configuration/live/default.nix
index 2d1f853..5922903 100644
--- a/system-config/configuration/live/default.nix
+++ b/system-config/configuration/live/default.nix
@@ -12,7 +12,6 @@
 
         #home-manager.nixosModules.default
 
-        #system.nixosModule
     ];
 
     config = {
@@ -49,7 +48,7 @@
             extraSpecialArgs = { inherit inputs; };
             users = {
                 "nathan" = lib.mkMerge [
-                    inputs.nathan.homeManagerModule
+                    inputs.nathan-home-manager
                     {
                         config.homeconfig = {
                             impermanence.enable = false;