Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/cachix.yml.bak
#	.github/workflows/update-flake-lock.yml
  • Loading branch information
kaeeraa committed Aug 31, 2024
2 parents f1449e1 + 63efd32 commit 4a31467
Show file tree
Hide file tree
Showing 16 changed files with 1,477 additions and 182 deletions.
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: '0.kind: bug'
assignees: ''

---

### Describe the bug
A clear and concise description of what the bug is.

### Steps To Reproduce
Steps to reproduce the behavior:
1. ...
2. ...
3. ...

### Expected behavior
A clear and concise description of what you expected to happen.

### Screenshots
If applicable, add screenshots to help explain your problem.

### Additional context
Add any other context about the problem here.

### Metadata
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.

```console
[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
output here
```

---

Add a :+1: [reaction] to [issues you find important].

[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/kaeeraa/ayugram-desktop/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
File renamed without changes.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,5 @@ result-*

.idea
result
--help
--help
augram
4 changes: 2 additions & 2 deletions .run/Cachix.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cachix" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="cachix watch-exec kaeeraa -- nix-build . -v --max-jobs 16" />
<option name="SCRIPT_TEXT" value="cachix watch-exec kaeeraa -- nix-build . --cores 16 --max-jobs 16" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
Expand All @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/run/current-system/sw/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
Expand Down
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
# Ayugram desktop 🌐 NixOS flake

## ⚠️ This is the “master” branch, proceed to release branch if you need more stability

[![Cachix](https://github.com/kaeeraa/ayugram-desktop/actions/workflows/cachix.yml/badge.svg)](https://github.com/kaeeraa/ayugram-desktop/actions/workflows/cachix.yml)
[![wakatime](https://wakatime.com/badge/github/kaeeraa/ayugram-desktop.svg)](https://wakatime.com/badge/github/kaeeraa/ayugram-desktop)

## ☄️ Installation Instructions

### With nix profile (easiest way to install)
### With nix profile (the easiest way to install)

Use the following command:

```shell
$ nix profile install git+https://github.com/kaeeraa/ayugram-desktop/
$ nix profile install github+kaeeraa/ayugram-desktop/master
```

Answer at all questions `y`
Expand All @@ -20,7 +22,7 @@ Answer at all questions `y`
```nix
# flake.nix
{
inputs.ayugram-desktop.url = "git+https://github.com/kaeeraa/ayugram-desktop?submodules=1";
inputs.ayugram-desktop.url = "github:kaeeraa/ayugram-desktop/master?submodules=1";
outputs = { self, ayugram-desktop, ... }: {
# Use in your outputs
Expand All @@ -39,37 +41,35 @@ environment.systemPackages = with pkgs; [

## ⚡ Binary cache

### You can also use the binary cache, if you want to skip building.
### You can also use the binary cache if you want to skip building.

#### Auto using cache

Cache already built in this flake, you just need to trust it.

#### Manual using cache

First way to use the binary cache is use the cachix command:

```shell
$ cachix use kaeeraa
```

Second way to use the binary cache is set it directly in the configuration:
Set it directly in the configuration:

```nix
# configuration.nix
nix = {
settings = {
substituters = [
"https://kaeeraa.cachix.org"
"https://cache.garnix.io"
];
trusted-public-keys = [
"kaeeraa.cachix.org-1:S3CnhT12akYQf4Ph7fndLgqo2os4ket3OTP2amrzJRs="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
];
# other options...
};
};
```

Then after that make rebuild **WITHOUT** `inputs.ayugram-desktop.packages.${pkgs.system}.default` in your packages.

Now cache is ready to be used.

## 🪐 Thanks to shwewo

### Forked from [shwewo/ayugram-desktop](https://github.com/shwewo/ayugram-desktop) for [AyuGram/AyuGramDesktop](https://github.com/telegramdesktop/tdesktop)
Loading

0 comments on commit 4a31467

Please sign in to comment.