chore(nix): clean up

style(nix): apply nixfmt formatting

chore(nix): switch nixpkgs input to channel url

chore(nix): fix homepage url

chore(nix): use lib.cleanSource for source filtering

chore(nix): port devshell from #2584

chore(nix): derive version from lastModifiedDate and shortRev

Author: linusammon

flake.lock

@@ -2,45 +2,63 @@
   description = "Noctalia - A lightweight Wayland shell and bar";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
   };
 
-  outputs = { self, nixpkgs }:
+  outputs =
+    { self, nixpkgs }:
     let
       inherit (nixpkgs) lib;
+
       systems = [
         "x86_64-linux"
         "aarch64-linux"
       ];
-      forEachSystem = perSystem:
+
+      forEachSystem =
+        perSystem:
         lib.genAttrs systems (
-          system: let
+          system:
+          let
             pkgs = nixpkgs.legacyPackages.${system};
           in
-            perSystem { inherit pkgs system; }
+          perSystem { inherit pkgs system; }
         );
+
+      mkDate =
+        longDate:
+        nixpkgs.lib.concatStringsSep "-" [
+          (builtins.substring 0 4 longDate)
+          (builtins.substring 4 2 longDate)
+          (builtins.substring 6 2 longDate)
+        ];
+
+      version = mkDate (self.lastModifiedDate or "19700101") + "" + (self.shortRev or "dirty");
     in
     {
       overlays.default = final: prev: {
-        noctalia = final.callPackage ./nix/package.nix { };
+        noctalia = final.callPackage ./nix/package.nix { inherit version; };
       };
 
       packages = forEachSystem (
-        { pkgs, ... }: {
-          default = pkgs.callPackage ./nix/package.nix { };
+        { pkgs, ... }:
+        {
+          default = pkgs.callPackage ./nix/package.nix { inherit version; };
         }
       );
 
       devShells = forEachSystem (
-        { pkgs, system }: {
+        { pkgs, system }:
+        {
           default = pkgs.callPackage ./nix/devshell.nix {
             noctalia = self.packages.${system}.default;
           };
         }
       );
 
       apps = forEachSystem (
-        { pkgs, system }: {
+        { system, ... }:
+        {
           default = {
             type = "app";
             program = lib.getExe self.packages.${system}.default;

flake.nix

@@ -1,25 +1,29 @@
-{ pkgs, noctalia }:
-
+{
+  pkgs,
+  noctalia,
+}:
 pkgs.mkShell {
   inputsFrom = [ noctalia ];
-  
-  buildInputs = with pkgs; [
+
+  nativeBuildInputs = with pkgs; [
+    # Workflow & Hooks
     just
+    lefthook
+
+    # Formatting (required by justfile)
     clang-tools
+    gnugrep
+    gnused
+    findutils
+
+    # Debugging
     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"
+    # Point to local assets so binaries find resources without installation
+    export NOCTALIA_ASSETS_DIR="$PWD/assets"
+
+    echo " Noctalia dev-shell | 'just --list' to see available tasks"
   '';
 }

nix/devshell.nix

@@ -1,31 +1,33 @@
-{ 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
+{
+  lib,
+  stdenv,
+  version,
+  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";
+  inherit version;
 
-  src = ../.;
+  src = lib.cleanSource ../.;
 
   postPatch = ''
     # Remove -march=native and -mtune=native for reproducible builds
@@ -58,12 +60,12 @@ stdenv.mkDerivation {
   ];
 
   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";
+    homepage = "https://github.com/noctalia-dev/noctalia-shell";
     license = licenses.mit;
     platforms = platforms.linux;
     mainProgram = "noctalia";