Skip to content

Commit 94f80f7

Browse files
authored
Merge branch 'dev' into swaync_wallbash_alpha
2 parents ed4a6a5 + ff42edf commit 94f80f7

Some content is hidden

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

66 files changed

+3377
-1349
lines changed

.directory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[Desktop Entry]
2-
Icon=default-folder-github
2+
Icon=folder-github

CONTRIBUTING.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ Thank you for your interest in contributing to Community Standards! We welcome a
55
## Getting Started
66

77
1. Fork this repository to your GitHub account. This will create a copy of this repository in your account. You can make changes to this copy without affecting the original repository.
8+
89
- For fork this repository, click the **Fork** button in the top right corner of this page or click [here](https://github.com/HyDE-Project/HyDE/fork).
10+
11+
> **Note for first-time contributors:** All new contributors should start by submitting pull requests. After demonstrating consistent high-quality contributions through PRs, you may be considered for a collaborator role as described in [TEAM_ROLES.md](https://github.com/HyDE-Project/HyDE/blob/master/TEAM_ROLES.md). Direct repository access is granted selectively based on contribution history.
12+
913
2. Clone your forked repository to your local machine.
1014

1115
- Use the following command to clone your forked repository to your local machine.
@@ -39,11 +43,13 @@ Thank you for your interest in contributing to Community Standards! We welcome a
3943
```
4044

4145
6. Submit a **pull request** to the upstream repository.
46+
- **Important**: Always submit your pull requests to the `dev` branch, **not** directly to `master`. Following the [RELEASE_POLICY.md](https://github.com/HyDE-Project/HyDE/blob/master/RELEASE_POLICY.md), changes go through the dev branch first for testing before being merged into master during the release window.
4247
- For example, to create a pull request, use the following steps.
4348
1. Go to your forked repository.
4449
2. Click the **Compare & pull request** button next to your `your-branch-name` branch.
45-
3. Add a title and description for your pull request.
46-
4. Click **Create pull request** and remember to add the relevant labels with using the [pull request template](https://github.com/HyDE-Project/HyDE/blob/master/.github/PULL_REQUEST_TEMPLATE.md).
50+
3. Make sure the base repository branch is set to `dev`.
51+
4. Add a title and description for your pull request.
52+
5. Click **Create pull request** and remember to add the relevant labels with using the [pull request template](https://github.com/HyDE-Project/HyDE/blob/master/.github/PULL_REQUEST_TEMPLATE.md).
4753

4854
## Guidelines
4955

@@ -60,6 +66,8 @@ Thank you for your interest in contributing to Community Standards! We welcome a
6066
- [PULL_REQUEST_TEMPLATE.md](https://github.com/HyDE-Project/HyDE/blob/master/.github/PULL_REQUEST_TEMPLATE.md) - Use this template to submit a pull request.
6167
- [COMMIT_MESSAGE_GUIDELINES.md](https://github.com/HyDE-Project/HyDE/blob/master/COMMIT_MESSAGE_GUIDELINES.md) - Read this file to learn about the commit message guidelines.
6268
- [CONTRIBUTING.md](https://github.com/HyDE-Project/HyDE/blob/master/CONTRIBUTING.md) - Read this file to learn about the contributing guidelines.
69+
- [RELEASE_POLICY.md](https://github.com/HyDE-Project/HyDE/blob/master/RELEASE_POLICY.md) - Read this file to understand the release cycle, branch management, and deployment schedule.
70+
- [TEAM_ROLES.md](https://github.com/HyDE-Project/HyDE/blob/master/TEAM_ROLES.md) - Learn about the different roles in our project (Collaborators, Triagers, and Testers) and how to join.
6371
- [LICENSE](https://github.com/HyDE-Project/HyDE/blob/master/LICENSE) - Read this file to learn about the license.
6472
- [README.md](https://github.com/HyDE-Project/HyDE/blob/master/README.md) - Read this file to learn about the project.
6573

CONTRIBUTING_HYPRDOTS.md

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

CONTRIBUTORS.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Contributors
2+
3+
This file lists the contributors to the HyDE project and their roles.
4+
5+
## Project Maintainers
6+
7+
- [@kRHYME7](https://github.com/kRHYME7) - "[3]uck 🦆"
8+
9+
## Collaborators
10+
11+
_These contributors help with code review, triaging, and development._
12+
13+
- [@dieBakterie](https://github.com/dieBakterie)
14+
- [@richen604](https://github.com/richen604)
15+
- [@Senshi111](https://github.com/Senshi111)
16+
- [@T-Crypt](https://github.com/T-Crypt)
17+
- [@Guillaumecoi](https://github.com/Guillaumecoi)
18+
- [@rubiin](https://github.com/rubiin)
19+
20+
## Testers
21+
22+
_These contributors help with quality assurance and testing._
23+
24+
---
25+
26+
## How to add yourself to this list
27+
28+
1. Fork the repository
29+
2. Create a new branch for your change
30+
3. Add your name to the appropriate section in this format:
31+
```
32+
- [@your-github-username](https://github.com/your-github-username) - "Your favorite quote"
33+
```
34+
4. Submit a pull request with the title "Add [Your Name] as [Collaborator/Tester]"
35+
5. Include in the PR description your relevant experience and what you hope to contribute
36+
6. Wait for a maintainer to review and merge your PR
37+
38+
Note: New contributors should only add themselves to the Collaborators or Testers sections. Promotion to write access is determined by project maintainers based on the criteria in [TEAM_ROLES.md](https://github.com/HyDE-Project/HyDE/blob/master/TEAM_ROLES.md).

Configs/.config/fastfetch/config.jsonc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fastfetch --config hyde/*.jsonc
99
{
1010
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
1111
"logo": {
12-
"source": "$(fastfetch.sh logo)",
12+
"source": "\"$(fastfetch.sh logo)\"",
1313
"height": 18
1414
},
1515
"display": {
@@ -103,10 +103,11 @@ fastfetch --config hyde/*.jsonc
103103
"keyColor": "magenta"
104104
},
105105
{
106-
"type": "command",
106+
"type": "disk",
107107
"key": " 󱦟 OS Age ",
108+
"folders": "/",
108109
"keyColor": "red",
109-
"text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
110+
"format": "{days} days"
110111
},
111112
{
112113
"type": "uptime",
@@ -124,4 +125,4 @@ fastfetch --config hyde/*.jsonc
124125
},
125126
"break"
126127
]
127-
}
128+
}
Lines changed: 20 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,25 @@
1-
${cacheDir}/wallbash/discord.css|${WALLBASH_SCRIPTS}/discord.sh
1+
${XDG_CACHE_HOME}/hyde/wallbash/discord.css|${WALLBASH_SCRIPTS}/discord.sh
2+
@import url('https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css');
23

34
:root {
4-
--accent-color: #<wallbash_1xa1>;
5-
--border-color: #<wallbash_1xa3>;
6-
--background-1: #<wallbash_pry1>;
7-
--background-2: #<wallbash_1xa2>;
8-
--background-tertiary: #<wallbash_pry1>66;
9-
--background-mentioned: #<wallbash_2xa3> !important;
10-
--background-mentioned-hover: #<wallbash_2xa2> !important;
11-
--background-modifier-hover: #<wallbash_3xa4> !important;
12-
--background-modifier-active: #<wallbash_4xa4> !important;
13-
--text-normal: #<wallbash_txt1> !important;
14-
--text-positive: #<wallbash_3xa9> !important;
15-
--text-muted: #<wallbash_txt1>66 !important;
16-
--text-link: #<wallbash_pry4> !important;
17-
--channel-default: #<wallbash_txt1>99 !important;
18-
--button-background: #<wallbash_pry1> !important;
19-
--button-background-hover: #<wallbash_pry1> !important;
20-
--button-background-active: #<wallbash_pry1> !important;
21-
--button-accent: #<wallbash_pry1> !important;
22-
--button-accent-hover: #<wallbash_pry1> !important;
23-
--button-accent-active: #<wallbash_pry1> !important;
24-
--button-destructive: #<wallbash_pry1> !important;
25-
--button-destructive-hover: #<wallbash_pry1> !important;
26-
--button-destructive-active: #<wallbash_pry1> !important;
27-
--settings-icon-color: #<wallbash_pry1> !important;
28-
--tab-selected: #<wallbash_pry1> !important;
29-
--switch: #<wallbash_pry1> !important;
5+
--accentcolor: <wallbash_pry1_rgb>;
6+
--accentcolor2: <wallbash_pry2_rgb>;
7+
--linkcolor: <wallbash_txt2_rgb>;
8+
--mentioncolor: <wallbash_1xa5_rgb>;
9+
--textbrightest: <wallbash_txt1_rgb>;
10+
--textbrighter: <wallbash_txt2_rgb>;
11+
--textbright: <wallbash_1xa9_rgb>;
12+
--textdark: <wallbash_3xa9_rgb>;
13+
--textdarker: <wallbash_txt3_rgb>;
14+
--textdarkest: <wallbash_txt4_rgb>;
3015

31-
--background-primary: var(--background-1);
32-
--background-primary-alt: var(--background-1);
33-
--background-secondary: var(--background-tertiary);
34-
--background-secondary-alt: var(--background-tertiary);
35-
--background-accent-gradient: var(--background-1);
36-
--background-floating: var(--background-2);
37-
--background-modifier-selected: var(--accent-color);
38-
--background-modifier-accent: var(--border-color);
39-
--background-message-hover: transparent;
40-
--interactive-selected: var(--background-primary);
41-
--interactive-active: var(--text-positive);
42-
--interactive-normal: var(--text-normal);
43-
--interactive-muted: var(--text-muted);
44-
--channels-default: var(--channel-default);
45-
--header-primary: var(--text-normal);
46-
--header-secondary: var(--text-muted);
47-
--control-brand-foreground: var(--accent-color);
48-
--info-warning-foreground: var(--accent-color);
49-
--activity-card-background: var(--background-1);
50-
--brand-experiment: var(--accent-color) !important;
51-
--close-button-color: var(--accent-color);
52-
--maximize-button-color: var(--accent-color);
53-
--minimize-button-color: var(--accent-color);
54-
--scrollbar-color-alt: var(--accent-color);
55-
--scrollbar-thin-track: transparent;
56-
--scrollbar-auto-thumb: transparent;
57-
--scrollbar-auto-thumb-hover: var(--accent-color);
58-
--scrollbar-auto-track: transparent;
59-
--scrollbar-auto-scrollbar-color-thumb: var(--accent-color);
60-
--scrollbar-auto-scrollbar-color-track: transparent;
61-
--channeltextarea-background: var(--accent-color);
62-
--channeltextarea-background-hover: var(--background-tertiary);
63-
--avatar-roundess: 5px;
16+
--backgroundaccent: <wallbash_1xa5_rgb>;
17+
--backgroundprimary: <wallbash_2xa1_rgb>;
18+
--backgroundsecondary: <wallbash_pry1_rgb>;
19+
--backgroundsecondaryalt: <wallbash_pry1_rgb>;
20+
--backgroundtertiary: <wallbash_pry1_rgb>;
21+
--backgroundfloating: <wallbash_2xa1_rgb>;;
22+
--settingsicons: 1;
6423
}
6524

66-
.theme-dark {
67-
--background-primary: var(--background-1);
68-
--background-primary-alt: var(--background-1);
69-
--background-secondary: var(--background-tertiary);
70-
--background-secondary-alt: var(--background-tertiary);
71-
--background-floating: var(--background-2);
72-
--background-mentioned: var(--accent-color);
73-
--background-mentioned-hover: var(--scrollbar-auto-thumb);
74-
}
25+
/* Any custom CSS below here */

0 commit comments

Comments
 (0)