From 59aecae80aae06359d0605bcb2159624ed3ffef9 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Thu, 31 Aug 2023 01:04:01 +0200
Subject:

---
 flake.nix | 53 +++++++++++------------------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 777c6f4..bea559d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,44 +10,15 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    # hyprland.url = "github:hyprwm/Hyprland";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
-  # outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: let
-
-  #   system = "x86_64-linux";
-       
-  #   defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem {
-  #   # defFlakeSystem = nixpkgs.lib.nixosSystem {
-
-  #       pkgs = import nixpkgs {
-  #         inherit system;
-  #         config.allowUnfree = true;
-  #       };
-  #       pkgsUnstable = import nixpkgs-unstable {
-  #         inherit system;
-  #         config.allowUnfree = true;
-  #       };
-
-  #       modules = [({ ... }: {
-  #         imports = [
-  #           baseCfg
-  #           home-manager.nixosModules.home-manager
-  #           {
-  #             # home-manager.useGlobalPkgs = true;
-  #             home-manager.useUserpackages = true;
-  #           }
-  #         ];
-  #         # Let 'nixos-version --json' know the Git revision of this flake.
-  #         system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
-  #         nix.registry.nixpkgs.flake = nixpkgs;
-  #       })];
-  #   };
-  # in {
+  # outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, ... }: {
     nixosConfigurations = {
 
       nixos-zenbook = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         modules = [
           ./machines/zenbook/configuration.nix
           
@@ -56,17 +27,15 @@
           # Default users
           ./modules/user-profiles/defin.nix
 
-          imports = [ 
-            home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager {
 
-              # home-manager.useGlobalPkgs = true;
-              home-manager.useUserpackages = true;
-              home-manager.users.defin = import ./home-manager/home.nix;
+            # home-manager.useGlobalPkgs = true;
+            home-manager.useUserpackages = true;
+            home-manager.users.defin = import ./home-manager/home.nix;
 
-              # Optionally, use home-manager.extraSpecialArgs to pass
-              # arguments to home.nix
-            }
-          ]
+            # Optionally, use home-manager.extraSpecialArgs to pass
+            # arguments to home.nix
+          }
 
           # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
           ./modules/hyprland.nix
-- 
cgit v1.2.3