Skip to content

Commit e852c6a

Browse files
author
Nyx
authored
Merge branch 'main' into quotevariables
2 parents 3e48501 + 719548f commit e852c6a

Some content is hidden

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

50 files changed

+1519
-420
lines changed

.github/CONTRIBUTING.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,28 @@ cd linutil
4040
- **Make small, targeted PRs**: Focus on one feature or fix per pull request. This makes it easier to review and increases the likelihood of acceptance.
4141
- **Avoid combining unrelated changes**: PRs that tackle multiple unrelated issues are harder to review and might be rejected because of a single problem.
4242

43-
## 8. Code Review and Feedback
43+
## 8. Understand and Test the Code You Write
44+
45+
- **Review your code**: Before submitting your changes, take the time to review your code for readability, efficiency and performance. Consider how your changes affect the project.
46+
- **Avoid using LLMs**: Don't submit AI-generated code without reviewing and testing it first. Ensure that any code you submit is thoroughly understood and meets the project's standards.
47+
- **Testing Requirements**: Failure to conduct testing after multiple requests may result in the closure of your Pull Request.
48+
49+
## 9. Code Review and Feedback
4450

4551
- **Expect feedback**: PRs will undergo code review. Be open to feedback and willing to make adjustments as needed.
4652
- **Participate in reviews**: If you feel comfortable, review other contributors' PRs as well. Peer review is a great way to learn and ensure high-quality contributions.
4753

48-
## 9. Contributing Is More Than Just Code
54+
## 10. Contributing Is More Than Just Code
4955

5056
- **Test the tool**: Running tests and providing feedback on how the tool works in different environments is a valuable contribution.
5157
- **Write well-formed issues**: Clearly describe bugs or problems you encounter, providing as much detail as possible, including steps to reproduce the issue.
5258
- **Propose reasonable feature requests**: When suggesting new features, ensure they fit within the scope, style, and design of the project. Provide clear reasoning and use cases.
5359

54-
## 10. Documentation
60+
## 11. Documentation
5561

5662
- **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
5763

58-
## 11. License
64+
## 12. License
5965

6066
- **Agree to the license**: By contributing to Linutil, you agree that your contributions will be licensed under the project's MIT license.
6167

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ If applicable, add screenshots to help explain your problem.
2424

2525
## Additional context
2626
Add any other context about the problem here.
27+
28+
## Checklist
29+
- [ ] I checked for duplicate issues.
30+
- [ ] I checked already existing discussions.
31+
- [ ] This issue is not included in the roadmap.
32+
- [ ] This issue is present on both stable and development branches.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@ about: Suggest an idea for this project
44
title: ''
55
labels: 'enhancement'
66
assignees: ''
7-
87
---
98

10-
**Is your feature request related to a problem? Please describe.**
9+
## Is your feature request related to a problem? Please describe.
1110
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1211

13-
**Describe the solution you'd like**
12+
## Describe the solution you'd like
1413
A clear and concise description of what you want to happen.
1514

16-
**Describe alternatives you've considered**
15+
## Describe alternatives you've considered
1716
A clear and concise description of any alternative solutions or features you've considered.
1817

19-
**Additional context**
18+
## Additional context
2019
Add any other context or screenshots about the feature request here.
20+
21+
## Checklist
22+
- [ ] I checked for duplicate issues.
23+
- [ ] I checked already existing discussions.
24+
- [ ] This feature is not included in the roadmap.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Pull Request
2-
3-
## Title
4-
<!--[Provide a succinct and descriptive title for the pull request.]-->
1+
<!--
2+
Read Contributing Guidelines before opening a PR.
3+
https://github.com/ChrisTitusTech/linutil/blob/main/.github/CONTRIBUTING.md
4+
-->
55

66
## Type of Change
77
- [ ] New feature
88
- [ ] Bug fix
9-
- [ ] Documentation Update
9+
- [ ] Documentation update
1010
- [ ] Refactoring
1111
- [ ] Hotfix
1212
- [ ] Security patch
@@ -21,7 +21,7 @@
2121
## Impact
2222
<!--[Discuss the impact of your changes on the project. This might include effects on performance, new dependencies, or changes in behaviour.]-->
2323

24-
## Issue related to PR
24+
## Issues / other PRs related
2525
<!--[What issue/discussion is related to this PR (if any)]-->
2626
- Resolves #
2727

.github/workflows/bashisms.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check for bashisms
2+
3+
on:
4+
push:
5+
paths:
6+
- tabs/**
7+
branches: [ "main" ]
8+
pull_request:
9+
paths:
10+
- tabs/**
11+
merge_group:
12+
workflow_dispatch:
13+
14+
jobs:
15+
check-bashisms:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Install devscripts
22+
run: sudo apt install devscripts
23+
24+
- name: Concatenate all .sh files and check for bashisms
25+
working-directory: tabs
26+
run: |
27+
find . -name '*.sh' -exec checkbashisms {} + > all_scripts.sh

.github/workflows/pr-labels.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/rust.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Rust Checks
33
on:
44
pull_request:
55
branches: ["main"]
6+
paths:
7+
- '**/*.rs'
8+
- 'Cargo.toml'
9+
- 'Cargo.lock'
610

711
env:
812
CARGO_TERM_COLOR: always

start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh -e
22

33
rc='\033[0m'
44
red='\033[0;31m'

startdev.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh -e
22

33
RC='\033[0m'
44
RED='\033[0;31m'
@@ -35,7 +35,7 @@ check() {
3535
local message=$2
3636

3737
if [ $exit_code -ne 0 ]; then
38-
echo -e "${RED}ERROR: $message${RC}"
38+
printf "%b\n" "${RED}ERROR: $message${RC}"
3939
exit 1
4040
fi
4141
}

tabs/applications-setup/alacritty-setup.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@
22

33
. ../common-script.sh
44

5-
setupAlacritty() {
6-
echo "Install Alacritty if not already installed..."
5+
installAlacritty() {
6+
printf "%b\n" "${YELLOW}Installing Alacritty...${RC}"
77
if ! command_exists alacritty; then
8-
case ${PACKAGER} in
8+
case "$PACKAGER" in
99
pacman)
10-
"$ESCALATION_TOOL" ${PACKAGER} -S --needed --noconfirm alacritty
10+
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm alacritty
1111
;;
1212
*)
13-
"$ESCALATION_TOOL" ${PACKAGER} install -y alacritty
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y alacritty
1414
;;
1515
esac
1616
else
17-
echo "alacritty is already installed."
17+
printf "%b\n" "${GREEN}Alacritty is already installed.${RC}"
1818
fi
1919
}
2020

2121
setupAlacrittyConfig() {
22-
echo "Copy alacritty config files"
22+
printf "%b\n" "${YELLOW}Copy alacritty config files${RC}"
2323
if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
2424
cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
2525
fi
2626
mkdir -p "${HOME}/.config/alacritty/"
2727
curl -sSLo "${HOME}/.config/alacritty/alacritty.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/alacritty.toml"
2828
curl -sSLo "${HOME}/.config/alacritty/nordic.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/nordic.toml"
29+
printf "%b\n" "${GREEN}Alacritty configuration files copied.${RC}"
2930
}
3031

3132
checkEnv
3233
checkEscalationTool
33-
setupAlacritty
34+
installAlacritty
3435
setupAlacrittyConfig

0 commit comments

Comments
 (0)