From 82ee51a8e9ff67054788a86c501dad99ed5b070f Mon Sep 17 00:00:00 2001
From: Preston Pan <preston@nullring.xyz>
Date: Sat, 20 Jul 2024 00:49:49 -0700
Subject: refactor existing code

---
 flake.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 76db1e2..52f6ad7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,17 +9,19 @@
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nur.url = "github:nix-community/NUR";
+
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nur.url = "github:nix-community/NUR";
     wallpapers.url = "github:ret2pop/wallpapers";
     sops-nix.url = "github:Mic92/sops-nix";
     scripts.url = "github:ret2pop/scripts";
   };
 
-  outputs = { self, nixpkgs, home-manager, nur, disko, wallpapers, sops-nix, scripts, ... }@attrs: {
+  outputs = { nixpkgs, home-manager, nur, disko, ... }@attrs: {
     nixosConfigurations = {
       live = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -41,13 +43,16 @@
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.extraSpecialArgs = attrs;
-            home-manager.useUserPackages = true;
-            home-manager.users.preston = import ./home.nix;
+            home-manager = {
+              useGlobalPkgs = true;
+              extraSpecialArgs = attrs;
+              useUserPackages = true;
+              users.preston = import ./home.nix;
+            };
           }
         ];
       };
+
       continuity = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = attrs;
@@ -67,10 +72,12 @@
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.extraSpecialArgs = attrs;
-            home-manager.useUserPackages = true;
-            home-manager.users.preston = import ./home.nix;
+            home-manager = {
+              useGlobalPkgs = true;
+              extraSpecialArgs = attrs;
+              useUserPackages = true;
+              users.preston = import ./home.nix;
+            };
           }
         ];
       };
-- 
cgit