Revamp nix flake #215

nixith · 2024-04-22T03:42:39Z

I decided to go with crane instead, it apparently has better caching capabilities. The check capabilities are nice as well if you ever want to add some stuff to gh actions, for example. If you ever add another cargo subprjoct or some random directory stuff it might need some extra work but it should mostly be fine. Happy to explain, at least at a high level, whatever is going on.

Also given how I did the commits it might be a good idea to just squash this down during the pull request, at least I think you can.

Currently this PR is waiting on #214, it works if you remove the Build.rs script locally.

…rth the complication

tests currently try and modify state, which is a big no go for nix. There's probably a way around it, I'd have to look into it though

not sure what this is

mostly adding libs to LD_LIBRARY_PATH

Ottatop · 2024-04-24T23:54:57Z

Alright this should be unblocked, if it's ready then rebase/merge with main and request a review

nixith · 2024-04-25T00:00:47Z

do we want to merge with the lua api complete or have that as a separate pull?

Ottatop · 2024-04-25T00:03:03Z

Probably best to do it in a different pull considering the hell you're going through trying to make that work lol

nixith · 2024-04-28T22:12:21Z

Alright, we now have functional nix builds! I think the metaconfig.toml writer needs to be fixed up, for now it just pulls from the user's directory, but it's completely functional otherwise. I have examples here in case anyone wants some.

Ottatop · 2024-04-29T16:32:11Z

Missed a slash omegalul

I'll try to review the parts I can figure out sometime this week, got a lot of stuff to do currently.

Ottatop · 2024-04-29T05:42:46Z

api/lua/examples/default/default_config.lua

@@ -13,7 +13,7 @@ require("pinnacle").setup(function(Pinnacle)
    ---@type Modifier
    local mod_key = "ctrl"

-    local terminal = "alacritty"
+    local terminal = "kitty"


I'm gonna need a very good reason why this has been changed to kitty because I like alacritty better and I will die on that hill

Ah, see, the reason is because I'm a creature of habit who forgot to remove that change before commiting. V easy remove lol. It also looks like I forgot to remove some other changes I made in that file for testing purposes.

Ottatop · 2024-05-01T17:49:41Z

justfile

@@ -73,7 +73,7 @@ install-protos-root:
    proto_dir="{{root_xdg_data_dir}}/protobuf"
    rm -rf "${proto_dir}"
    mkdir -p "{{root_xdg_data_dir}}"
-    cp -r "{{rootdir}}/api/protocol" "${proto_dir}"
+    cp -r "{{rootdir}}pinnacle-api-defs/protocol" "${proto_dir}"


Suggested change

cp -r "{{rootdir}}pinnacle-api-defs/protocol" "${proto_dir}"

cp -r "{{rootdir}}/pinnacle-api-defs/protocol" "${proto_dir}"

Also line 35 hasn't been updated

Ottatop · 2024-05-01T18:31:31Z

@LogicalOverflow Seeing as you're the other Nix person here, do you have anything to comment on regarding all this Nix stuff I'm not familiar with?

LogicalOverflow

(I didn't look much into the lua stuff, because I don't know lua)

Overall, I think most of the hard stuff is done, i.e building pinnacle and the config. Only how the two are merged together, and how the metaconfig.toml is handled throughout, to produce a pinnacle-with-config looks incomplete to me.

LogicalOverflow · 2024-05-02T07:09:14Z

flake.nix

@@ -1,42 +1,58 @@
 {
-  description =
-    "A WIP Smithay-based Wayland compositor, inspired by AwesomeWM and configured in Lua or Rust";
+  description = "Build a cargo workspace";


I assume this is a copy-paste error :)

LogicalOverflow · 2024-05-02T07:15:37Z

flake.nix

          runtimeDependencies = with pkgs; [
            wayland
            mesa
            libglvnd # libEGL
          ];

          LD_LIBRARY_PATH =
-            "${pkgs.wayland}/lib:${pkgs.libGL}/lib:${pkgs.libxkbcommon}/lib";
+            "${pkgs.wayland}/lib:${pkgs.libGL}/lib:${pkgs.libxkbcommon}/${pkgs.libglvnd}/lib:${pkgs.mesa.drivers}/lib";


${pkgs.libxkbcommon}/${pkgs.libglvnd}/lib should probably be ${pkgs.libxkbcommon}/lib:${pkgs.libglvnd}/lib

LogicalOverflow · 2024-05-02T07:22:26Z

flake.nix

+        devShells.default = craneLib.devShell {
+          # Inherit inputs from checks.
+          checks = self.checks.${system};
+
          runtimeDependencies = with pkgs; [


the wlcs wrapper script and cargo-outdated got lost along the way, I think

LogicalOverflow · 2024-05-02T07:36:37Z

flake.nix

+        lib = pinnacleLib;
+        packages = {
+          inherit pinnacle protobuffs;
+          inherit (pinnacleLib) pinnacleWithRust pinnacleWithLua;


Having these two functions directly in packages, breaks nix flake check, because that expects all the packages to be derivations. Maybe we can move them to pinnacle.withRust and pinnacle.withLua using passthru.

LogicalOverflow · 2024-05-02T07:38:06Z

flake.nix


    fenix = {
      url = "github:nix-community/fenix";
      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-analyzer-src.follows = "";


What does this do? (I've never seen a follows set to "")

LogicalOverflow · 2024-05-02T08:01:24Z

nix/lib/merge-pinnacle-config.nix

+  };
+  #provide a default  Toml, just in case. It may be more desireable to use
+
+  # NOTE: as of now I can't figure out a way to check if a file exists in another derivaion.


This is probably not really possible at the nix level, i.e. in nix code, but you can probably use some bash in the postBuild on the symlinkJoin to select the correct metaconfig.toml.

LogicalOverflow · 2024-05-02T08:03:08Z

nix/lib/merge-pinnacle-config.nix

+    pinnacle-unwrapped
+    pinnacle-config
+    protobuffs # protobuffs
+    #(manifestDerivation) # currently treated as a function rather than a derivation, should be fixable.


Currently, the passed manifest just isn't used. Also, symlinkJoin might just fails, if there is a collision between the joined derivations (which would be the case if both manifests are there).

LogicalOverflow · 2024-05-02T08:10:10Z

nix/lib/buildPinnacleRustConfig.nix

+    mkdir $out/bin
+    mv target/release/${pname} $out/bin/
+    mv metaconfig.toml $out/share/pinnacle/config/
+    ln $out/bin/${pname} $out/share/pinnacle/config/${pname};


I do find this structure in the derivation a bit weird, with the config being in both share/pinnacle/config/pinnacle-config and bin/pinnacle-config. I would expected only next to the metaconfig.toml.

nixith · 2024-05-02T12:01:17Z

Pinnacle-with-config is partially working. For now it manages to get them all in the same closure and set up protobuf stuff, the main issue is that I can't figure out how to write from the toml generator to where I want correctly. It probably needs to be out of the symlink and linked in with ln manually if I had to guess, for now it uses the metaconfig.toml at the root of the config build directory.

nixith · 2024-05-02T12:02:54Z

I think metaconfig.toml's nix attrset should probably be moved into it's own lib output, that way people can debug that on its own, get type hints, etc. when this is all done I think nix has official doc comments now, so I'll go through and add them to make poking around for people a little easier as needed.

KDanisme · 2024-07-14T18:10:02Z

Hi guys, any way I can help in this PR?
I really want to try out pinnacle, really like the concept.
@nixith If your busy I can pick off from where you left, or create a PR to your fork, LMK

nixith · 2024-07-14T18:55:31Z

Hi guys, any way I can help in this PR?
I really want to try out pinnacle, really like the concept.
@nixith If your busy I can pick off from where you left, or create a PR to your fork, LMK

Feel free to, I have been a little busy so the help is appreciated. If you also want to rework much of what I've done feel free. My solution relies on some wacky IFD that i've since learned is not great practice, but I really don't have a better way to conceive of this beyond having a directory to link to the configuration spot for Lia and 0 ideas on how to manage this without IFD for Rust. Thanks for pitching in!

KDanisme · 2024-07-14T20:07:34Z

Hi guys, any way I can help in this PR?
I really want to try out pinnacle, really like the concept.
@nixith If your busy I can pick off from where you left, or create a PR to your fork, LMK

Feel free to, I have been a little busy so the help is appreciated. If you also want to rework much of what I've done feel free. My solution relies on some wacky IFD that i've since learned is not great practice, but I really don't have a better way to conceive of this beyond having a directory to link to the configuration spot for Lia and 0 ideas on how to manage this without IFD for Rust. Thanks for pitching in!

Happy to help
Whenever you get the chance, I would love for a tldr on the issue you had here.
Im not really sure what exactly is the blocker here.
Tried going through the comments but couldn't really figure it out, especially with this being a new project and all.

nixith · 2024-07-14T20:30:27Z

Hi guys, any way I can help in this PR?
I really want to try out pinnacle, really like the concept.
@nixith If your busy I can pick off from where you left, or create a PR to your fork, LMK

Feel free to, I have been a little busy so the help is appreciated. If you also want to rework much of what I've done feel free. My solution relies on some wacky IFD that i've since learned is not great practice, but I really don't have a better way to conceive of this beyond having a directory to link to the configuration spot for Lia and 0 ideas on how to manage this without IFD for Rust. Thanks for pitching in!

Happy to help
Whenever you get the chance, I would love for a tldr on the issue you had here.
Im not really sure what exactly is the blocker here.
Tried going through the comments but couldn't really figure it out, especially with this being a new project and all.

The tl;Dr is we need to wait for the lua or rust derivation to build flake-side, then wait for the user's configuration derivation to build, then finish building their config in place. I've learned since building this that this is generally considered bad practice, but it works for now. I think it was mostly style stuff that I never got around to fixing.

nixith added 14 commits April 21, 2024 22:18

Setup functional flake from crane - will fix later with original flake

7502029

change back to original linux only

1d7c7e8

use fenix rust tool chain

79ddaa4

filter builds to allow resources and protobuffs

ae224bf

fix common configuration

26819f7

move to using the whole source - the tiny file size savings aren't wo…

818a758

…rth the complication

use inherited src instead of the filtered one

8ef577e

add other cargo projects in the workspace

02f07c3

use the same formatter as before

8889d07

fixup check names

915ed1e

disable tests - see comment

5bf3abb

tests currently try and modify state, which is a big no go for nix. There's probably a way around it, I'd have to look into it though

remove hakari

b21f39f

not sure what this is

fixup devshell

20f8441

mostly adding libs to LD_LIBRARY_PATH

formatting

37394b8

nixith mentioned this pull request Apr 22, 2024

Nix Packaging tracking issue #213

Open

8 tasks

This was referenced Apr 22, 2024

Embed default rust config in binary #216

Merged

Add justfile and nuke build.rs #219

Merged

nixith added 10 commits April 24, 2024 21:16

add lua api package

caf18fc

all of the lua config stuff

052dd15

pinnacle lua api

12ab52a

initialize lua config

a0cde88

drop api version for nixpkgs - need to discuss

6489ef4

adapt lua default config for testing

3155647

move to correct testing config

1a21071

move protocols to pinnacle-api-defs

8177ace

change protobuff location

9d5e1c8

move functions to lib

ecfa5f1

nixith and others added 8 commits April 28, 2024 16:57

change protobuff location

75c2290

fix path again

02d75f9

make rust config conform to the same style lua config does

de625e4

Merge branch 'pinnacle-comp:main' into main

5a0f8a6

run formatter

9ab2820

Merge branch 'config'

6ba90b6

update flake

c25fec7

fix lua example from testing value

a72ea51

update justfile to use new protocol location

66b6854

Ottatop requested changes May 1, 2024

View reviewed changes

LogicalOverflow reviewed May 2, 2024

View reviewed changes

Ottatop mentioned this pull request May 8, 2024

Tracking issue for v0.1 #142

Open

33 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revamp nix flake #215

Revamp nix flake #215

nixith commented Apr 22, 2024 •

edited

Loading

Ottatop commented Apr 24, 2024

nixith commented Apr 25, 2024

Ottatop commented Apr 25, 2024

nixith commented Apr 28, 2024

Ottatop commented Apr 29, 2024

Ottatop Apr 29, 2024

nixith May 1, 2024 •

edited

Loading

Ottatop May 1, 2024

Ottatop commented May 1, 2024

LogicalOverflow left a comment

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

LogicalOverflow May 2, 2024

nixith commented May 2, 2024

nixith commented May 2, 2024

KDanisme commented Jul 14, 2024

nixith commented Jul 14, 2024

KDanisme commented Jul 14, 2024 •

edited

Loading

nixith commented Jul 14, 2024

	cp -r "{{rootdir}}pinnacle-api-defs/protocol" "${proto_dir}"
	cp -r "{{rootdir}}/pinnacle-api-defs/protocol" "${proto_dir}"

Revamp nix flake #215

Are you sure you want to change the base?

Revamp nix flake #215

Conversation

nixith commented Apr 22, 2024 • edited Loading

Ottatop commented Apr 24, 2024

nixith commented Apr 25, 2024

Ottatop commented Apr 25, 2024

nixith commented Apr 28, 2024

Ottatop commented Apr 29, 2024

Choose a reason for hiding this comment

nixith May 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ottatop commented May 1, 2024

LogicalOverflow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nixith commented May 2, 2024

nixith commented May 2, 2024

KDanisme commented Jul 14, 2024

nixith commented Jul 14, 2024

KDanisme commented Jul 14, 2024 • edited Loading

nixith commented Jul 14, 2024

nixith commented Apr 22, 2024 •

edited

Loading

nixith May 1, 2024 •

edited

Loading

KDanisme commented Jul 14, 2024 •

edited

Loading