Make this repository digga #431

Pacman99 · 2022-02-23T23:29:47Z

closes: #430

This is just some git hacking to preserve both project's commit histories.

Commands that I ran:

git remote add digga git@github.com:divnix/digga
git checkout -b digga-main digga/main
git checkout -b merge-digga upstream/main
mkdir ../devos
mv * .editorconfig .envrc .gitignore ../devos/
mkdir examples
mv ../devos examples/
git add . && git commit -m "tree: move everything into examples/devos"
git checkout digga-main
git rebase merge-digga # there were 3 merge conflicts with src/pkgs-lib/shell, not sure why but that file has been deleted so I just delt with them
git checkout merge-digga
git merge digga-main --ff-only
git push upstream merge-digga

There are a lot of changes, so it'll be easier to review what exactly I did with git to get it this way.

The only actual changes I personally made:

removed .gitmodules and downstream submodule
move devos into examples/devos
removed bud template from devos and added devos template to digga

This doesn't cover devos docs, I think we will need a separate effort to merge devos docs into digga docs. Probably as a digga usage section or something. For now devos docs are just sitting in examples/devos.

This PR should theoretically have the same amount of commits being added as the number of commits in digga itself. I think it ended up being around 50 less because bors commits aren't included for some reason.

simple copy of devos library code

license is a copy from devos

they are still pretty unstable and can fatally break systems

includes filterPackages improvements

following same logic as exporting packages, but don't filter out inputs

Importers are auxiliary functions of this library. It feels inconsistent when they have the same visibility of primary (builder) functions.

This means the functions output can be used as a module and imported in mkFlake arguments

This sets shorthandOnlyDefinesConfig to false by default. Which means those definitions can easily make use of the `imports` key. Without this, they would have to pass a function to the options.

fixes devshell since lib no longer includes nixosSystem

allows `imports` key to be set without setting option as a function

This will always work and doesn't rely on fup features

``` $ btrfs subvol show / >/dev/null; printf "%s\n" "$?" ERROR: Could not search B-tree: Operation not permitted 1 ``` Btrfs's `ioctl()` `BTRFS_IOC_TREE_SEARCH` requires elevation. `btrfs subvol show <path>` may be called by `nixos-generate-config`, and if `btrfs subvol show <path>` fails then `nixos-generate-config` fails. Fixes `flk up` failures due to the presence of Btrfs volumes.

includes api changes to fup

This reverts commit be058ad.

Pacman99 · 2022-02-23T23:39:13Z

bors try

bors · 2022-02-23T23:39:33Z

try

Build failed:

check

Pacman99 · 2022-02-23T23:47:12Z

bors try

bors · 2022-02-23T23:48:05Z

try

Build failed:

check

Pacman99 · 2022-02-23T23:49:35Z

bors try

bors · 2022-02-23T23:50:30Z

try

Build failed:

check

no need for submodules either

Pacman99 · 2022-02-24T00:08:21Z

bors try

bors · 2022-02-24T00:20:43Z

try

Build succeeded:

check

blaggacao · 2022-02-26T02:24:23Z

I can try tomorrow to do a git filter-repo merge of two unrelated histories whereby the devos history lands entirely in examples/devos, albeit all commits will be rewritten with the new subdir prefix.

Then, I can replay the manual changes that you did on top.

Pacman99 · 2022-02-26T02:52:52Z

I can try tomorrow to do a git filter-repo merge of two unrelated histories whereby the devos history lands entirely in examples/devos, albeit all commits will be rewritten with the new subdir prefix.

Then, I can replay the manual changes that you did on top.

I don't think that's a good idea because it would rewrite this repos git history which is never good for public branches. It would make sense if were merging devos into digga, but not when were doing it this way.

blaggacao · 2022-02-26T04:59:51Z

Ah! I see. I think I got lost first pass replaying your steps in my head. I then came under the impression commit history was lost, even if you explicitly stated otherwise. 🤷

blaggacao

Grandioso!

blaggacao · 2022-02-26T05:05:20Z

bors r+

In this case rather wake up with a unified Digga/DevOS.

Thank you!

431: Make this repository digga r=blaggacao a=Pacman99 closes: #430 This is just some git hacking to preserve both project's commit histories. Commands that I ran: ```sh git remote add digga git@github.com:divnix/digga git checkout -b digga-main digga/main git checkout -b merge-digga upstream/main mkdir ../devos mv * .editorconfig .envrc .gitignore ../devos/ mkdir examples mv ../devos examples/ git add . && git commit -m "tree: move everything into examples/devos" git checkout digga-main git rebase merge-digga # there were 3 merge conflicts with src/pkgs-lib/shell, not sure why but that file has been deleted so I just delt with them git checkout merge-digga git merge digga-main --ff-only git push upstream merge-digga ``` There are a lot of changes, so it'll be easier to review what exactly I did with git to get it this way. The only actual changes I personally made: - removed .gitmodules and downstream submodule - move devos into examples/devos - removed bud template from devos and added `devos` template to digga This doesn't cover devos docs, I think we will need a separate effort to merge devos docs into digga docs. Probably as a digga usage section or something. For now devos docs are just sitting in `examples/devos`. This PR should theoretically have the same amount of commits being added as the number of commits in digga itself. I think it ended up being around 50 less because bors commits aren't included for some reason. Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info> Co-authored-by: Pacman99 <pachum99@gmail.com> Co-authored-by: David Arnold <dar@xoe.solutions> Co-authored-by: Pacman99 <pachum99@myrdd.info> Co-authored-by: Dusk Banks <me@bb010g.com> Co-authored-by: Pacman99 <Pacman99@users.noreply.github.com>

bors · 2022-02-26T06:34:50Z

Timed out.

Pacman99 · 2022-02-26T07:16:56Z

bors r+

bors · 2022-02-26T07:23:13Z

Build succeeded:

check

Pacman99 and others added 30 commits February 23, 2022 15:21

tree: move everything into examples/devos

46fe746

init with devos lib extraction

9f0ecf6

simple copy of devos library code

add README and COPYING

6aa7234

license is a copy from devos

add gitignore and remove nix build result

03d67fd

remove content-addressed experimental features

c2248f8

they are still pretty unstable and can fatally break systems

flake: update flake-utils-plus input

f3d074b

includes filterPackages improvements

shell: ensure nix flakes for nixos-rebuild

44d5fa7

shell: add packages from overlays to devshell

14c8119

following same logic as exporting packages, but don't filter out inputs

imp: remove importer from top level lib exports

c4da361

Importers are auxiliary functions of this library. It feels inconsistent when they have the same visibility of primary (builder) functions.

shell: the custom nixos-rebuild will be auto-added

d5a1955

Move library code to src/ and cleanup folders

a489a95

Add doc for mkFlake and explain usage in README

fb2194a

check if home-manager input or output exists

0b59ee4

copy over .editorconfig from devos

a008220

importHosts: output under the hosts attribute

7921efd

This means the functions output can be used as a module and imported in mkFlake arguments

evalArgs: use submoduleWith for nixos/home options

e72f220

This sets shorthandOnlyDefinesConfig to false by default. Which means those definitions can easily make use of the `imports` key. Without this, they would have to pass a function to the options.

flake: use nixpkgs.lib for lib output

8c7da5e

shell: get nixosSystem from pkgs.input

e4424d7

fixes devshell since lib no longer includes nixosSystem

tree: rename devlib -> digga

d60e3b4

importers: dedicated importers for api arguments

6c724df

evalArgs: use submoduleWith for channels

5527237

allows `imports` key to be set without setting option as a function

shell: use eval-config.nix with pkgs.path

0c98c65

This will always work and doesn't rely on fup features

test mkFlake with a full flake similar to devos

0bbc1de

add github actions and bors configuration

6be60aa

README: fix links and add License section

b144f0b

add devshellModules option to customize devshell

9113d86

flake: update utils input

2796d59

includes api changes to fup

Update Changelog for tag

aa8bf26

Revert "shell: add packages from overlays to devshell"

8b77cd1

This reverts commit be058ad.

Pacman99 self-assigned this Feb 23, 2022

bors bot added a commit that referenced this pull request Feb 23, 2022

Try #431:

210a97d

Pacman99 force-pushed the merge-digga branch from a71396e to 1a1ff8e Compare February 23, 2022 23:47

bors bot added a commit that referenced this pull request Feb 23, 2022

Try #431:

256c4ba

Pacman99 force-pushed the merge-digga branch from 1a1ff8e to 2de583d Compare February 23, 2022 23:49

bors bot added a commit that referenced this pull request Feb 23, 2022

Try #431:

3024ed9

examples/downstream -> examples/devos

38b73dd

no need for submodules either

Pacman99 force-pushed the merge-digga branch from 2de583d to 38b73dd Compare February 24, 2022 00:08

bors bot added a commit that referenced this pull request Feb 24, 2022

Try #431:

acdcf41

export devos template in digga

a792cf9

blaggacao approved these changes Feb 26, 2022

View reviewed changes

bors bot merged commit 8a77ad7 into main Feb 26, 2022

bors bot deleted the merge-digga branch February 26, 2022 07:23

Pacman99 mentioned this pull request Mar 8, 2022

Fix onboarding process #442

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make this repository digga #431

Make this repository digga #431

Pacman99 commented Feb 23, 2022 •

edited

Loading

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

Pacman99 commented Feb 24, 2022

bors bot commented Feb 24, 2022

blaggacao commented Feb 26, 2022

Pacman99 commented Feb 26, 2022

blaggacao commented Feb 26, 2022 •

edited

Loading

blaggacao left a comment

blaggacao commented Feb 26, 2022

bors bot commented Feb 26, 2022

Pacman99 commented Feb 26, 2022

bors bot commented Feb 26, 2022

Make this repository digga #431

Make this repository digga #431

Conversation

Pacman99 commented Feb 23, 2022 • edited Loading

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

try

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

try

Pacman99 commented Feb 23, 2022

bors bot commented Feb 23, 2022

try

Pacman99 commented Feb 24, 2022

bors bot commented Feb 24, 2022

try

blaggacao commented Feb 26, 2022

Pacman99 commented Feb 26, 2022

blaggacao commented Feb 26, 2022 • edited Loading

blaggacao left a comment

Choose a reason for hiding this comment

blaggacao commented Feb 26, 2022

bors bot commented Feb 26, 2022

Pacman99 commented Feb 26, 2022

bors bot commented Feb 26, 2022

Pacman99 commented Feb 23, 2022 •

edited

Loading

blaggacao commented Feb 26, 2022 •

edited

Loading