From a013933c1a59118488ceae66e620b2fe1583e1c7 Mon Sep 17 00:00:00 2001
From: Lyes Saadi <dev@lyes.eu>
Date: Sat, 4 May 2024 22:12:13 +0200
Subject: [PATCH] Fixing some bugs

---
 configuration/configuration.nix               |  1 -
 configuration/networking.nix                  |  3 +-
 flake.lock                                    | 82 +++++++++++++++++++
 flake.nix                                     |  7 +-
 hardware/{x1-extreme-gen4.nix => lyes-pc.nix} |  4 +-
 5 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 flake.lock
 rename hardware/{x1-extreme-gen4.nix => lyes-pc.nix} (98%)

diff --git a/configuration/configuration.nix b/configuration/configuration.nix
index 8de3fd3..0e87400 100644
--- a/configuration/configuration.nix
+++ b/configuration/configuration.nix
@@ -3,7 +3,6 @@
 {
   imports =
     [
-      ./hardware-configuration.nix
       ./packages.nix
       ./system.nix
       ./networking.nix
diff --git a/configuration/networking.nix b/configuration/networking.nix
index aa5b98a..c4ba921 100644
--- a/configuration/networking.nix
+++ b/configuration/networking.nix
@@ -2,7 +2,6 @@
 
 {
   # Networking
-  networking.hostName = "lyes-nix";
   networking.networkmanager.enable = true;
 
   networking.nameservers = [
@@ -44,4 +43,4 @@
   #  port = 8998;
   #  extraArgs = [ "--password pouicbarilstepson123cassoulet" ];
   #};
-}
\ No newline at end of file
+}
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..d46e9db
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,82 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714679908,
+        "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1711997201,
+        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "v0.4.1",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1714746424,
+        "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "3f017311191fe6d501ca2496a835d012f656ee9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1714635257,
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 4d4bcde..a9e46af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,11 @@
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [
-        ./configuration.nix
-        ./hardware/x1-extreme-gen4.nix
-        nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4
+        ./configuration/configuration.nix
         nix-flatpak.nixosModules.nix-flatpak
+        ./hardware/lyes-pc.nix
+        nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4
+        /etc/nixos/hardware-configuration.nix
       ];
     };
   };
diff --git a/hardware/x1-extreme-gen4.nix b/hardware/lyes-pc.nix
similarity index 98%
rename from hardware/x1-extreme-gen4.nix
rename to hardware/lyes-pc.nix
index fb9801f..11aaa5f 100644
--- a/hardware/x1-extreme-gen4.nix
+++ b/hardware/lyes-pc.nix
@@ -70,8 +70,10 @@
   #   };
   # };
 
+  # Networking
+  networking.hostName = "lyes-pc";
+ 
   # NVidia
-  
   services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware.opengl = {