Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ca7a254a45 | |||
| b887dcf9a2 | |||
| 752c69d313 | |||
| 3cdef5f330 | |||
| 515519d8e3 | |||
| 2f77549285 | |||
| 4aa6aa5f1c | |||
| 3bd14b4479 | |||
| 51b9d97cd1 | |||
| f5646aa790 | |||
| d74ff3fb05 | |||
| 5bfb471047 | |||
| 5e21664124 | |||
| 6f4e3d6444 | |||
| 6efa23d145 | |||
| 2ebdafd916 | |||
| 0a625747e5 | |||
| 38ee805597 | |||
| a6d9984871 | |||
| e0b3b8e35c | |||
| 71a7e9e349 | |||
| 1117fe32e7 | |||
| 1e226ddeb6 | |||
| 4551e5134e | |||
| ead8ff2afd | |||
| e4b4fbd13a | |||
| c176a082c8 | |||
| c14a95e58e | |||
| b917372b8a | |||
| 2568471aa6 | |||
| 896247d7ba | |||
| c401dde8d5 | |||
| c29451d38a | |||
| 3f2e3d99e5 | |||
| b419bf6cf3 | |||
| 314fa8cd0e | |||
| 0d2877a861 | |||
| 12a851aa57 | |||
| f2e785fa8f | |||
| 1d1afe1a43 | |||
| b1b3f324d9 | |||
| 0656efb6aa | |||
| b41148f4a5 |
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
: "${BRANCH:?BRANCH is required}"
|
||||
: "${FILE:?FILE is required}"
|
||||
: "${COMMIT_MESSAGE:?COMMIT_MESSAGE is required}"
|
||||
|
||||
git config user.name "gitea actions"
|
||||
git config user.email "actions@localhost"
|
||||
|
||||
git checkout -B "$BRANCH"
|
||||
git add "$FILE"
|
||||
|
||||
if git diff --cached --quiet; then
|
||||
echo "No staged changes for ${FILE}; skipping commit"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git commit -m "$COMMIT_MESSAGE"
|
||||
git push --force origin "$BRANCH"
|
||||
@@ -1,48 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
: "${GITEA_API:?GITEA_API is required}"
|
||||
: "${GITEA_TOKEN:?GITEA_TOKEN is required}"
|
||||
: "${BRANCH:?BRANCH is required}"
|
||||
: "${TITLE:?TITLE is required}"
|
||||
: "${BODY:?BODY is required}"
|
||||
|
||||
owner_prefix="${HEAD_OWNER_PREFIX:-thomas}"
|
||||
|
||||
existing=$(curl -fsS \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"${GITEA_API}/pulls?state=open" \
|
||||
| python -c 'import json,sys,os; d=json.load(sys.stdin); b=os.environ["BRANCH"]; print(next((str(pr["number"]) for pr in d if isinstance(pr,dict) and pr.get("head",{}).get("ref")==b), ""))')
|
||||
|
||||
if [ -n "$existing" ]; then
|
||||
echo "PR already exists: #$existing"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Creating PR..."
|
||||
created="false"
|
||||
for head in "${BRANCH}" "${owner_prefix}:${BRANCH}"; do
|
||||
echo "Trying head=${head}"
|
||||
payload=$(HEAD_REF="$head" TITLE="$TITLE" BODY="$BODY" python -c 'import json,os; print(json.dumps({"title": os.environ["TITLE"], "head": os.environ["HEAD_REF"], "base": "main", "body": os.environ["BODY"]}))')
|
||||
response=$(curl -sS -w '\n%{http_code}' -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${GITEA_API}/pulls" \
|
||||
-d "$payload")
|
||||
|
||||
body=$(printf '%s\n' "$response" | sed '$d')
|
||||
code=$(printf '%s\n' "$response" | tail -n1)
|
||||
|
||||
echo "Create PR status: $code"
|
||||
echo "$body"
|
||||
|
||||
if [ "$code" -ge 200 ] && [ "$code" -lt 300 ]; then
|
||||
created="true"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$created" != "true" ]; then
|
||||
echo "PR creation failed"
|
||||
exit 1
|
||||
fi
|
||||
@@ -1,243 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
: "${FILE:?FILE is required}"
|
||||
: "${LATEST_RELEASE_URL:?LATEST_RELEASE_URL is required}"
|
||||
: "${DOWNLOAD_URL_TEMPLATE:?DOWNLOAD_URL_TEMPLATE is required}"
|
||||
: "${RELEASE_API_REPO:?RELEASE_API_REPO is required}"
|
||||
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
PYTHON_BIN=python
|
||||
elif command -v python3 >/dev/null 2>&1; then
|
||||
PYTHON_BIN=python3
|
||||
else
|
||||
echo "python is required but was not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
version_strip_prefix="${LATEST_VERSION_STRIP_PREFIX:-v}"
|
||||
release_tag_template="${RELEASE_TAG_TEMPLATE:-{version}}"
|
||||
release_tag_template="${release_tag_template//$'\r'/}"
|
||||
|
||||
current_version=$($PYTHON_BIN - <<'PY'
|
||||
import re
|
||||
import os
|
||||
p=os.environ["FILE"]
|
||||
s=open(p).read()
|
||||
m=re.search(r'version\s*=\s*"([^"]+)";', s)
|
||||
print(m.group(1) if m else "")
|
||||
PY
|
||||
)
|
||||
|
||||
latest_version=$(curl -fsSLI -o /dev/null -w '%{url_effective}' "$LATEST_RELEASE_URL" \
|
||||
| sed -E 's#.*/##')
|
||||
|
||||
if [ -n "$version_strip_prefix" ]; then
|
||||
latest_version="${latest_version#${version_strip_prefix}}"
|
||||
fi
|
||||
|
||||
echo "current=$current_version"
|
||||
echo "latest=$latest_version"
|
||||
|
||||
if [ -z "$latest_version" ] || [ "$latest_version" = "$current_version" ]; then
|
||||
echo "updated=false" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
download_url="${DOWNLOAD_URL_TEMPLATE//\{version\}/$latest_version}"
|
||||
new_hash=$(nix store prefetch-file --json "$download_url" | "$PYTHON_BIN" -c 'import json,sys; print(json.load(sys.stdin)["hash"])')
|
||||
|
||||
export LATEST_VERSION="$latest_version"
|
||||
export NEW_HASH="$new_hash"
|
||||
|
||||
"$PYTHON_BIN" - <<'PY'
|
||||
import os
|
||||
import re
|
||||
p=os.environ["FILE"]
|
||||
s=open(p).read()
|
||||
s=re.sub(r'version\s*=\s*"[^"]+"', f'version = "{os.environ["LATEST_VERSION"]}"', s, count=1)
|
||||
s=re.sub(r'hash\s*=\s*"[^"]+"', f'hash = "{os.environ["NEW_HASH"]}"', s, count=1)
|
||||
open(p,"w").write(s)
|
||||
PY
|
||||
|
||||
echo "updated=true" >> "$GITHUB_OUTPUT"
|
||||
echo "version=$latest_version" >> "$GITHUB_OUTPUT"
|
||||
echo "previous_version=$current_version" >> "$GITHUB_OUTPUT"
|
||||
|
||||
release_tag="${release_tag_template//\{version\}/$latest_version}"
|
||||
release_tag="${release_tag#\{}"
|
||||
release_tag="${release_tag%\}}"
|
||||
release_tag="${release_tag#\'}"
|
||||
release_tag="${release_tag%\'}"
|
||||
|
||||
release_url="${LATEST_RELEASE_URL%/latest}/tag/${release_tag}"
|
||||
release_html=$(curl -fsSL "$release_url" || true)
|
||||
|
||||
release_notes=""
|
||||
if [ -n "$release_html" ]; then
|
||||
release_notes=$(printf '%s' "$release_html" | "$PYTHON_BIN" -c '
|
||||
import re
|
||||
import sys
|
||||
from html.parser import HTMLParser
|
||||
|
||||
html = sys.stdin.read()
|
||||
|
||||
m = re.search(r"<div[^>]*data-test-selector=\"body-content\"[^>]*class=\"[^\"]*markdown-body[^\"]*\"[^>]*>(.*?)</div>", html, re.S)
|
||||
if not m:
|
||||
print("")
|
||||
raise SystemExit(0)
|
||||
|
||||
fragment = m.group(1)
|
||||
|
||||
class MdExtractor(HTMLParser):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.out = []
|
||||
self.list_depth = 0
|
||||
self.in_pre = False
|
||||
self.in_code_inline = False
|
||||
self.link_stack = []
|
||||
|
||||
def _append(self, text):
|
||||
self.out.append(text)
|
||||
|
||||
def _ensure_newline(self):
|
||||
if not self.out:
|
||||
return
|
||||
if not self.out[-1].endswith("\n"):
|
||||
self.out.append("\n")
|
||||
|
||||
def _ensure_blank_line(self):
|
||||
if not self.out:
|
||||
return
|
||||
joined = "".join(self.out)
|
||||
if joined.endswith("\n\n"):
|
||||
return
|
||||
if joined.endswith("\n"):
|
||||
self.out.append("\n")
|
||||
else:
|
||||
self.out.append("\n\n")
|
||||
|
||||
def handle_starttag(self, tag, attrs):
|
||||
attrs_d = dict(attrs)
|
||||
|
||||
if tag in ("h1", "h2", "h3", "h4", "h5", "h6"):
|
||||
self._ensure_blank_line()
|
||||
level = int(tag[1])
|
||||
self._append("#" * level + " ")
|
||||
return
|
||||
|
||||
if tag in ("p", "div"):
|
||||
self._ensure_blank_line()
|
||||
return
|
||||
|
||||
if tag in ("ul", "ol"):
|
||||
self._ensure_blank_line()
|
||||
self.list_depth += 1
|
||||
return
|
||||
|
||||
if tag == "li":
|
||||
self._ensure_newline()
|
||||
indent = " " * max(self.list_depth - 1, 0)
|
||||
self._append(f"{indent}- ")
|
||||
return
|
||||
|
||||
if tag == "br":
|
||||
self._append("\n")
|
||||
return
|
||||
|
||||
if tag == "pre":
|
||||
self._ensure_blank_line()
|
||||
self._append("```\n")
|
||||
self.in_pre = True
|
||||
return
|
||||
|
||||
if tag == "code":
|
||||
if not self.in_pre:
|
||||
self._append("`")
|
||||
self.in_code_inline = True
|
||||
return
|
||||
|
||||
if tag == "a":
|
||||
href = attrs_d.get("href", "")
|
||||
self.link_stack.append(href)
|
||||
self._append("[")
|
||||
return
|
||||
|
||||
if tag in ("strong", "b"):
|
||||
self._append("**")
|
||||
return
|
||||
|
||||
if tag in ("em", "i"):
|
||||
self._append("*")
|
||||
return
|
||||
|
||||
def handle_endtag(self, tag):
|
||||
if tag in ("h1", "h2", "h3", "h4", "h5", "h6", "p", "div"):
|
||||
self._ensure_blank_line()
|
||||
return
|
||||
|
||||
if tag in ("ul", "ol"):
|
||||
self.list_depth = max(self.list_depth - 1, 0)
|
||||
self._ensure_blank_line()
|
||||
return
|
||||
|
||||
if tag == "li":
|
||||
self._ensure_newline()
|
||||
return
|
||||
|
||||
if tag == "pre":
|
||||
self._ensure_newline()
|
||||
self._append("```\n\n")
|
||||
self.in_pre = False
|
||||
return
|
||||
|
||||
if tag == "code":
|
||||
if not self.in_pre and self.in_code_inline:
|
||||
self._append("`")
|
||||
self.in_code_inline = False
|
||||
return
|
||||
|
||||
if tag == "a":
|
||||
href = self.link_stack.pop() if self.link_stack else ""
|
||||
if href:
|
||||
self._append("]("
|
||||
+ href
|
||||
+ ")")
|
||||
else:
|
||||
self._append("]")
|
||||
return
|
||||
|
||||
if tag in ("strong", "b"):
|
||||
self._append("**")
|
||||
return
|
||||
|
||||
if tag in ("em", "i"):
|
||||
self._append("*")
|
||||
return
|
||||
|
||||
def handle_data(self, data):
|
||||
if data:
|
||||
self._append(data)
|
||||
|
||||
parser = MdExtractor()
|
||||
parser.feed(fragment)
|
||||
text = "".join(parser.out)
|
||||
text = re.sub(r"\n{3,}", "\n\n", text)
|
||||
text = re.sub(r"[ \t]+\n", "\n", text)
|
||||
print(text.strip())
|
||||
' || true)
|
||||
else
|
||||
echo "warning: failed to fetch release page ${release_url}"
|
||||
fi
|
||||
|
||||
if [ -z "$release_notes" ]; then
|
||||
release_notes="_No changelog found on upstream release page. Check ${release_url}._"
|
||||
fi
|
||||
|
||||
delimiter="CHANGELOG_$(date +%s%N)"
|
||||
{
|
||||
echo "changelog<<${delimiter}"
|
||||
printf '%s\n' "$release_notes"
|
||||
echo "${delimiter}"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
@@ -1,75 +0,0 @@
|
||||
name: handy update
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "40 6 * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
update-handy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: install nix
|
||||
uses: cachix/install-nix-action@v27
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
|
||||
- name: check latest handy release and update file
|
||||
id: update
|
||||
env:
|
||||
FILE: modules/pkgs/handy.nix
|
||||
LATEST_RELEASE_URL: https://github.com/cjpais/Handy/releases/latest
|
||||
DOWNLOAD_URL_TEMPLATE: https://github.com/cjpais/Handy/releases/download/v{version}/Handy_{version}_amd64.AppImage
|
||||
RELEASE_API_REPO: cjpais/Handy
|
||||
RELEASE_TAG_TEMPLATE: v{version}
|
||||
GITHUB_TOKEN: ${{ secrets.github_token || secrets.GITHUB_TOKEN }}
|
||||
shell: bash
|
||||
run: bash .gitea/scripts/update-appimage-nix.sh
|
||||
|
||||
- name: create branch and commit
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
|
||||
BRANCH="bot/handy-${version}" \
|
||||
FILE="modules/pkgs/handy.nix" \
|
||||
COMMIT_MESSAGE="update handy to ${version}" \
|
||||
bash .gitea/scripts/commit-update.sh
|
||||
|
||||
- name: open pull request
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
|
||||
CHANGELOG: ${{ steps.update.outputs.changelog }}
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
previous_version="${{ steps.update.outputs.previous_version }}"
|
||||
release_url="https://github.com/cjpais/Handy/releases/tag/v${version}"
|
||||
|
||||
pr_body=$(cat <<EOF
|
||||
automated update of handy appimage version and hash
|
||||
|
||||
## changelog
|
||||
from \`${previous_version}\` to \`${version}\`
|
||||
|
||||
upstream release: ${release_url}
|
||||
|
||||
${CHANGELOG}
|
||||
EOF
|
||||
)
|
||||
|
||||
GITEA_API="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config" \
|
||||
BRANCH="bot/handy-${version}" \
|
||||
TITLE="update handy to ${version}" \
|
||||
BODY="$pr_body" \
|
||||
bash .gitea/scripts/create-gitea-pr.sh
|
||||
@@ -1,75 +0,0 @@
|
||||
name: helium update
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 6 * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
update-helium:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: install nix
|
||||
uses: cachix/install-nix-action@v27
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
|
||||
- name: check latest helium release and update file
|
||||
id: update
|
||||
env:
|
||||
FILE: modules/pkgs/helium.nix
|
||||
LATEST_RELEASE_URL: https://github.com/imputnet/helium-linux/releases/latest
|
||||
DOWNLOAD_URL_TEMPLATE: https://github.com/imputnet/helium-linux/releases/download/{version}/helium-{version}-x86_64.AppImage
|
||||
RELEASE_API_REPO: imputnet/helium-linux
|
||||
RELEASE_TAG_TEMPLATE: '{version}'
|
||||
GITHUB_TOKEN: ${{ secrets.github_token || secrets.GITHUB_TOKEN }}
|
||||
shell: bash
|
||||
run: bash .gitea/scripts/update-appimage-nix.sh
|
||||
|
||||
- name: create branch and commit
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
|
||||
BRANCH="bot/helium-${version}" \
|
||||
FILE="modules/pkgs/helium.nix" \
|
||||
COMMIT_MESSAGE="update helium to ${version}" \
|
||||
bash .gitea/scripts/commit-update.sh
|
||||
|
||||
- name: open pull request
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
|
||||
CHANGELOG: ${{ steps.update.outputs.changelog }}
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
previous_version="${{ steps.update.outputs.previous_version }}"
|
||||
release_url="https://github.com/imputnet/helium-linux/releases/tag/${version}"
|
||||
|
||||
pr_body=$(cat <<EOF
|
||||
automated update of helium appimage version and hash
|
||||
|
||||
## changelog
|
||||
from \`${previous_version}\` to \`${version}\`
|
||||
|
||||
upstream release: ${release_url}
|
||||
|
||||
${CHANGELOG}
|
||||
EOF
|
||||
)
|
||||
|
||||
GITEA_API="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config" \
|
||||
BRANCH="bot/helium-${version}" \
|
||||
TITLE="update helium to ${version}" \
|
||||
BODY="$pr_body" \
|
||||
bash .gitea/scripts/create-gitea-pr.sh
|
||||
@@ -1,75 +0,0 @@
|
||||
name: zen browser update
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "20 6 * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
update-zen-browser:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: install nix
|
||||
uses: cachix/install-nix-action@v27
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
|
||||
- name: check latest zen browser release and update file
|
||||
id: update
|
||||
env:
|
||||
FILE: modules/pkgs/zen-browser.nix
|
||||
LATEST_RELEASE_URL: https://github.com/zen-browser/desktop/releases/latest
|
||||
DOWNLOAD_URL_TEMPLATE: https://github.com/zen-browser/desktop/releases/download/{version}/zen-x86_64.AppImage
|
||||
RELEASE_API_REPO: zen-browser/desktop
|
||||
RELEASE_TAG_TEMPLATE: '{version}'
|
||||
GITHUB_TOKEN: ${{ secrets.github_token || secrets.GITHUB_TOKEN }}
|
||||
shell: bash
|
||||
run: bash .gitea/scripts/update-appimage-nix.sh
|
||||
|
||||
- name: create branch and commit
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
|
||||
BRANCH="bot/zen-browser-${version}" \
|
||||
FILE="modules/pkgs/zen-browser.nix" \
|
||||
COMMIT_MESSAGE="update zen browser to ${version}" \
|
||||
bash .gitea/scripts/commit-update.sh
|
||||
|
||||
- name: open pull request
|
||||
if: steps.update.outputs.updated == 'true'
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
|
||||
CHANGELOG: ${{ steps.update.outputs.changelog }}
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
version="${{ steps.update.outputs.version }}"
|
||||
previous_version="${{ steps.update.outputs.previous_version }}"
|
||||
release_url="https://github.com/zen-browser/desktop/releases/tag/${version}"
|
||||
|
||||
pr_body=$(cat <<EOF
|
||||
automated update of zen browser appimage version and hash
|
||||
|
||||
## changelog
|
||||
from \`${previous_version}\` to \`${version}\`
|
||||
|
||||
upstream release: ${release_url}
|
||||
|
||||
${CHANGELOG}
|
||||
EOF
|
||||
)
|
||||
|
||||
GITEA_API="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config" \
|
||||
BRANCH="bot/zen-browser-${version}" \
|
||||
TITLE="update zen browser to ${version}" \
|
||||
BODY="$pr_body" \
|
||||
bash .gitea/scripts/create-gitea-pr.sh
|
||||
@@ -20,3 +20,36 @@ NixOS configuration using a dendritic structure — `flake.nix` at the root, wit
|
||||
```bash
|
||||
sudo nixos-rebuild switch --flake .#nixos
|
||||
```
|
||||
|
||||
## SMB share secrets (agenix)
|
||||
|
||||
SMB automount is configured in `modules/hosts/nixos.nix` and activates once
|
||||
`secrets/smb-credentials.age` exists.
|
||||
|
||||
1. Edit recipients in `secrets/secrets.nix` if needed.
|
||||
2. Create the encrypted secret (using the host SSH private key via sudo):
|
||||
|
||||
```bash
|
||||
sudo env RULES=secrets/secrets.nix nix run github:ryantm/agenix -- -e secrets/smb-credentials.age -i /etc/ssh/ssh_host_ed25519_key
|
||||
```
|
||||
|
||||
Use this content:
|
||||
|
||||
```text
|
||||
username=YOUR_SMB_USER
|
||||
password=YOUR_SMB_PASSWORD
|
||||
# optional
|
||||
# domain=WORKGROUP
|
||||
```
|
||||
|
||||
Configured shares mirror your Endeavour setup:
|
||||
|
||||
- `//192.168.1.102/data` → `/mnt/unraid-data`
|
||||
- `//192.168.1.102/appdata` → `/mnt/unraid-appdata`
|
||||
|
||||
Then apply:
|
||||
|
||||
```bash
|
||||
sudo nixos-rebuild switch --flake .#nixos
|
||||
```
|
||||
|
||||
|
||||
Generated
+218
-10
@@ -1,5 +1,48 @@
|
||||
{
|
||||
"nodes": {
|
||||
"agenix": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770165109,
|
||||
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"agenix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744478979,
|
||||
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lnl7",
|
||||
"ref": "master",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
@@ -7,11 +50,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772408722,
|
||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -20,13 +63,71 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gsf": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774464988,
|
||||
"narHash": "sha256-F0pVG3ou+yN+jqQlFXMf27BCeShDuZcpoeHFSord8xk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "3bccad3870d1f7220c423f06d21ed9b91d1b90d1",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://gitea.unrail.xyz/thomas/gotta-scroll-fast"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://gitea.unrail.xyz/thomas/gotta-scroll-fast"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"agenix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745494811,
|
||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"import-tree": {
|
||||
"locked": {
|
||||
"lastModified": 1772999353,
|
||||
"narHash": "sha256-dPb0WxUhFaz6wuR3B6ysqFJpsu8txKDPZvS47AT2XLI=",
|
||||
"lastModified": 1773693634,
|
||||
"narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
|
||||
"owner": "vic",
|
||||
"repo": "import-tree",
|
||||
"rev": "545a4df146fce44d155573e47f5a777985acf912",
|
||||
"rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -35,13 +136,60 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"maccel": {
|
||||
"locked": {
|
||||
"lastModified": 1771614512,
|
||||
"narHash": "sha256-KzvNWDGVpoNcR9wcIOlwxr6Nwtgt9Hicck/0fswhi7U=",
|
||||
"owner": "Gnarus-G",
|
||||
"repo": "maccel",
|
||||
"rev": "c7c1369d4bd4f240b38365cd43bd696d06635e4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gnarus-G",
|
||||
"repo": "maccel",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1772773019,
|
||||
"narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
|
||||
"lastModified": 1754028485,
|
||||
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
|
||||
"rev": "59e69648d345d6e8fef86158c555730fa12af9de",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1774106199,
|
||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -53,9 +201,69 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"flake-parts": "flake-parts",
|
||||
"gsf": "gsf",
|
||||
"import-tree": "import-tree",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"maccel": "maccel",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"thomas-pkgs": "thomas-pkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"thomas-pkgs": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"import-tree": [
|
||||
"import-tree"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776256561,
|
||||
"narHash": "sha256-Nd4NEBweLpk9xhw6YT97moPRw72TqUkYLkqF3Q6EdPU=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a7195da8e85f8b965f81e082b243f8f038482de2",
|
||||
"revCount": 7,
|
||||
"type": "git",
|
||||
"url": "https://gitea.unrail.xyz/thomas/thomas-likes-nix-pkgs"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://gitea.unrail.xyz/thomas/thomas-likes-nix-pkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -9,6 +9,16 @@
|
||||
};
|
||||
|
||||
import-tree.url = "github:vic/import-tree";
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
maccel.url = "github:Gnarus-G/maccel";
|
||||
gsf.url = "git+https://gitea.unrail.xyz/thomas/gotta-scroll-fast";
|
||||
|
||||
thomas-pkgs = {
|
||||
url = "git+https://gitea.unrail.xyz/thomas/thomas-likes-nix-pkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
inputs.import-tree.follows = "import-tree";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
{
|
||||
inputs,
|
||||
self,
|
||||
...
|
||||
}: {
|
||||
flake.nixosModules.browsers = {pkgs, ...}: {
|
||||
programs.firefox.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
self.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser
|
||||
self.packages.${pkgs.stdenv.hostPlatform.system}.helium
|
||||
inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser
|
||||
inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.helium
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
+12
-1
@@ -1,5 +1,11 @@
|
||||
{inputs, ...}: {
|
||||
{config, ...}: let
|
||||
flakeConfig = config;
|
||||
in {
|
||||
flake.nixosModules.development = {pkgs, ...}: {
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
users.users.${flakeConfig.username}.extraGroups = ["docker"];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
nodejs_24
|
||||
go
|
||||
@@ -13,6 +19,11 @@
|
||||
pnpm
|
||||
ni
|
||||
|
||||
# AI
|
||||
code-cursor-fhs
|
||||
codex
|
||||
cursor-cli
|
||||
|
||||
# LSPs and formatters (previously via Mason)
|
||||
stylua
|
||||
lua-language-server
|
||||
|
||||
+2
-1
@@ -1,10 +1,11 @@
|
||||
{ inputs, ... }: {
|
||||
{...}: {
|
||||
flake.nixosModules.fonts = {pkgs, ...}: {
|
||||
fonts.packages = with pkgs; [
|
||||
nerd-fonts.iosevka-term-slab
|
||||
nerd-fonts.iosevka
|
||||
nerd-fonts.fira-mono
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.proggy-clean-tt
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
+148
-8
@@ -3,9 +3,24 @@
|
||||
self,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.nixosModules.nixos-host = {pkgs, ...}: {
|
||||
}: let
|
||||
flakeConfig = config;
|
||||
in {
|
||||
flake.nixosModules.nixos-host = {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
smbSecretFile = ../../secrets/smb-credentials.age;
|
||||
hasSmbSecret = builtins.pathExists smbSecretFile;
|
||||
|
||||
gsfDevice = "/dev/input/by-id/usb-Ploopy_Corporation_Ploopy_Adept_Trackball_E6626067D39C532A0000000000000000-if02-event-mouse";
|
||||
in {
|
||||
imports = [
|
||||
inputs.agenix.nixosModules.default
|
||||
inputs.maccel.nixosModules.default
|
||||
inputs.gsf.nixosModules.default
|
||||
../../hardware-configuration.nix
|
||||
];
|
||||
|
||||
@@ -17,9 +32,20 @@
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# Custom EDID override for Samsung 240Hz on DP-1
|
||||
boot.kernelParams = ["drm.edid_firmware=DP-1:edid/g80.bin"];
|
||||
# Extreme mt7921e fallback: disable PCIe ASPM globally
|
||||
boot.kernelParams = [
|
||||
"drm.edid_firmware=DP-1:edid/g80.bin"
|
||||
"pcie_aspm=off"
|
||||
];
|
||||
|
||||
# mt7921e stability tweaks
|
||||
boot.extraModprobeConfig = ''
|
||||
options mt7921e disable_aspm=Y
|
||||
options mt7921e disable_clc=Y
|
||||
'';
|
||||
|
||||
hardware.firmware = [
|
||||
(pkgs.runCommandNoCC "g80-edid-firmware" {} ''
|
||||
(pkgs.runCommand "g80-edid-firmware" {} ''
|
||||
install -Dm444 ${../assets/edid/g80.bin} $out/lib/firmware/edid/g80.bin
|
||||
'')
|
||||
];
|
||||
@@ -28,7 +54,39 @@
|
||||
networking.hostName = "nixos";
|
||||
|
||||
# Networking
|
||||
networking.networkmanager.enable = true;
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
wifi.powersave = false;
|
||||
settings.device."wifi.scan-rand-mac-address" = "no";
|
||||
};
|
||||
|
||||
# Work around mt7921e getting stuck after suspend/resume
|
||||
environment.etc."systemd/system-sleep/99-mt7921e-reset" = {
|
||||
text = ''
|
||||
#!/bin/sh
|
||||
case "$1" in
|
||||
post)
|
||||
${pkgs.kmod}/bin/modprobe -r mt7921e || true
|
||||
${pkgs.kmod}/bin/modprobe mt7921e
|
||||
;;
|
||||
esac
|
||||
'';
|
||||
mode = "0755";
|
||||
};
|
||||
|
||||
# LocalSend
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [53317];
|
||||
allowedUDPPorts = [53317];
|
||||
};
|
||||
|
||||
# WebHID/VIA access on Linux (VIA needs hidraw access)
|
||||
services.udev.extraRules = ''
|
||||
# General VIA rule (matches vial docs/reddit workaround)
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
|
||||
# Explicit Ploopy Adept (VID:PID 5043:5c47)
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="5043", ATTRS{idProduct}=="5c47", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
|
||||
'';
|
||||
|
||||
# Time zone
|
||||
time.timeZone = "Europe/Lisbon";
|
||||
@@ -69,19 +127,48 @@
|
||||
};
|
||||
|
||||
# User account
|
||||
users.users.${config.username} = {
|
||||
users.users.${flakeConfig.username} = {
|
||||
isNormalUser = true;
|
||||
description = "Thomas Gouveia Lopes";
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
};
|
||||
|
||||
users.groups.maccel.members = [flakeConfig.username];
|
||||
|
||||
hardware.maccel = {
|
||||
enable = true;
|
||||
enableCli = true;
|
||||
parameters = {
|
||||
mode = "linear";
|
||||
sensMultiplier = 1.0;
|
||||
yxRatio = 1.0;
|
||||
inputDpi = 1000.0;
|
||||
angleRotation = 0.0;
|
||||
acceleration = 0.3;
|
||||
offset = 2.0;
|
||||
outputCap = 2.0;
|
||||
};
|
||||
};
|
||||
|
||||
hardware.gsf = {
|
||||
enable = true;
|
||||
device = gsfDevice;
|
||||
inputGroupUsers = [flakeConfig.username];
|
||||
};
|
||||
|
||||
# Programs
|
||||
|
||||
# Allow unfree
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Enable flakes
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
# Use Lix as the system Nix implementation
|
||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||
|
||||
# Enable flakes + restrict who can submit builds to the daemon
|
||||
nix.settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
allowed-users = ["root" flakeConfig.username];
|
||||
};
|
||||
|
||||
# Auto-unlock gnome-keyring on login
|
||||
security.pam.services.login.enableGnomeKeyring = true;
|
||||
@@ -91,6 +178,59 @@
|
||||
# State version
|
||||
system.stateVersion = "25.11";
|
||||
|
||||
boot.supportedFilesystems = ["cifs"];
|
||||
|
||||
warnings = lib.optional (!hasSmbSecret) ''
|
||||
SMB automount is disabled: missing ${toString smbSecretFile}.
|
||||
Create it with agenix:
|
||||
sudo env RULES=secrets/secrets.nix nix run github:ryantm/agenix -- -e secrets/smb-credentials.age -i /etc/ssh/ssh_host_ed25519_key
|
||||
and set:
|
||||
username=...
|
||||
password=...
|
||||
# optional
|
||||
# domain=WORKGROUP
|
||||
'';
|
||||
|
||||
age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
age.secrets."smb-credentials" = lib.mkIf hasSmbSecret {
|
||||
file = smbSecretFile;
|
||||
mode = "0400";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
};
|
||||
|
||||
fileSystems."/mnt/unraid-data" = lib.mkIf hasSmbSecret {
|
||||
device = "//192.168.1.102/data";
|
||||
fsType = "cifs";
|
||||
options = [
|
||||
"credentials=${config.age.secrets."smb-credentials".path}"
|
||||
"uid=1000"
|
||||
"gid=1000"
|
||||
"iocharset=utf8"
|
||||
"nofail"
|
||||
"x-systemd.automount"
|
||||
"_netdev"
|
||||
"noserverino"
|
||||
"vers=3.0"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/unraid-appdata" = lib.mkIf hasSmbSecret {
|
||||
device = "//192.168.1.102/appdata";
|
||||
fsType = "cifs";
|
||||
options = [
|
||||
"credentials=${config.age.secrets."smb-credentials".path}"
|
||||
"uid=1000"
|
||||
"gid=1000"
|
||||
"iocharset=utf8"
|
||||
"nofail"
|
||||
"x-systemd.automount"
|
||||
"_netdev"
|
||||
"noserverino"
|
||||
"vers=3.0"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/endeavour" = {
|
||||
device = "/dev/disk/by-uuid/a32ca052-12a5-4355-bd3b-b4515d9ea4a5";
|
||||
fsType = "ext4";
|
||||
|
||||
+28
-2
@@ -1,4 +1,4 @@
|
||||
{self, ...}: {
|
||||
{inputs, ...}: {
|
||||
flake.nixosModules.packages = {pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
fd
|
||||
@@ -6,6 +6,8 @@
|
||||
nerdfetch
|
||||
libnotify
|
||||
alacritty
|
||||
ghostty
|
||||
foot
|
||||
fzf
|
||||
autojump
|
||||
yazi
|
||||
@@ -19,11 +21,35 @@
|
||||
slack
|
||||
feishin
|
||||
obsidian
|
||||
self.packages.${pkgs.stdenv.hostPlatform.system}.handy
|
||||
nextcloud-client
|
||||
inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.handy
|
||||
inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.t3code
|
||||
mpv
|
||||
ffmpeg
|
||||
tmux
|
||||
obs-studio
|
||||
jjui
|
||||
bat
|
||||
localsend
|
||||
# postman
|
||||
bruno
|
||||
bruno-cli
|
||||
tenacity
|
||||
inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.ocenaudio
|
||||
jq
|
||||
tldr
|
||||
];
|
||||
|
||||
systemd.user.services.handy = {
|
||||
description = "Handy";
|
||||
wantedBy = ["graphical-session.target"];
|
||||
partOf = ["graphical-session.target"];
|
||||
after = ["graphical-session.target"];
|
||||
serviceConfig = {
|
||||
ExecStart = "${inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.handy}/bin/handy";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{...}: {
|
||||
perSystem = {pkgs, ...}: {
|
||||
packages.handy = pkgs.appimageTools.wrapType2 rec {
|
||||
pname = "handy";
|
||||
version = "0.7.10";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/cjpais/Handy/releases/download/v${version}/Handy_${version}_amd64.AppImage";
|
||||
hash = "sha256-vBOcXCCJr9D0u0h27nN4XLPPngx4m+toAfi6O6Fuojk=";
|
||||
};
|
||||
|
||||
extraInstallCommands = let
|
||||
contents = pkgs.appimageTools.extract {inherit pname version src;};
|
||||
in ''
|
||||
desktop_file=$(find ${contents} -name "*.desktop" | head -n1)
|
||||
if [ -n "$desktop_file" ]; then
|
||||
install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
|
||||
substituteInPlace "$out/share/applications/${pname}.desktop" \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}' || true
|
||||
fi
|
||||
|
||||
if [ -d ${contents}/usr/share/icons ]; then
|
||||
cp -r ${contents}/usr/share/icons $out/share
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{ ... }: {
|
||||
perSystem = { pkgs, ... }: {
|
||||
packages.helium = pkgs.appimageTools.wrapType2 rec {
|
||||
pname = "helium";
|
||||
version = "0.9.4.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/imputnet/helium-linux/releases/download/${version}/${pname}-${version}-x86_64.AppImage";
|
||||
hash = "sha256-N5gdWuxOrIudJx/4nYo4/SKSxakpTFvL4zzByv6Cnug=";
|
||||
};
|
||||
|
||||
extraInstallCommands = let
|
||||
contents = pkgs.appimageTools.extract { inherit pname version src; };
|
||||
in ''
|
||||
install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${contents}/usr/share/icons $out/share
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
{lib, ...}: {
|
||||
perSystem = {pkgs, ...}: let
|
||||
pname = "zen-browser";
|
||||
version = "1.19.2b";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
|
||||
hash = "sha256-lDn7rIYDgmyUnc3PdIASXfpXBXASL6TEdzyZfT716cI=";
|
||||
};
|
||||
|
||||
appimageContents = pkgs.appimageTools.extract {inherit pname version src;};
|
||||
in {
|
||||
packages.zen-browser = pkgs.appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: [pkgs.ffmpeg-full];
|
||||
|
||||
extraInstallCommands = ''
|
||||
desktop_file=$(find ${appimageContents} -name "*.desktop" | head -n1)
|
||||
if [ -n "$desktop_file" ]; then
|
||||
install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
|
||||
substituteInPlace "$out/share/applications/${pname}.desktop" \
|
||||
--replace 'Exec=zen' 'Exec=${pname}'
|
||||
fi
|
||||
|
||||
if [ -d ${appimageContents}/usr/share/icons ]; then
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
fi
|
||||
|
||||
ln -s $out/bin/${pname} $out/bin/zen
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Experience tranquillity while browsing the web without people tracking you!";
|
||||
homepage = "https://zen-browser.app";
|
||||
license = lib.licenses.mpl20;
|
||||
platforms = ["x86_64-linux"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
flake.nixosModules.ui = { pkgs, lib, ... }: {
|
||||
# Desktop environment
|
||||
services.xserver.enable = true;
|
||||
services.xserver.xkb.options = "compose:ralt,cedilla:cacute";
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
let
|
||||
nixos = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIg62Co6P+CYcvINrW9IYM1D8W7A3LNlEphAqP6vCzrv root@nixos";
|
||||
in {
|
||||
"secrets/smb-credentials.age".publicKeys = [
|
||||
nixos
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 eoxNoQ +//j26EmOrSLqTMUaKWy4X/GZZ3XoJmKlT+ArQejODU
|
||||
olSV7FU5URhIcB4JczmPhGZsaQjQCs7kTm/IISCePsk
|
||||
--- r7Gpe55fXHr9lghoFvwAZZVvDVckENBxTDXW3sXEjUI
|
||||
ã{„Â&ffÇj?ÛSŠÈy´|Ô™tÀܾ_3äûOÇÒåjp» ‹tS!Î,†!5iÿó©¡�ÙGoê‹_?tFKˆ%üÊ´ØÔh%up„ÁX;'•.ÿXÙðóœo=
|
||||
Reference in New Issue
Block a user