refactor: make its based on nix/

Author: rXelelo

flake.nix

@@ -21,83 +21,20 @@
         );
     in
     {
+      overlays.default = final: prev: {
+        noctalia = final.callPackage ./nix/package.nix { };
+      };
+
       packages = forEachSystem (
         { pkgs, ... }: {
-          default = pkgs.stdenv.mkDerivation {
-            pname = "noctalia";
-            version = "5.0.0";
-
-            src = ./.;
-
-            postPatch = ''
-            sed -i "s/'-march=native', '-mtune=native',//" meson.build
-            '';
-
-
-            nativeBuildInputs = with pkgs; [
-              meson
-              ninja
-              pkg-config
-              wayland-scanner
-            ];
-
-            buildInputs = with pkgs; [
-              wayland
-              wayland-protocols
-              libGL
-              libglvnd
-              freetype
-              fontconfig
-              cairo
-              pango
-              libxkbcommon
-              sdbus-cpp_2
-              systemd
-              pipewire
-              pam
-              curl
-              libwebp
-            ];
-
-            mesonBuildType = "release";
-            
-            ninjaFlags = [ "-v" ];
-
-            meta = with pkgs.lib; {
-              description = "A lightweight Wayland shell and bar built directly on Wayland + OpenGL ES";
-              homepage = "https://github.com/anomalyco/noctalia-shell";
-              license = licenses.mit;
-              platforms = platforms.linux;
-              mainProgram = "noctalia";
-            };
-          };
+          default = pkgs.callPackage ./nix/package.nix { };
         }
       );
 
       devShells = forEachSystem (
         { pkgs, system }: {
-          default = pkgs.mkShell {
-            inputsFrom = [ self.packages.${system}.default ];
-            
-            buildInputs = with pkgs; [
-              just
-              clang-tools
-              gdb
-            ];
-
-            shellHook = ''
-              echo "Noctalia development environment"
-              echo ""
-              echo "Available commands:"
-              echo "  just configure       - Configure debug build"
-              echo "  just build           - Build debug"
-              echo "  just run             - Run debug build"
-              echo "  just configure release - Configure release build"
-              echo "  just build release   - Build release"
-              echo "  just run release     - Run release build"
-              echo ""
-              echo "Note: Use 'just build' instead of 'nix build' due to sdbus-c++ API compatibility"
-            '';
+          default = pkgs.callPackage ./nix/devshell.nix {
+            noctalia = self.packages.${system}.default;
           };
         }
       );

nix/devshell.nix

@@ -0,0 +1,25 @@
+{ pkgs, noctalia }:
+
+pkgs.mkShell {
+  inputsFrom = [ noctalia ];
+  
+  buildInputs = with pkgs; [
+    just
+    clang-tools
+    gdb
+  ];
+
+  shellHook = ''
+    echo "Noctalia development environment"
+    echo ""
+    echo "Available commands:"
+    echo "  just configure       - Configure debug build"
+    echo "  just build           - Build debug"
+    echo "  just run             - Run debug build"
+    echo "  just configure release - Configure release build"
+    echo "  just build release   - Build release"
+    echo "  just run release     - Run release build"
+    echo ""
+    echo "Note: Use 'just build' instead of 'nix build' due to sdbus-c++ API compatibility"
+  '';
+}

nix/package.nix

@@ -0,0 +1,71 @@
+{ lib,
+ stdenv, 
+ meson, 
+ ninja, 
+ pkg-config,
+ wayland-scanner, 
+ wayland, 
+ wayland-protocols, 
+ libGL, 
+ libglvnd, 
+ freetype, 
+ fontconfig, 
+ cairo, 
+ pango, 
+ libxkbcommon, 
+ sdbus-cpp_2, 
+ systemd, 
+ pipewire, 
+ pam, 
+ curl, 
+ libwebp
+}:
+
+stdenv.mkDerivation {
+  pname = "noctalia";
+  version = "5.0.0";
+
+  src = ../.;
+
+  postPatch = ''
+    # Remove -march=native and -mtune=native for reproducible builds
+    sed -i "s/'-march=native', '-mtune=native',//" meson.build
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+    wayland-protocols
+    libGL
+    libglvnd
+    freetype
+    fontconfig
+    cairo
+    pango
+    libxkbcommon
+    sdbus-cpp_2
+    systemd
+    pipewire
+    pam
+    curl
+    libwebp
+  ];
+
+  mesonBuildType = "release";
+  
+  ninjaFlags = [ "-v" ];
+
+  meta = with lib; {
+    description = "A lightweight Wayland shell and bar built directly on Wayland + OpenGL ES";
+    homepage = "https://github.com/anomalyco/noctalia-shell";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    mainProgram = "noctalia";
+  };
+}