53 files changed, 30 insertions, 36 deletions

diff --git a/core/default.nix b/core/default.nix
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/core/default.nix
diff --git a/gjs/.gitignore b/core/gjs/.gitignore
index 8c2cc59..8c2cc59 100644
--- a/gjs/.gitignore
+++ b/core/gjs/.gitignore
diff --git a/gjs/eslint.config.mjs b/core/gjs/eslint.config.mjs
index 99dad7d..99dad7d 100644
--- a/gjs/eslint.config.mjs
+++ b/core/gjs/eslint.config.mjs
diff --git a/gjs/index.ts b/core/gjs/index.ts
index 901b264..901b264 100644
--- a/gjs/index.ts
+++ b/core/gjs/index.ts
diff --git a/gjs/package-lock.json b/core/gjs/package-lock.json
index aa679c8..aa679c8 100644
--- a/gjs/package-lock.json
+++ b/core/gjs/package-lock.json
diff --git a/gjs/package.json b/core/gjs/package.json
index e3c86d0..e3c86d0 100644
--- a/gjs/package.json
+++ b/core/gjs/package.json
diff --git a/gjs/src/application.ts b/core/gjs/src/application.ts
index 0ba247e..0ba247e 100644
--- a/gjs/src/application.ts
+++ b/core/gjs/src/application.ts
diff --git a/gjs/src/astalify.ts b/core/gjs/src/astalify.ts
index be395ee..be395ee 100644
--- a/gjs/src/astalify.ts
+++ b/core/gjs/src/astalify.ts
diff --git a/gjs/src/binding.ts b/core/gjs/src/binding.ts
index feec6fc..feec6fc 100644
--- a/gjs/src/binding.ts
+++ b/core/gjs/src/binding.ts
diff --git a/gjs/src/file.ts b/core/gjs/src/file.ts
index 90b33a1..90b33a1 100644
--- a/gjs/src/file.ts
+++ b/core/gjs/src/file.ts
diff --git a/gjs/src/imports.ts b/core/gjs/src/imports.ts
index cbed004..cbed004 100644
--- a/gjs/src/imports.ts
+++ b/core/gjs/src/imports.ts
diff --git a/gjs/src/jsx/jsx-runtime.ts b/core/gjs/src/jsx/jsx-runtime.ts
index 70f098f..70f098f 100644
--- a/gjs/src/jsx/jsx-runtime.ts
+++ b/core/gjs/src/jsx/jsx-runtime.ts
diff --git a/gjs/src/process.ts b/core/gjs/src/process.ts
index c5329e2..c5329e2 100644
--- a/gjs/src/process.ts
+++ b/core/gjs/src/process.ts
diff --git a/gjs/src/time.ts b/core/gjs/src/time.ts
index 4e28ad0..4e28ad0 100644
--- a/gjs/src/time.ts
+++ b/core/gjs/src/time.ts
diff --git a/gjs/src/variable.ts b/core/gjs/src/variable.ts
index d583ab1..d583ab1 100644
--- a/gjs/src/variable.ts
+++ b/core/gjs/src/variable.ts
diff --git a/gjs/src/widgets.ts b/core/gjs/src/widgets.ts
index 82d4708..82d4708 100644
--- a/gjs/src/widgets.ts
+++ b/core/gjs/src/widgets.ts
diff --git a/gjs/tsconfig.json b/core/gjs/tsconfig.json
index b93779f..b93779f 100644
--- a/gjs/tsconfig.json
+++ b/core/gjs/tsconfig.json
diff --git a/lua/astal-dev-1.rockspec b/core/lua/astal-dev-1.rockspec
index 7f5ae95..7f5ae95 100644
--- a/lua/astal-dev-1.rockspec
+++ b/core/lua/astal-dev-1.rockspec
diff --git a/lua/astal/application.lua b/core/lua/astal/application.lua
index 663a457..663a457 100644
--- a/lua/astal/application.lua
+++ b/core/lua/astal/application.lua
diff --git a/lua/astal/binding.lua b/core/lua/astal/binding.lua
index 50509d1..50509d1 100644
--- a/lua/astal/binding.lua
+++ b/core/lua/astal/binding.lua
diff --git a/lua/astal/file.lua b/core/lua/astal/file.lua
index ca5a592..ca5a592 100644
--- a/lua/astal/file.lua
+++ b/core/lua/astal/file.lua
diff --git a/lua/astal/init.lua b/core/lua/astal/init.lua
index f56c3f5..f56c3f5 100644
--- a/lua/astal/init.lua
+++ b/core/lua/astal/init.lua
diff --git a/lua/astal/process.lua b/core/lua/astal/process.lua
index 3d10f8b..3d10f8b 100644
--- a/lua/astal/process.lua
+++ b/core/lua/astal/process.lua
diff --git a/lua/astal/time.lua b/core/lua/astal/time.lua
index f4e2b81..f4e2b81 100644
--- a/lua/astal/time.lua
+++ b/core/lua/astal/time.lua
diff --git a/lua/astal/variable.lua b/core/lua/astal/variable.lua
index 1e894b5..1e894b5 100644
--- a/lua/astal/variable.lua
+++ b/core/lua/astal/variable.lua
diff --git a/lua/astal/widget.lua b/core/lua/astal/widget.lua
index d2dadc6..d2dadc6 100644
--- a/lua/astal/widget.lua
+++ b/core/lua/astal/widget.lua
diff --git a/lua/stylua.toml b/core/lua/stylua.toml
index d4a4951..d4a4951 100644
--- a/lua/stylua.toml
+++ b/core/lua/stylua.toml
diff --git a/lua/test.lua b/core/lua/test.lua
index f5123a3..f5123a3 100644
--- a/lua/test.lua
+++ b/core/lua/test.lua
diff --git a/meson.build b/core/meson.build
index 4020a81..4020a81 100644
--- a/meson.build
+++ b/core/meson.build
diff --git a/meson_options.txt b/core/meson_options.txt
index a60ff42..a60ff42 100644
--- a/meson_options.txt
+++ b/core/meson_options.txt
diff --git a/src/astal.vala b/core/src/astal.vala
index 316da6b..316da6b 100644
--- a/src/astal.vala
+++ b/core/src/astal.vala
diff --git a/src/cli.vala b/core/src/cli.vala
index 0b60cd1..0b60cd1 100644
--- a/src/cli.vala
+++ b/core/src/cli.vala
diff --git a/src/config.vala.in b/core/src/config.vala.in
index 88bfe9c..88bfe9c 100644
--- a/src/config.vala.in
+++ b/core/src/config.vala.in
diff --git a/src/file.vala b/core/src/file.vala
index d8acccc..d8acccc 100644
--- a/src/file.vala
+++ b/core/src/file.vala
diff --git a/src/meson.build b/core/src/meson.build
index 0dac152..3e28d16 100644
--- a/src/meson.build
+++ b/core/src/meson.build
@@ -2,7 +2,6 @@ version_split = meson.project_version().split('.')
 api_version = version_split[0] + '.' + version_split[1]
 gir = 'Astal-' + api_version + '.gir'
 typelib = 'Astal-' + api_version + '.typelib'
-so = 'libastal.so.' + meson.project_version()
 
 config = configure_file(
   input: 'config.vala.in',
diff --git a/src/process.vala b/core/src/process.vala
index 073fe93..073fe93 100644
--- a/src/process.vala
+++ b/core/src/process.vala
diff --git a/src/time.vala b/core/src/time.vala
index 4034c04..4034c04 100644
--- a/src/time.vala
+++ b/core/src/time.vala
diff --git a/src/variable.vala b/core/src/variable.vala
index c7edb16..c7edb16 100644
--- a/src/variable.vala
+++ b/core/src/variable.vala
diff --git a/src/widget/box.vala b/core/src/widget/box.vala
index 39dee92..39dee92 100644
--- a/src/widget/box.vala
+++ b/core/src/widget/box.vala
diff --git a/src/widget/button.vala b/core/src/widget/button.vala
index 036bc8e..036bc8e 100644
--- a/src/widget/button.vala
+++ b/core/src/widget/button.vala
diff --git a/src/widget/centerbox.vala b/core/src/widget/centerbox.vala
index 0588828..0588828 100644
--- a/src/widget/centerbox.vala
+++ b/core/src/widget/centerbox.vala
diff --git a/src/widget/circularprogress.vala b/core/src/widget/circularprogress.vala
index 9cd3e26..9cd3e26 100644
--- a/src/widget/circularprogress.vala
+++ b/core/src/widget/circularprogress.vala
diff --git a/src/widget/eventbox.vala b/core/src/widget/eventbox.vala
index 6b715cc..6b715cc 100644
--- a/src/widget/eventbox.vala
+++ b/core/src/widget/eventbox.vala
diff --git a/src/widget/icon.vala b/core/src/widget/icon.vala
index ef43baf..ef43baf 100644
--- a/src/widget/icon.vala
+++ b/core/src/widget/icon.vala
diff --git a/src/widget/label.vala b/core/src/widget/label.vala
index 4063b6f..4063b6f 100644
--- a/src/widget/label.vala
+++ b/core/src/widget/label.vala
diff --git a/src/widget/levelbar.vala b/core/src/widget/levelbar.vala
index 1db2cc7..1db2cc7 100644
--- a/src/widget/levelbar.vala
+++ b/core/src/widget/levelbar.vala
diff --git a/src/widget/overlay.vala b/core/src/widget/overlay.vala
index 207aaa7..207aaa7 100644
--- a/src/widget/overlay.vala
+++ b/core/src/widget/overlay.vala
diff --git a/src/widget/scrollable.vala b/core/src/widget/scrollable.vala
index 1a0e081..1a0e081 100644
--- a/src/widget/scrollable.vala
+++ b/core/src/widget/scrollable.vala
diff --git a/src/widget/slider.vala b/core/src/widget/slider.vala
index 421b27a..421b27a 100644
--- a/src/widget/slider.vala
+++ b/core/src/widget/slider.vala
diff --git a/src/widget/widget.vala b/core/src/widget/widget.vala
index 2506bc8..2506bc8 100644
--- a/src/widget/widget.vala
+++ b/core/src/widget/widget.vala
diff --git a/src/widget/window.vala b/core/src/widget/window.vala
index 17dc76d..17dc76d 100644
--- a/src/widget/window.vala
+++ b/core/src/widget/window.vala
diff --git a/core/version b/core/version
new file mode 100644
index 0000000..6e8bf73
--- /dev/null
+++ b/core/version
@@ -0,0 +1 @@
+0.1.0
diff --git a/flake.nix b/flake.nix
index ffc8c70..d34c09d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,51 +9,45 @@
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system;};
 
-    nativeBuildInputs = with pkgs; [
-      wrapGAppsHook
-      gobject-introspection
-      meson
-      pkg-config
-      ninja
-      vala
-    ];
-
-    buildInputs = with pkgs; [
-      glib
-      gtk3
-      gtk-layer-shell
-    ];
-  in {
-    packages.${system} = rec {
-      default = astal;
-      astal = pkgs.stdenv.mkDerivation {
-        inherit nativeBuildInputs buildInputs;
-        pname = "astal";
+    lib = name: src: inputs:
+      pkgs.stdenv.mkDerivation {
+        nativeBuildInputs = with pkgs; [
+          wrapGAppsHook
+          gobject-introspection
+          meson
+          pkg-config
+          ninja
+          vala
+        ];
+        buildInputs = [pkgs.glib] ++ inputs;
+        pname = name;
         version = version;
-        src = ./.;
+        src = src;
         outputs = ["out" "dev"];
       };
+  in {
+    packages.${system} = rec {
+      default = astal;
+      astal = with pkgs; lib "astal" ./core [gtk3 gtk-layer-shell];
     };
 
     devShells.${system} = let
-      inputs = with pkgs;
-        buildInputs
-        ++ [
-          (lua.withPackages (ps: [ps.lgi]))
-          gjs
-        ];
+      inputs = with pkgs; [
+        wrapGAppsHook
+        gobject-introspection
+        meson
+        pkg-config
+        ninja
+        vala
+        (lua.withPackages (ps: [ps.lgi]))
+        gjs
+      ];
     in {
       default = pkgs.mkShell {
-        inherit nativeBuildInputs;
-        buildInputs = inputs;
+        inherit inputs;
       };
       astal = pkgs.mkShell {
-        inherit nativeBuildInputs;
-        buildInputs =
-          inputs
-          ++ [
-            self.packages.${system}.astal
-          ];
+        inputs = inputs ++ [self.packages.${system}.astal];
       };
     };
   };