From 74088084671b9c0f93d40007eaae6960fe162603 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 21 Apr 2025 18:02:33 -0600
Subject: [PATCH] make data dir for the nix files to not overwrite the flake

---
 .gitignore  |  8 +-------
 src/main.rs | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94eb0df..d1ff78e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,4 @@
 result
 
 # Main nix files
-flake.nix
-configuration.nix
-home.nix
-
-# Extra nix files
-garrus.nix
-gnome.nix
+/data
diff --git a/src/main.rs b/src/main.rs
index fad2e98..7722de5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -107,7 +107,7 @@ fn grab_flake() {
     let mut easy = Easy::new();
     easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/rust-rewrite/flake.nix").unwrap();
 
-    let mut file = File::create("flake.nix").unwrap();
+    let mut file = File::create("data/flake.nix").unwrap();
 
     {
         let mut transfer = easy.transfer();
@@ -123,7 +123,7 @@ fn grab_config() {
     let mut easy = Easy::new();
     easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/rust-rewrite/configuration.nix").unwrap();
 
-    let mut file = File::create("configuration.nix").unwrap();
+    let mut file = File::create("data/configuration.nix").unwrap();
 
     {
         let mut transfer = easy.transfer();
@@ -139,7 +139,7 @@ fn grab_home() {
     let mut easy = Easy::new();
     easy.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/rust-rewrite/home.nix").unwrap();
 
-    let mut file = File::create("home.nix").unwrap();
+    let mut file = File::create("data/home.nix").unwrap();
 
     {
         let mut transfer = easy.transfer();
@@ -155,7 +155,7 @@ fn grab_gnome(){
     let mut gnome_config = Easy::new();
     gnome_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix").unwrap();
 
-    let mut config_file = File::create("gnome.nix").unwrap();
+    let mut config_file = File::create("data/gnome.nix").unwrap();
 
     {
         let mut transfer = gnome_config.transfer();
@@ -223,7 +223,8 @@ fn main() {
 
     // Copies the nix files to /mnt/etc/nixos/
     let _nix_move = Command::new("mv")
-        .args(["-f", "flake.nix", "configuration.nix", "home.nix", "/mnt/etc/nixos"])
+        .args(["-f", "data/flake.nix", "data/configuration.nix", "data/home.nix"])
+        .arg("/mnt/etc/nixos")
         .output()
         .expect("Failed to move nix files over");
 
@@ -259,7 +260,7 @@ fn main() {
                 let mut garrus_config = Easy::new();
                 garrus_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/hosts/x86_64/garrus/configuration.nix").unwrap();
 
-                let mut config_file = File::create("garrus.nix").unwrap();
+                let mut config_file = File::create("data/garrus.nix").unwrap();
 
                 {
                     let mut transfer = garrus_config.transfer();
@@ -272,7 +273,7 @@ fn main() {
 
                 // Copies the system nix files to /mnt/etc/nixos/
                 let _garrus_nix_copy = Command::new("mv")
-                    .args(["garrus.nix", "gnome.nix", "/mnt/etc/nixos"])
+                    .args(["data/garrus.nix", "data/gnome.nix", "/mnt/etc/nixos"])
                     .output()
                     .expect("Failed to copy nix files over");
 
@@ -294,7 +295,7 @@ fn main() {
                 let mut vm_config = Easy::new();
                 vm_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/hosts/x86_64/vm/configuration.nix").unwrap();
 
-                let mut config_file = File::create("vm.nix").unwrap();
+                let mut config_file = File::create("data/vm.nix").unwrap();
 
                 {
                     let mut transfer = vm_config.transfer();
@@ -307,7 +308,7 @@ fn main() {
 
                 // Copies the system nix files to /mnt/etc/nixos/
                 let _garrus_nix_copy = Command::new("mv")
-                    .args(["vm.nix", "/mnt/etc/nixos"])
+                    .args(["data/vm.nix", "/mnt/etc/nixos"])
                     .output()
                     .expect("Failed to copy nix files over");