Skip to content

Commit 8a77ad7

Browse files
bors[bot]Pacman99Pacman99David Arnoldbb010g
authored
Merge #431
431: Make this repository digga r=Pacman99 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 [email protected]: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 <[email protected]> Co-authored-by: Pacman99 <[email protected]> Co-authored-by: David Arnold <[email protected]> Co-authored-by: Pacman99 <[email protected]> Co-authored-by: Dusk Banks <[email protected]> Co-authored-by: Pacman99 <[email protected]>
2 parents c7c11aa + a792cf9 commit 8a77ad7

File tree

128 files changed

+4190
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+4190
-760
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ Please search on the [issue tracker](../) before creating one.
3535

3636
## Your Environment
3737
<!--- Include relevant details about the environment you experienced the bug in. -->
38-
<!--- If you have run `bud update`, for example, post the flake.lock file. -->
38+
<!--- If you have run `flk update`, for example, post the flake.lock file. -->

.github/ISSUE_TEMPLATE/community_request.md

-22
This file was deleted.

.github/ISSUE_TEMPLATE/upstream_notice.md

-16
This file was deleted.

.github/workflows/check.yml

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,40 @@
11
name: "Check & Cachix"
2+
23
on:
34
push:
45
branches:
56
- main
67
- trying
78
- staging
9+
810
jobs:
911
check:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/[email protected]
13-
- uses: cachix/install-nix-action@v13
14+
- uses: actions/[email protected]
15+
with:
16+
submodules: true
17+
fetch-depth: 0
18+
- uses: cachix/install-nix-action@v16
1419
with:
15-
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install
1620
extra_nix_config: |
17-
experimental-features = nix-command flakes
1821
system-features = nixos-test benchmark big-parallel kvm recursive-nix
1922
substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org
2023
trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
24+
2125
- uses: cachix/cachix-action@v10
2226
with:
2327
name: nrdxp
2428
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
2529
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
26-
- run: nix -Lv flake check
27-
- run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
28-
- run: nix -Lv develop -c echo OK
29-
- run: nix -Lv develop --command bud --help
30+
31+
# Quick eval
32+
- run: nix develop --command evalnix
33+
34+
# Check the digga library
35+
- run: nix flake check --show-trace
36+
37+
# Check /examples/*
38+
- run: nix develop --command -- check-devos --show-trace
39+
- run: nix develop --command -- check-groupByConfig --show-trace
40+
- run: nix develop --command -- check-hmOnly --show-trace

.github/workflows/mdbook_docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
github_token: ${{ secrets.GITHUB_TOKEN }}
2525
publish_branch: gh-pages
2626
publish_dir: ./doc/book
27-
cname: devos.divnix.com
27+
cname: digga.divnix.com

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout code
2020
uses: actions/checkout@v2
2121
with:
22-
ref: main
22+
ref: master
2323
- name: Update Changelog
2424
uses: heinrichreimer/[email protected]
2525
with:
@@ -49,7 +49,7 @@ jobs:
4949
- name: Checkout code
5050
uses: actions/checkout@v2
5151
with:
52-
ref: main
52+
ref: master
5353

5454
- name: Get Changelog Entry
5555
id: changelog_reader

.gitignore

-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
11
result
22
.direnv
3-
doc/index.html
4-
5-
# Result of bud commands
6-
vm
7-
iso
8-
doi
9-
10-
pkgs/_sources/.shake*

CHANGELOG.md

+7-101
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,19 @@
11
# Changelog
22

3-
## [v0.10.0](https://github.com/divnix/devos/tree/v0.10.0) (2021-05-24)
3+
## [v0.2.0](https://github.com/divnix/digga/tree/v0.2.0) (2021-06-08)
44

55
**Implemented enhancements:**
66

7-
- Providing an interface to nixpkgs.config [\#237](https://github.com/divnix/devos/issues/237)
8-
- Making the user available in profiles [\#230](https://github.com/divnix/devos/issues/230)
9-
- copy evaluation store paths to iso [\#195](https://github.com/divnix/devos/issues/195)
10-
- Extract custom system builds from devosSystem out of lib [\#170](https://github.com/divnix/devos/issues/170)
11-
- Allow setting of channel host-wide [\#117](https://github.com/divnix/devos/issues/117)
12-
- alacritty: CSIu support [\#51](https://github.com/divnix/devos/issues/51)
7+
- Overlays / Imports and treatment of non-nix files [\#26](https://github.com/divnix/digga/issues/26)
8+
- NixOS Veteran Migration [\#25](https://github.com/divnix/digga/issues/25)
9+
- Add option of devshellOverlays for devshell [\#21](https://github.com/divnix/digga/issues/21)
10+
- Is it a right way to enable the deploy-rs multi-arch support [\#18](https://github.com/divnix/digga/issues/18)
1311

1412
**Fixed bugs:**
1513

16-
- Cachix timeouts + how to disable nrdxp cachix \(if needed\) [\#294](https://github.com/divnix/devos/issues/294)
17-
- default.nix flake-compat is broken [\#285](https://github.com/divnix/devos/issues/285)
18-
- All suites return "attribute missing" [\#282](https://github.com/divnix/devos/issues/282)
19-
- nix is built two times [\#203](https://github.com/divnix/devos/issues/203)
20-
- fix lib docs [\#166](https://github.com/divnix/devos/issues/166)
14+
- Can't override nixpkgs sub-systems with deprecated attributes [\#13](https://github.com/divnix/digga/issues/13)
2115

22-
**Closed issues:**
23-
24-
- eliminate userFlakeNixOS [\#257](https://github.com/divnix/devos/issues/257)
25-
- devos-as-library [\#214](https://github.com/divnix/devos/issues/214)
26-
27-
**Merged pull requests:**
28-
29-
- Update evalArgs to match the new planned API [\#239](https://github.com/divnix/devos/pull/239)
30-
31-
## [v0.9.0](https://github.com/divnix/devos/tree/v0.9.0) (2021-04-19)
32-
33-
**Implemented enhancements:**
34-
35-
- pin inputs into iso live registry [\#190](https://github.com/divnix/devos/issues/190)
36-
- Pass 'self' to lib [\#169](https://github.com/divnix/devos/issues/169)
37-
- doc: quickstart "ISO. What next?" [\#167](https://github.com/divnix/devos/issues/167)
38-
- Integrate Android AOSP putting mobile under control [\#149](https://github.com/divnix/devos/issues/149)
39-
- Inoculate host identity on first use [\#132](https://github.com/divnix/devos/issues/132)
40-
- kubenix support [\#130](https://github.com/divnix/devos/issues/130)
41-
- Improve Home Manager support: profiles/suites, modules, extern, flake outputs [\#119](https://github.com/divnix/devos/issues/119)
42-
- Local CA \(between hosts\) [\#104](https://github.com/divnix/devos/issues/104)
43-
- Q5: git annex for machine state [\#68](https://github.com/divnix/devos/issues/68)
44-
- name space ./pkgs overlays [\#60](https://github.com/divnix/devos/issues/60)
45-
- remap global keys easily [\#57](https://github.com/divnix/devos/issues/57)
46-
- make pass state part of this repo's structure [\#56](https://github.com/divnix/devos/issues/56)
47-
- Incorporate ./shells [\#38](https://github.com/divnix/devos/issues/38)
48-
- Encrypt with \(r\)age [\#37](https://github.com/divnix/devos/issues/37)
49-
50-
**Fixed bugs:**
51-
52-
- `pathsToImportedAttrs` does not accept directories [\#221](https://github.com/divnix/devos/issues/221)
53-
- Cachix caches aren't added to the configuration [\#208](https://github.com/divnix/devos/issues/208)
54-
- Issues with current changelog workflow [\#205](https://github.com/divnix/devos/issues/205)
55-
- iso: systemd service startup [\#194](https://github.com/divnix/devos/issues/194)
56-
- Help adding easy-hls-nix to devos [\#174](https://github.com/divnix/devos/issues/174)
57-
- `flk update` fails because of obsolete flag [\#159](https://github.com/divnix/devos/issues/159)
58-
- Expected that not all packages are exported? [\#151](https://github.com/divnix/devos/issues/151)
59-
- Segmentation fault when generating iso [\#150](https://github.com/divnix/devos/issues/150)
60-
61-
**Documentation:**
62-
63-
- doc: split iso [\#193](https://github.com/divnix/devos/issues/193)
64-
- lib: can depend on pkgs \(a la nixpkgs\#pkgs/pkgs-lib\) [\#147](https://github.com/divnix/devos/pull/147)
65-
66-
**Closed issues:**
67-
68-
- FRRouting router implementation [\#154](https://github.com/divnix/devos/issues/154)
69-
- ARM aarch64 Support [\#72](https://github.com/divnix/devos/issues/72)
70-
71-
## [v0.8.0](https://github.com/divnix/devos/tree/v0.8.0) (2021-03-02)
72-
73-
**Implemented enhancements:**
74-
75-
- semi automatic update for /pkgs [\#118](https://github.com/divnix/devos/issues/118)
76-
- Home-manager external modules from flakes [\#106](https://github.com/divnix/devos/issues/106)
77-
78-
**Fixed bugs:**
79-
80-
- My emacsGcc overlay is not working [\#146](https://github.com/divnix/devos/issues/146)
81-
- local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142)
82-
- nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138)
83-
- Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
84-
85-
## [0.7.0](https://github.com/divnix/devos/tree/0.7.0) (2021-02-20)
86-
87-
**Implemented enhancements:**
88-
89-
- add zoxide [\#53](https://github.com/divnix/devos/issues/53)
90-
- Multiarch support? [\#17](https://github.com/divnix/devos/issues/17)
91-
- initial multiArch support [\#18](https://github.com/divnix/devos/pull/18)
92-
93-
**Fixed bugs:**
94-
95-
- Missing shebang from flk.sh [\#131](https://github.com/divnix/devos/issues/131)
96-
- Rename Meta Issue [\#128](https://github.com/divnix/devos/issues/128)
97-
- specialisations break the `system` argument [\#46](https://github.com/divnix/devos/issues/46)
98-
- Revert "Add extraArgs to lib.nixosSystem call to add system args." [\#47](https://github.com/divnix/devos/pull/47)
99-
100-
**Documentation:**
101-
102-
- update home-manager urls [\#62](https://github.com/divnix/devos/pull/62)
103-
104-
**Closed issues:**
105-
106-
- add github action for cachix build ci [\#59](https://github.com/divnix/devos/issues/59)
107-
108-
## [12052020](https://github.com/divnix/devos/tree/12052020) (2020-12-06)
109-
110-
## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
16+
## [v0.1.0](https://github.com/divnix/digga/tree/v0.1.0) (2021-05-15)
11117

11218

11319

0 commit comments

Comments
 (0)