Remove on all import AND remove of flake.lock

.gitignore

@@ -0,0 +1 @@
+.DS_Store

flake.lock

@@ -1,66 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1714043624,
-        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-23.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1713995372,
-        "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1714076141,
-        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

modules/apps/default.nix

@@ -1,5 +1,7 @@
 {
-  shell = import ./services/shell.nix;
+  within = {
-  gnome = import ./services/gnome.nix;
+    shell = ./services/shell.nix;
-  zed =  import ./submodules/zed.nix;
+    gnome = ./services/gnome.nix;
+    zed = ./submodules/zed.nix;
+  };
 }

modules/apps/services/gnome.nix

@@ -1,4 +1,4 @@
 {
-  shell = import ../submodules/gnome-shell.nix;
+  shell = ../submodules/gnome-shell.nix;
-  apps = import ../submodules/gnome-apps.nix;
+  apps = ../submodules/gnome-apps.nix;
 }

modules/apps/services/shell.nix

@@ -1,6 +1,6 @@
 {
-  zsh = import ../submodules/zsh.nix;
+  zsh = ../submodules/zsh.nix;
-  nh = import ../submodules/nh.nix;
+  nh = ../submodules/nh.nix;
-  git = import ../submodules/git.nix;
+  git = ../submodules/git.nix;
-  docker = import ../submodules/docker.nix;
+  docker = ../submodules/docker.nix;
 }

modules/nixos/default.nix

@@ -1,7 +1,9 @@
 {
-  boot = import ./services/boot.nix;
+  within = {
-  graphics = import ./services/graphics.nix;
+    boot = ./services/boot.nix;
-  networks = import ./services/networks.nix;
+    graphics = ./services/graphics.nix;
-  audio = import ./services/audio.nix;
+    networks = ./services/networks.nix;
-  keyboard = import ./services/keyboard.nix;
+    audio = ./services/audio.nix;
+    keyboard = ./services/keyboard.nix;
+  };
 }

modules/nixos/services/audio.nix

@@ -1,3 +1,3 @@
 {
-  pipewire = import ../submodules/pipewire.nix;
+  pipewire = ../submodules/pipewire.nix;
 }

modules/nixos/services/boot.nix

@@ -1,4 +1,4 @@
 {
-  systemd = import ../submodules/systemd-boot.nix;
+  systemd = ../submodules/systemd-boot.nix;
-  plymouth = import ../submodules/plymouth.nix;
+  plymouth = ../submodules/plymouth.nix;
 }

modules/nixos/services/graphics.nix

@@ -1,6 +1,6 @@
 {
   nvidia = {
-    base = import ../submodules/nvidia.nix;
+    base = ../submodules/nvidia.nix;
-    prime = import ../submodules/nvidia-prime.nix;
+    prime = ../submodules/nvidia-prime.nix;
   };
 }

modules/nixos/services/keyboard.nix

@@ -1,3 +1,3 @@
 {
-  apple = import ../submodules/keyboard-apple.nix;
+  apple = ../submodules/keyboard-apple.nix;
 }

modules/nixos/services/networks.nix

@@ -1,4 +1,4 @@
 {
-  dns = import ../submodules/dns.nix;
+  dns = ../submodules/dns.nix;
-  manager = import ../submodules/manager.nix;
+  manager = ../submodules/manager.nix;
 }

nixos/configuration.nix

@@ -17,11 +17,7 @@
     ./configurations/home-manager.nix
 
     # Modules
-    inputs.self.nixos.boot
+    inputs.self.nixos.within
-    inputs.self.nixos.graphics
-    inputs.self.nixos.audio
-    inputs.self.nixos.networks
-    inputs.self.nixos.keyboard
 
   ];
 
@@ -53,7 +49,7 @@
   time.timeZone = "Europe/Brussels";
 
   # System services
-  within.boot.systemd.enable = true;
+  within.boot.bootd.enable = true;
   within.boot.plymouth.enable = true;
   within.graphics.nvidia.base.enable = true;
   within.audio.pipewire.enable = true;