-
-
Notifications
You must be signed in to change notification settings - Fork 644
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main'
- Loading branch information
Showing
134 changed files
with
9,056 additions
and
2,155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Consistent coding styles between different editors and IDEs | ||
| # editorconfig.org | ||
|
|
||
| root = true | ||
|
|
||
| [*] | ||
| end_of_line = lf | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| indent_style = space | ||
| indent_size = 4 | ||
|
|
||
| [*.md] | ||
| # double whitespace at end of line | ||
| # denotes a line break in Markdown | ||
| trim_trailing_whitespace = false | ||
|
|
||
| [*.yml] | ||
| indent_size = 2 | ||
|
|
||
| # Ignore diffs/patches | ||
| [*.{diff,patch}] | ||
| end_of_line = unset | ||
| insert_final_newline = unset | ||
| trim_trailing_whitespace = unset | ||
|
|
||
|
|
||
| # Ignore generated files | ||
| [*.lock] | ||
| indent_size = unset |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| use flake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # These are supported funding model platforms | ||
|
|
||
| github: [imsnif] | ||
| patreon: # Replace with a single Patreon username | ||
| open_collective: # Replace with a single Open Collective username | ||
| ko_fi: # Replace with a single Ko-fi username | ||
| tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel | ||
| community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry | ||
| liberapay: # Replace with a single Liberapay username | ||
| issuehunt: # Replace with a single IssueHunt username | ||
| otechie: # Replace with a single Otechie username | ||
| lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry | ||
| custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| name: nix | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| check: | ||
| runs-on: ubuntu-latest | ||
| name: "nix check" | ||
| environment: cachix | ||
| timeout-minutes: 5 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| # Nix Flakes doesn't work on shallow clones | ||
| fetch-depth: 0 | ||
| - uses: cachix/install-nix-action@v16 | ||
| with: | ||
| extra_nix_config: | | ||
| experimental-features = nix-command flakes | ||
| fetch-depth: 0 | ||
| - uses: cachix/cachix-action@v10 | ||
| with: | ||
| name: zellij | ||
| # If you chose API tokens for write access OR if you have a private cache | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
| - run: nix develop .#fmtShell --command treefmt --fail-on-change | ||
| ## nix flake check still fails on IFD | ||
| #- run: nix flake check --print-build-logs --show-trace | ||
|
|
||
| build: | ||
| runs-on: ubuntu-latest | ||
| name: "nix build" | ||
| environment: cachix | ||
| timeout-minutes: 25 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| # Nix Flakes doesn't work on shallow clones | ||
| fetch-depth: 0 | ||
| - uses: cachix/install-nix-action@v16 | ||
| with: | ||
| extra_nix_config: | | ||
| experimental-features = nix-command flakes | ||
| fetch-depth: 0 | ||
| - uses: cachix/cachix-action@v10 | ||
| with: | ||
| name: zellij | ||
| # If you chose API tokens for write access OR if you have a private cache | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
| - run: nix build | ||
| develop: | ||
| runs-on: ubuntu-latest | ||
| name: "nix develop" | ||
| environment: cachix | ||
| timeout-minutes: 10 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| # Nix Flakes doesn't work on shallow clones | ||
| fetch-depth: 0 | ||
| - uses: cachix/install-nix-action@v16 | ||
| with: | ||
| extra_nix_config: | | ||
| experimental-features = nix-command flakes | ||
| fetch-depth: 0 | ||
| - uses: cachix/cachix-action@v10 | ||
| with: | ||
| name: zellij | ||
| # If you chose API tokens for write access OR if you have a private cache | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
| - run: nix develop --profile devShell |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: update-flake-lock | ||
| on: | ||
| workflow_dispatch: # allows manual triggering | ||
| schedule: | ||
| - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00 | ||
|
|
||
| jobs: | ||
| lockfile: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v16 | ||
| with: | ||
| extra_nix_config: | | ||
| access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
| - name: Update flake.lock | ||
| uses: DeterminateSystems/update-flake-lock@v8 | ||
| with: | ||
| pr-labels: | | ||
| dependencies | ||
| nix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,5 +2,10 @@ target/ | |
| *.new | ||
| .vscode | ||
| .vim | ||
| .DS_Store | ||
| .DS_Store | ||
| /assets/man/zellij.1 | ||
|
|
||
| # nix | ||
| .direnv/ | ||
| result | ||
| result-* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.