jq

automated update of handy appimage version and hash

## changelog
from `0.7.12` to `0.8.0`

upstream release: https://github.com/cjpais/Handy/releases/tag/v0.8.0

Co-authored-by: gitea actions <actions@localhost>
Reviewed-on: #18

.gitea/workflows/handy-update.yml

@@ -1,139 +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
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          FILE="modules/pkgs/handy.nix"
-
-          current_version=$(python - <<'PY'
-          import re
-          s=open('modules/pkgs/handy.nix').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}' \
-            'https://github.com/cjpais/Handy/releases/latest' \
-            | sed -E 's#.*/##' \
-            | sed 's/^v//')
-
-          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
-
-          url="https://github.com/cjpais/Handy/releases/download/v${latest_version}/Handy_${latest_version}_amd64.AppImage"
-          new_hash=$(nix store prefetch-file --json "$url" | python -c 'import json,sys; print(json.load(sys.stdin)["hash"])')
-
-          export LATEST_VERSION="$latest_version"
-          export NEW_HASH="$new_hash"
-
-          python - <<PY
-          import re
-          import os
-          p='modules/pkgs/handy.nix'
-          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"
-
-      - name: create branch and commit
-        if: steps.update.outputs.updated == 'true'
-        shell: bash
-        run: |
-          set -euo pipefail
-          branch="bot/handy-${{ steps.update.outputs.version }}"
-
-          git config user.name "gitea actions"
-          git config user.email "actions@localhost"
-
-          git checkout -B "$branch"
-          git add modules/pkgs/handy.nix
-          git commit -m "update handy to ${{ steps.update.outputs.version }}"
-          git push --force origin "$branch"
-
-      - name: open pull request
-        if: steps.update.outputs.updated == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          api="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config"
-          branch="bot/handy-${{ steps.update.outputs.version }}"
-
-          if [ -z "${GITEA_TOKEN:-}" ]; then
-            echo "GITEA_TOKEN is empty (check repo secret tea_token/TEA_TOKEN)"
-            exit 1
-          fi
-
-          echo "Checking for existing PRs..."
-          existing=$(curl -fsS \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            "${api}/pulls?state=open" \
-            | python -c 'import json,sys; d=json.load(sys.stdin); b="'"$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}" "thomas:${branch}"; do
-            echo "Trying head=${head}"
-            payload=$(printf '{"title":"update handy to %s","head":"%s","base":"main","body":"automated update of handy appimage version and hash"}' \
-              "${{ steps.update.outputs.version }}" "$head")
-            response=$(curl -sS -w '\n%{http_code}' -X POST \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "${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

.gitea/workflows/helium-update.yml

@@ -1,140 +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
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          FILE="modules/pkgs/helium.nix"
-
-          current_version=$(python - <<'PY'
-          import re
-          p='modules/pkgs/helium.nix'
-          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}' \
-            'https://github.com/imputnet/helium-linux/releases/latest' \
-            | sed -E 's#.*/##' \
-            | sed 's/^v//')
-
-          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
-
-          url="https://github.com/imputnet/helium-linux/releases/download/${latest_version}/helium-${latest_version}-x86_64.AppImage"
-          new_hash=$(nix store prefetch-file --json "$url" | python -c 'import json,sys; print(json.load(sys.stdin)["hash"])')
-
-          export LATEST_VERSION="$latest_version"
-          export NEW_HASH="$new_hash"
-
-          python - <<PY
-          import re
-          import os
-          p='modules/pkgs/helium.nix'
-          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"
-
-      - name: create branch and commit
-        if: steps.update.outputs.updated == 'true'
-        shell: bash
-        run: |
-          set -euo pipefail
-          branch="bot/helium-${{ steps.update.outputs.version }}"
-
-          git config user.name "gitea actions"
-          git config user.email "actions@localhost"
-
-          git checkout -B "$branch"
-          git add modules/pkgs/helium.nix
-          git commit -m "update helium to ${{ steps.update.outputs.version }}"
-          git push --force origin "$branch"
-
-      - name: open pull request
-        if: steps.update.outputs.updated == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          api="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config"
-          branch="bot/helium-${{ steps.update.outputs.version }}"
-
-          if [ -z "${GITEA_TOKEN:-}" ]; then
-            echo "GITEA_TOKEN is empty (check repo secret tea_token/TEA_TOKEN)"
-            exit 1
-          fi
-
-          # Skip if PR for this branch already exists
-          existing=$(curl -fsS \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            "${api}/pulls?state=open" \
-            | python -c 'import json,sys; d=json.load(sys.stdin); b="'"$branch"'"; print(next((str(pr["number"]) for pr in d if 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}" "thomas:${branch}"; do
-            echo "Trying head=${head}"
-            payload=$(printf '{"title":"update helium to %s","head":"%s","base":"main","body":"automated update of helium appimage version and hash"}' \
-              "${{ steps.update.outputs.version }}" "$head")
-            response=$(curl -sS -w '\n%{http_code}' -X POST \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "${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

.gitea/workflows/zen-browser-update.yml

@@ -1,138 +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
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          FILE="modules/pkgs/zen-browser.nix"
-
-          current_version=$(python - <<'PY'
-          import re
-          s=open('modules/pkgs/zen-browser.nix').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}' \
-            'https://github.com/zen-browser/desktop/releases/latest' \
-            | sed -E 's#.*/##' \
-            | sed 's/^v//')
-
-          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
-
-          url="https://github.com/zen-browser/desktop/releases/download/${latest_version}/zen-x86_64.AppImage"
-          new_hash=$(nix store prefetch-file --json "$url" | python -c 'import json,sys; print(json.load(sys.stdin)["hash"])')
-
-          export LATEST_VERSION="$latest_version"
-          export NEW_HASH="$new_hash"
-
-          python - <<PY
-          import re
-          import os
-          p='modules/pkgs/zen-browser.nix'
-          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"
-
-      - name: create branch and commit
-        if: steps.update.outputs.updated == 'true'
-        shell: bash
-        run: |
-          set -euo pipefail
-          branch="bot/zen-browser-${{ steps.update.outputs.version }}"
-
-          git config user.name "gitea actions"
-          git config user.email "actions@localhost"
-
-          git checkout -B "$branch"
-          git add modules/pkgs/zen-browser.nix
-          git commit -m "update zen browser to ${{ steps.update.outputs.version }}"
-          git push --force origin "$branch"
-
-      - name: open pull request
-        if: steps.update.outputs.updated == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.tea_token || secrets.TEA_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          api="https://gitea.unrail.xyz/api/v1/repos/thomas/nixos-config"
-          branch="bot/zen-browser-${{ steps.update.outputs.version }}"
-
-          if [ -z "${GITEA_TOKEN:-}" ]; then
-            echo "GITEA_TOKEN is empty (check repo secret tea_token/TEA_TOKEN)"
-            exit 1
-          fi
-
-          existing=$(curl -fsS \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            "${api}/pulls?state=open" \
-            | python -c 'import json,sys; d=json.load(sys.stdin); b="'"$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}" "thomas:${branch}"; do
-            echo "Trying head=${head}"
-            payload=$(printf '{"title":"update zen browser to %s","head":"%s","base":"main","body":"automated update of zen browser appimage version and hash"}' \
-              "${{ steps.update.outputs.version }}" "$head")
-            response=$(curl -sS -w '\n%{http_code}' -X POST \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              "${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

README.md

@@ -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
+```
+

flake.lock

@@ -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,
+        "lastModified": 1775087534,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "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,
+        "lastModified": 1773693634,
-        "narHash": "sha256-dPb0WxUhFaz6wuR3B6ysqFJpsu8txKDPZvS47AT2XLI=",
+        "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,
+        "lastModified": 1754028485,
-        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
+        "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"
       }
     }
   },

flake.nix

@@ -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 =

modules/browsers.nix

@@ -1,14 +1,13 @@
 {
   inputs,
-  self,
   ...
 }: {
   flake.nixosModules.browsers = {pkgs, ...}: {
     programs.firefox.enable = true;
 
     environment.systemPackages = [
-      self.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser
+      inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser
-      self.packages.${pkgs.stdenv.hostPlatform.system}.helium
+      inputs.thomas-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.helium
     ];
   };
 }

modules/development.nix

@@ -1,14 +1,28 @@
-{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
 
       nixfmt
       zellij
       nixd
       git
+      jujutsu
       lazygit
       pnpm
+      ni
+
+      # AI
+      code-cursor-fhs
+      codex
+      cursor-cli
 
       # LSPs and formatters (previously via Mason)
       stylua
@@ -16,7 +30,9 @@
       pyright
       vscode-langservers-extracted # includes css-lsp, eslint-lsp, html-lsp, json-lsp
       tailwindcss-language-server
+      svelte-language-server
       biome
+      typescript-go
 
       # Treesitter CLI + C compiler for building grammars
       tree-sitter

modules/fonts.nix

@@ -1,10 +1,11 @@
-{ inputs, ... }: {
+{...}: {
-	flake.nixosModules.fonts = {pkgs, ...}: {
+  flake.nixosModules.fonts = {pkgs, ...}: {
-		fonts.packages = with pkgs; [
+    fonts.packages = with pkgs; [
-			nerd-fonts.iosevka-term-slab
+      nerd-fonts.iosevka-term-slab
-			nerd-fonts.iosevka
+      nerd-fonts.iosevka
-			nerd-fonts.fira-mono
+      nerd-fonts.fira-mono
-			nerd-fonts.fira-code
+      nerd-fonts.fira-code
-		];
+      nerd-fonts.proggy-clean-tt
-	};
+    ];
+  };
 }

modules/hosts/nixos.nix

@@ -1,80 +1,240 @@
-{ inputs, self, config, ... }: {
+{
+  inputs,
+  self,
+  config,
+  ...
+}: let
+  flakeConfig = config;
+in {
+  flake.nixosModules.nixos-host = {
+    pkgs,
+    lib,
+    config,
+    ...
+  }: let
+    smbSecretFile = ../../secrets/smb-credentials.age;
+    hasSmbSecret = builtins.pathExists smbSecretFile;
 
-flake.nixosModules.nixos-host = {pkgs, ...}: {
+    gsfDevice = "/dev/input/by-id/usb-Ploopy_Corporation_Ploopy_Adept_Trackball_E6626067D39C532A0000000000000000-if02-event-mouse";
-  imports = [
+  in {
-    ../../hardware-configuration.nix
+    imports = [
-  ];
+      inputs.agenix.nixosModules.default
+      inputs.maccel.nixosModules.default
+      inputs.gsf.nixosModules.default
+      ../../hardware-configuration.nix
+    ];
 
-  # Bootloader
+    # Bootloader
-  boot.loader.systemd-boot.enable = true;
+    boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+    boot.loader.efi.canTouchEfiVariables = true;
 
-  # Use latest kernel
+    # Use latest kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+    boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # Hostname
+    # Custom EDID override for Samsung 240Hz on DP-1
-  networking.hostName = "nixos";
+    # Extreme mt7921e fallback: disable PCIe ASPM globally
+    boot.kernelParams = [
+      "drm.edid_firmware=DP-1:edid/g80.bin"
+      "pcie_aspm=off"
+    ];
 
-  # Networking
+    # mt7921e stability tweaks
-  networking.networkmanager.enable = true;
+    boot.extraModprobeConfig = ''
+      options mt7921e disable_aspm=Y
+      options mt7921e disable_clc=Y
+    '';
 
-  # Time zone
+    hardware.firmware = [
-  time.timeZone = "Europe/Lisbon";
+      (pkgs.runCommand "g80-edid-firmware" {} ''
+        install -Dm444 ${../assets/edid/g80.bin} $out/lib/firmware/edid/g80.bin
+      '')
+    ];
 
-  # Locale
+    # Hostname
-  i18n.defaultLocale = "en_GB.UTF-8";
+    networking.hostName = "nixos";
-  i18n.extraLocaleSettings = {
+
-    LC_ADDRESS = "pt_PT.UTF-8";
+    # Networking
-    LC_IDENTIFICATION = "pt_PT.UTF-8";
+    networking.networkmanager = {
-    LC_MEASUREMENT = "pt_PT.UTF-8";
+      enable = true;
-    LC_MONETARY = "pt_PT.UTF-8";
+      wifi.powersave = false;
-    LC_NAME = "pt_PT.UTF-8";
+      settings.device."wifi.scan-rand-mac-address" = "no";
-    LC_NUMERIC = "pt_PT.UTF-8";
+    };
-    LC_PAPER = "pt_PT.UTF-8";
+
-    LC_TELEPHONE = "pt_PT.UTF-8";
+    # Work around mt7921e getting stuck after suspend/resume
-    LC_TIME = "pt_PT.UTF-8";
+    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";
+
+    # Locale
+    i18n.defaultLocale = "en_GB.UTF-8";
+    i18n.extraLocaleSettings = {
+      LC_ADDRESS = "pt_PT.UTF-8";
+      LC_IDENTIFICATION = "pt_PT.UTF-8";
+      LC_MEASUREMENT = "pt_PT.UTF-8";
+      LC_MONETARY = "pt_PT.UTF-8";
+      LC_NAME = "pt_PT.UTF-8";
+      LC_NUMERIC = "pt_PT.UTF-8";
+      LC_PAPER = "pt_PT.UTF-8";
+      LC_TELEPHONE = "pt_PT.UTF-8";
+      LC_TIME = "pt_PT.UTF-8";
+    };
+
+    # Printing
+    services.printing.enable = true;
+
+    # Audio
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+
+    # SSH
+    services.openssh = {
+      enable = true;
+      settings = {
+        PermitRootLogin = "no";
+      };
+    };
+
+    # User account
+    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;
+
+    # 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;
+    security.pam.services.gdm.enableGnomeKeyring = true;
+    security.pam.services.gdm-password.enableGnomeKeyring = true;
+
+    # 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";
+      options = ["defaults" "noatime"];
+    };
   };
-
-  # Printing
-  services.printing.enable = true;
-
-  # Audio
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # User account
-  users.users.${config.username} = {
-    isNormalUser = true;
-    description = "Thomas Gouveia Lopes";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  # Programs
-
-  # Allow unfree
-  nixpkgs.config.allowUnfree = true;
-
-  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # Auto-unlock gnome-keyring on login
-  security.pam.services.login.enableGnomeKeyring = true;
-  security.pam.services.gdm.enableGnomeKeyring = true;
-  security.pam.services.gdm-password.enableGnomeKeyring = true;
-
-  # State version
-  system.stateVersion = "25.11";
-
-	fileSystems."/mnt/endeavour" = {
-	 device = "/dev/disk/by-uuid/a32ca052-12a5-4355-bd3b-b4515d9ea4a5";
-	 fsType = "ext4";
-	 options = [ "defaults" "noatime" ];
-	};
-};
 }

modules/packages.nix

@@ -1,8 +1,4 @@
-{
+{inputs, ...}: {
-  inputs,
-  self,
-  ...
-}: {
   flake.nixosModules.packages = {pkgs, ...}: {
     environment.systemPackages = with pkgs; [
       fd
@@ -10,8 +6,13 @@
       nerdfetch
       libnotify
       alacritty
+      foot
       fzf
       autojump
+      yazi
+      ueberzugpp
+      chafa
+      wl-clipboard
       pulseaudio
       legcord
       quickshell
@@ -19,7 +20,34 @@
       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
     ];
+
+    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;
+      };
+    };
   };
 }

modules/pkgs/handy.nix

@@ -1,28 +0,0 @@
-{...}: {
-  perSystem = {pkgs, ...}: {
-    packages.handy = pkgs.appimageTools.wrapType2 rec {
-      pname = "handy";
-      version = "0.7.9";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/cjpais/Handy/releases/download/v${version}/Handy_${version}_amd64.AppImage";
-        hash = "sha256-iSibRpme8xJfumhjJ2LzkrtFwV8j9nHajMnBygBFLz4=";
-      };
-
-      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
-      '';
-    };
-  };
-}

modules/pkgs/helium.nix

@@ -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
-      '';
-    };
-  };
-}

modules/pkgs/zen-browser.nix

@@ -1,29 +0,0 @@
-{ ... }: {
-  perSystem = { pkgs, ... }: {
-    packages.zen-browser = pkgs.appimageTools.wrapType2 rec {
-      pname = "zen-browser";
-      version = "1.19.1b";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
-        hash = "sha256-h3lza2C+SxptpcX897Uf/nM8dNILUBXScSNQZlvSIQg=";
-      };
-
-      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"
-          # The desktop file uses 'zen' as the binary name
-          substituteInPlace "$out/share/applications/${pname}.desktop" \
-            --replace 'Exec=zen' 'Exec=${pname}'
-        fi
-
-        if [ -d ${contents}/usr/share/icons ]; then
-          cp -r ${contents}/usr/share/icons $out/share
-        fi
-      '';
-    };
-  };
-}

modules/ui.nix

@@ -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;

secrets/secrets.nix

@@ -0,0 +1,7 @@
+let
+  nixos = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIg62Co6P+CYcvINrW9IYM1D8W7A3LNlEphAqP6vCzrv root@nixos";
+in {
+  "secrets/smb-credentials.age".publicKeys = [
+    nixos
+  ];
+}

secrets/smb-credentials.age

@@ -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=