From 8ec7f0a6622e0241e21bec7c0be1c3459bbc985e Mon Sep 17 00:00:00 2001
From: Aner Zakobar <aner@zakobar.com>
Date: Fri, 14 Feb 2025 01:09:19 +0200
Subject: [PATCH] Fixed submodule issue

---
 README.org                 |  2 +-
 azos-core                  |  2 +-
 flake.lock                 | 12 ++++++------
 home-manager/home.nix      |  7 ++++---
 nixos/configuration-vm.nix | 15 ++-------------
 overlays/default.nix       |  2 +-
 6 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/README.org b/README.org
index 2246d65..02fd1ce 100644
--- a/README.org
+++ b/README.org
@@ -21,7 +21,7 @@ From https://github.com/nix-community/vagrant-nixos-plugin
 Or do this
 
 #+begin_src bash
-git add azos-core && nix flake lock --update-input azos-core && nix build .#nixosConfigurations.vm.config.system.build.vm
+nix build '.?submodules=1#nixosConfigurations.vm.config.system.build.vm'
 #+end_src
 
 ** Installing home manager
diff --git a/azos-core b/azos-core
index 41940a8..d2880fa 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 41940a8e67b558f7daf0c4ed2fbedd27ab632e77
+Subproject commit d2880fa726c4ac3908d797fbbd848e3add43af6c
diff --git a/flake.lock b/flake.lock
index 0c27c9d..ccb9c15 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,17 +6,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1738844253,
-        "narHash": "sha256-9+P5G/177kZ6QN+psxb2IJcwvqxZ6FjuqZ7wjSlsD0w=",
+        "lastModified": 1739453429,
+        "narHash": "sha256-rf/x3UoVqCX0mFTYVn5n/htz0q21HF7fbmYs8O/czaQ=",
         "ref": "refs/heads/master",
-        "rev": "63005bf29562177ca11e2b7a821a8133c5cff6f1",
-        "revCount": 13,
+        "rev": "b9c57afc227c57a48cd4fa50153d1e2ca57664e6",
+        "revCount": 4,
         "type": "git",
-        "url": "file:./azos-core"
+        "url": "file:azos-core"
       },
       "original": {
         "type": "git",
-        "url": "file:./azos-core"
+        "url": "file:azos-core"
       }
     },
     "flake-utils": {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ee106b0..69f58c9 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,9 +15,10 @@
 
   nixpkgs = {
     overlays = [
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
+      inputs.azos-core.overlays.addpkgs
+      # outputs.overlays.additions
+      # outputs.overlays.modifications
+      # outputs.overlays.unstable-packages
     ];
     config = {
       allowUnfree = true;
diff --git a/nixos/configuration-vm.nix b/nixos/configuration-vm.nix
index d5f6b9f..a0a27ef 100644
--- a/nixos/configuration-vm.nix
+++ b/nixos/configuration-vm.nix
@@ -26,8 +26,9 @@ virtualisation.qemu.options = [
       "-device virtserialport,chardev=ch1,id=ch1,name=com.redhat.spice.0"
     ];
 };
-imports = [
+  imports = [
     inputs.home-manager.nixosModules.home-manager
+    outputs.nixosModules
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
@@ -103,18 +104,6 @@ imports = [
   };
 
   #Graphical environment
-  services.xserver.enable = true;
-  services.xserver.autorun = false;
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "startx";
-        user = "aner";
-      };
-    };
-  };
-  services.xserver.displayManager.startx.enable = true;
   # services.xserver.desktopManager.xfce.enable = true;
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";
diff --git a/overlays/default.nix b/overlays/default.nix
index c9704a5..99f666c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,7 +1,7 @@
 # This file defines overlays
 {inputs, ...}: {
   # This one brings our custom packages from the 'pkgs' directory
-  # additions = final: _prev: import ./pkgs {pkgs = final;};
+  additions = final: _prev: import ./pkgs {pkgs = final;};
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.