From dfa933097e8c33361b11ce3a2433cb487d96ae70 Mon Sep 17 00:00:00 2001
From: Seven Of Aces <sevenofaces42@gmail.com>
Date: Sun, 4 Aug 2024 08:17:06 -0700
Subject: [PATCH] Allowing multiple hosts

---
 flake.nix                                     |  4 +-
 .../blackstar/home-manager}/home.nix          |  3 ++
 .../blackstar/nixos}/configuration.nix        | 30 ++++--------
 .../nixos}/hardware-configuration.nix         |  0
 hosts/shared/home-manager/shared_home.nix     |  0
 hosts/shared/nixos/shared_config.nix          | 48 +++++++++++++++++++
 6 files changed, 61 insertions(+), 24 deletions(-)
 rename {home-manager => hosts/blackstar/home-manager}/home.nix (98%)
 rename {nixos => hosts/blackstar/nixos}/configuration.nix (88%)
 rename {nixos => hosts/blackstar/nixos}/hardware-configuration.nix (100%)
 create mode 100644 hosts/shared/home-manager/shared_home.nix
 create mode 100644 hosts/shared/nixos/shared_config.nix

diff --git a/flake.nix b/flake.nix
index 8199fab..c40cb99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
         specialArgs = {inherit inputs outputs;};
         modules = [
           # > Our main nixos configuration file <
-          ./nixos/configuration.nix
+          ./hosts/blackstar/nixos/configuration.nix
         ];
       };
     };
@@ -73,7 +73,7 @@
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
           # > Our main home-manager configuration file <
-          ./home-manager/home.nix
+          ./hosts/blackstar/home-manager/home.nix
         ];
       };
     };
diff --git a/home-manager/home.nix b/hosts/blackstar/home-manager/home.nix
similarity index 98%
rename from home-manager/home.nix
rename to hosts/blackstar/home-manager/home.nix
index f2d0d2f..0252176 100644
--- a/home-manager/home.nix
+++ b/hosts/blackstar/home-manager/home.nix
@@ -17,6 +17,9 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
+
+    # Shared config
+    ../../shared/shared_home.nix
   ];
 
   nixpkgs = {
diff --git a/nixos/configuration.nix b/hosts/blackstar/nixos/configuration.nix
similarity index 88%
rename from nixos/configuration.nix
rename to hosts/blackstar/nixos/configuration.nix
index f70c691..735492c 100644
--- a/nixos/configuration.nix
+++ b/hosts/blackstar/nixos/configuration.nix
@@ -25,6 +25,9 @@
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
+
+    # Shared config
+    ../../shared/shared_config.nix
   ];
 
   nixpkgs = {
@@ -125,6 +128,9 @@
     };
   };
 
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";
 
@@ -179,11 +185,11 @@
 
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.production;
   };
 
   # Programs installed for all users
-  environment.systemPackages  = with pkgs; [ 
+  environment.systemPackages = with pkgs; [ 
     # art
     aseprite
     krita
@@ -198,26 +204,6 @@
     python3
     lua
     git
-    (vscode-with-extensions.override {
-    vscodeExtensions = with vscode-extensions; [
-      dracula-theme.theme-dracula
-      yzhang.markdown-all-in-one
-      rust-lang.rust-analyzer
-     # jscearcy.rust-doc-viewer
-    #  swellaby.vscode-rust-test-adapter
-      tamasfe.even-better-toml
-      ms-vsliveshare.vsliveshare
-      aaron-bond.better-comments
-      bbenoist.nix
-    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
-        name = "remote-ssh-edit";
-        publisher = "ms-vscode-remote";
-        version = "0.47.2";
-        sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
-      }
-    ];
-  })
 
     # game
     steam
diff --git a/nixos/hardware-configuration.nix b/hosts/blackstar/nixos/hardware-configuration.nix
similarity index 100%
rename from nixos/hardware-configuration.nix
rename to hosts/blackstar/nixos/hardware-configuration.nix
diff --git a/hosts/shared/home-manager/shared_home.nix b/hosts/shared/home-manager/shared_home.nix
new file mode 100644
index 0000000..e69de29
diff --git a/hosts/shared/nixos/shared_config.nix b/hosts/shared/nixos/shared_config.nix
new file mode 100644
index 0000000..cefc832
--- /dev/null
+++ b/hosts/shared/nixos/shared_config.nix
@@ -0,0 +1,48 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+    environment.systemPackages = with pkgs; [ 
+
+        # code
+        cargo rustc # Rust
+        jetbrains.rust-rover
+        jetbrains.rider
+        jetbrains.clion
+        jetbrains.pycharm-professional
+        vim
+        python3
+        lua
+        git
+        (vscode-with-extensions.override {
+            vscodeExtensions = with vscode-extensions; [
+            dracula-theme.theme-dracula
+            yzhang.markdown-all-in-one
+            rust-lang.rust-analyzer
+            # jscearcy.rust-doc-viewer
+            #  swellaby.vscode-rust-test-adapter
+            tamasfe.even-better-toml
+            ms-vsliveshare.vsliveshare
+            aaron-bond.better-comments
+            bbenoist.nix
+            ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            {
+                name = "remote-ssh-edit";
+                publisher = "ms-vscode-remote";
+                version = "0.47.2";
+                sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+            }
+            ];
+        })
+        # other
+        discord
+
+        # sys utils
+        gnupg ffmpeg unzip 
+        mpv
+    ];
+}
\ No newline at end of file