From 69ae2f3e97745054480349a58e932c53cd819435 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <achacega@gmail.com>
Date: Fri, 1 Mar 2024 21:38:19 -0500
Subject: [PATCH] moved nix/ folder to system/, moved user info from hosts/ to
 system

---
 flake.nix                   | 4 ++--
 hosts/petalburg/default.nix | 9 ---------
 hosts/rustboro/default.nix  | 9 ---------
 {nix => system}/default.nix | 7 +++++++
 4 files changed, 9 insertions(+), 20 deletions(-)
 rename {nix => system}/default.nix (77%)

diff --git a/flake.nix b/flake.nix
index 2b94de3c..3f61ccc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/rustboro
-          ./nix
+          ./system
           ./flatpak
           ./hardware
           ./network
@@ -54,7 +54,7 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/petalburg
-          ./nix
+          ./system
           ./flatpak
           ./hardware
           ./network
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 1422e9fc..fbce648b 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -39,15 +39,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.aly = {
-    isNormalUser = true;
-    description = "Aly Raffauf";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
-  };
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index f822f308..690a6aec 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -39,15 +39,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.aly = {
-    isNormalUser = true;
-    description = "Aly Raffauf";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
-  };
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/nix/default.nix b/system/default.nix
similarity index 77%
rename from nix/default.nix
rename to system/default.nix
index cf7a0715..e7cec180 100644
--- a/nix/default.nix
+++ b/system/default.nix
@@ -1,6 +1,13 @@
 { config, pkgs, ... }:
 
 {
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.aly = {
+    isNormalUser = true;
+    description = "Aly Raffauf";
+    extraGroups = [ "networkmanager" "wheel" "docker" ];
+  };
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;