From 87ef397becbf60ce5f7e733d90afac8e21786fd1 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Thu, 19 Dec 2024 08:43:27 +0100
Subject: [PATCH] moved mac imports to hosts

---
 flake.lock                            | 12 ++++++------
 flake.nix                             |  3 ---
 nixos/home.nix                        |  9 ---------
 nixos/hosts/kylekrein-mac/default.nix | 10 +++++++++-
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 072330f..fa12719 100644
--- a/flake.lock
+++ b/flake.lock
@@ -524,11 +524,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1734563337,
-        "narHash": "sha256-0nOMDLi0aldc7VUfy/aBBL+4QLizccuSRG/MsBCrLQk=",
+        "lastModified": 1734573361,
+        "narHash": "sha256-OE3lMafu66zn71F90NFZPU7ejwdMC8JhRBjNB7wC7Tk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "23e7d8f6a7d4e25c2dc6be33af07249570e66940",
+        "rev": "5b714f05f87831e3e930af04649f853d5efb9902",
         "type": "github"
       },
       "original": {
@@ -860,11 +860,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734563049,
-        "narHash": "sha256-P/103iUx75XPXeX21M20kzttGaZJ6+c8xp9yo3fx3Zg=",
+        "lastModified": 1734567959,
+        "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "79a637d1962e725218ff46f5234cb3d5617ed36b",
+        "rev": "37608b462772e35220e02bfbd9045d0946564436",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f0893c2..12c246b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -113,9 +113,6 @@
 		      inputs.impermanence.nixosModules.impermanence
 			  ./nixos/configuration.nix
 			  ./nixos/modules/impermanence
-			  inputs.apple-silicon-support.nixosModules.default
-			  ./nixos/hosts/kylekrein-mac/mac-hardware-conf.nix
-			  ./nixos/hardware/macos/configuration.nix
 		  ] ++ general-modules;
 	      };
 	  };
diff --git a/nixos/home.nix b/nixos/home.nix
index 01bc377..e21f8b6 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,14 +1,6 @@
 { config, pkgs, stylix, hwconfig, first-nixos-install, username, inputs, ... }:
 
   let
-  #nur = import (builtins.fetchTarball {
-  # Get the revision by choosing a version from https://github.com/nix-community/NUR/commits/master
-  #url = "https://github.com/nix-community/NUR/archive/e7fee426abaf126e6bfb6c84f710f57f0e83491c.tar.gz";
-  # Get the hash by running `nix-prefetch-url --unpack <url>` on the above url
- #sha256 = "01wx2il71dnsvviqphpdykr6h0hazf6x28ml7xrpr8fdkg1lvpjs";
-#}) pkgs {};
-
-  # gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;};
   in
 {
   imports =
@@ -17,7 +9,6 @@
 	./modules/nixvim
 	./modules/fastfetch
 	./homes/${username}
-	#"${if hostname != "nixosbtw" then ./macos/homemac.nix else ./empty.nix }"
     ] ++ (if hwconfig.useImpermanence then [ (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } ) ] else []);
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
diff --git a/nixos/hosts/kylekrein-mac/default.nix b/nixos/hosts/kylekrein-mac/default.nix
index 3fb8567..2c29f89 100644
--- a/nixos/hosts/kylekrein-mac/default.nix
+++ b/nixos/hosts/kylekrein-mac/default.nix
@@ -1,6 +1,14 @@
-{ pkgs, lib, hwconfig, ... }:
+{ pkgs, lib, hwconfig, inputs, ... }:
 {
     imports = [
+	inputs.apple-silicon-support.nixosModules.default
+	./mac-hardware-conf.nix
+	../../hardware/macos/configuration.nix
+
+
+
 	../../users/kylekrein
     ];
+    facter.reportPath = lib.mkForce null; #fails to generate
+
 }