Merge branch 'changes'

configs/common.nix

@@ -124,27 +124,6 @@
     pulse.enable = true;
   };
 
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    curlFull
-    gnutls
-    libxrandr
-    alsa-lib
-    freetype
-    avahi
-    libglvnd
-    curl
-    SDL2
-    hidapi
-    libpulseaudio
-    lz4
-    openssl
-    libcap
-    libxcrypt
-    libgcrypt
-    libbsd
-  ];
-
   # Local User
   users.users.user01 = {
     isNormalUser = true;
@@ -193,10 +172,9 @@
         cava
         cmatrix
         swaynotificationcenter
-        # (input {
+        (input {
-        #   package = "chataigne";
+          package = "chataigne";
-        #   output = "chataigne";
+        })
-        # })
         wlogout
         wpaperd
         kando

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771610171,
+        "lastModified": 1772292445,
-        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
+        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
+        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
         "type": "github"
       },
       "original": {
@@ -35,8 +35,7 @@
     },
     "chataigne": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "pinned-nixpkgs": "pinned-nixpkgs"
       },
       "locked": {
         "path": "./modules/chataigne",
@@ -166,11 +165,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1772000104,
+        "lastModified": 1773279064,
-        "narHash": "sha256-PKMU7+iiuNf8dacbkIG+OaABs5WomdnHf0uVmUDm/eQ=",
+        "narHash": "sha256-BLcSfp2aNm+0oDoHbvTufBRS2XwKqbIeUOXD8t58efE=",
         "owner": "Mjoyufull",
         "repo": "fsel",
-        "rev": "e9da4e371997ee8479553433a5bb0b7da3df789a",
+        "rev": "7b38c6223eed6e509f98e066ff89f481bd1930d7",
         "type": "github"
       },
       "original": {
@@ -297,11 +296,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772215399,
+        "lastModified": 1773316626,
-        "narHash": "sha256-iD/OJ5f7cyYluA0aQgTPTYuY0l12oF/mowyzcR8IQOY=",
+        "narHash": "sha256-BrDGYt2w2tSkCvjMtgcVGIAp3FWsV5Ycl4ongLZ/fLk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "0002f148c9a4fe421a9d33c0faa5528cdc411e62",
+        "rev": "e8684034525829d58054c32da914d1713398fbb8",
         "type": "github"
       },
       "original": {
@@ -578,16 +577,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1773222311,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -689,11 +688,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1772198003,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
         "type": "github"
       },
       "original": {
@@ -705,11 +704,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1771043024,
+        "lastModified": 1773222311,
-        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
         "type": "github"
       },
       "original": {
@@ -753,11 +752,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1769170682,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {
@@ -805,23 +804,6 @@
         "type": "github"
       }
     },
-    "pinned-nixpkgs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708756934,
-        "narHash": "sha256-WqpheJblJ901Svd5NmLJYLmZ3f4fYLkSOyx9i06+un0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -832,11 +814,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771858127,
+        "lastModified": 1772024342,
-        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
         "type": "github"
       },
       "original": {
@@ -903,11 +885,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1769361037,
+        "lastModified": 1773139650,
-        "narHash": "sha256-dWnjQpGNKEwIMPNoUp765q2QlVRCX58KbNm0ZBrTL80=",
+        "narHash": "sha256-lTzwHjwgzXpV0loeMShR6a/bhx6uJq+cM61av6rLF/A=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "6aae05be2fa2f8d5f1c5906658a3d41ad30d6352",
+        "rev": "d85028aef70128a17d26afb1f2af27d1375355c9",
         "type": "github"
       },
       "original": {
@@ -1019,11 +1001,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1770861617,
+        "lastModified": 1773029731,
-        "narHash": "sha256-og1aBdwHGVqgxzsvL7jrOekIY+9/g+Q33MoF4540Lv0=",
+        "narHash": "sha256-hyJUYQb51mQ9tozxMkMUNiJaeErjo+2codRSquvKuNY=",
         "owner": "way-edges",
         "repo": "way-edges",
-        "rev": "0376c84a2f698aa5e9600ed7566d64311361ff0a",
+        "rev": "dfcbee00286c57735db3b5786cfbc4f1d587503a",
         "type": "github"
       },
       "original": {

modules/chataigne/flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773122722,
+        "lastModified": 1773222311,
-        "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }

modules/chataigne/flake.nix

@@ -1,49 +1,82 @@
 {
-  description = "A flake to run a specific AppImage with custom dependencies";
+  description = "Local wrapper for Chataigne AppImage";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
   outputs =
     { self, nixpkgs }:
     let
-      system = "x86_64-linux"; # Adjust if you're on a different architecture
+      system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
 
-      # Define your AppImage wrapper here
+      # The libraries you requested
-      myApp = pkgs.appimageTools.wrapType2 {
+      deps = with pkgs; [
-        pname = "my-appimage-app";
+        curlFull
-        version = "1.0.0";
-
-        # The source can be a local file or a URL
-        src = ./Chataigne-linux-x64-1.10.3.AppImage;
-
-        # Add specific dependencies the AppImage is missing
-        extraPkgs =
-          pkgs: with pkgs; [
-            lz4
-            libbsd
-            (curlWithGnuTls.override { gnutlsSupport = true; })
         gnutls
-            libgnurl
+        libxrandr
+        alsa-lib
+        freetype
+        avahi
+        libglvnd
+        curl
+        SDL2
+        hidapi
+        libpulseaudio
+        lz4
         openssl
+        libcap
+        libxcrypt
+        libgcrypt
+        libbsd
+        zlib
+        glib
+      ];
+
+      # Wrap the local AppImage file
+      chataigne-bin = pkgs.appimageTools.wrapType2 {
+        pname = "chataigne";
+        version = "1.10.3";
+        # This points to the file in the same directory as flake.nix
+        src = ./Chataigne-linux-x64-1.10.3.AppImage;
+        extraPkgs = pkgs: deps;
+      };
+
+      # Create the Desktop Entry
+      chataigne-desktop = pkgs.makeDesktopItem {
+        name = "chataigne";
+        exec = "chataigne";
+        icon = "chataigne";
+        comment = "Modular machine for art and technology";
+        desktopName = "Chataigne";
+        categories = [
+          "AudioVideo"
+          "Development"
         ];
       };
     in
     {
-      # This allows you to run it via 'nix run'
+      # packages.${system}.default = chataigne-bin;
-      apps.${system}.default = {
-        type = "app";
-        program = "${myApp}/bin/my-appimage-app";
-      };
 
-      # This allows you to add it to your shell via 'nix develop'
       devShells.${system}.default = pkgs.mkShell {
-        buildInputs = [ myApp ];
+        # Packages you want available in your shell
-      };
+        buildInputs = [
+          chataigne-bin
+        ];
 
-      # The package itself
+        # Environmental variables or shell hooks
-      packages.${system}.default = myApp;
+        shellHook = ''
+          echo "something"
+        '';
+      };
+      # This allows you to run 'nix run' or install it via system config
+      packages.${system}.default = pkgs.symlinkJoin {
+        name = "chataigne";
+        paths = [
+          chataigne-bin
+          chataigne-desktop
+        ];
+      };
     };
 }