Compare commits
19 Commits
6c046a549e
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 450d9d6457 | |||
| e08bf42eaa | |||
| 8e0e5c0d16 | |||
| ada9db7942 | |||
| 5995612407 | |||
| 5762916970 | |||
| dd456eab69 | |||
| 18a8fde66e | |||
| f97c9185c1 | |||
| 8bf4b185a1 | |||
| 8424d771f6 | |||
| 840f99a7e9 | |||
| 1b27bafd41 | |||
| 4770d671c0 | |||
| 28a7bed3b9 | |||
| 170becceb0 | |||
| 6e8f530537 | |||
| 209bafd70f | |||
| 1d182437db |
8
.mcp.json
Normal file
8
.mcp.json
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"nixos": {
|
||||||
|
"command": "uvx",
|
||||||
|
"args": ["mcp-nixos"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
12
CLAUDE.md
12
CLAUDE.md
@@ -40,7 +40,7 @@ Each host in `hosts/<hostname>/` contains:
|
|||||||
- `fleet.nix` → symlink to root `fleet.nix` (SFTP user provisioning)
|
- `fleet.nix` → symlink to root `fleet.nix` (SFTP user provisioning)
|
||||||
- `utils/` → symlink to root `utils/` (shared modules)
|
- `utils/` → symlink to root `utils/` (shared modules)
|
||||||
|
|
||||||
Current hosts: `fw` (firewall/router), `nb` (notebook), `web-arm`, `mail`, `amzebs-01`
|
Current hosts: `fw` (firewall/router), `nb` (notebook), `web-arm`, `mail`, `amzebs-01`, `nas`
|
||||||
|
|
||||||
### Shared Components (`utils/`)
|
### Shared Components (`utils/`)
|
||||||
- `modules/` - Reusable NixOS modules (nginx, sops, borgbackup, lego, promtail, etc.)
|
- `modules/` - Reusable NixOS modules (nginx, sops, borgbackup, lego, promtail, etc.)
|
||||||
@@ -80,6 +80,13 @@ utils/pkgs/<package-name>/
|
|||||||
└── (other files like patches, lock files)
|
└── (other files like patches, lock files)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**IMPORTANT: When modifying a custom package** (patches, version updates, etc.), always test by building the package directly, not just running `test-configuration`. The configuration test only checks that the Nix expression evaluates, but doesn't verify the package actually builds:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build a custom package directly to verify it works
|
||||||
|
nix-build -E 'with import <nixpkgs> { overlays = [ (import ./utils/overlays/packages.nix) ]; config.allowUnfree = true; }; <package-name>'
|
||||||
|
```
|
||||||
|
|
||||||
## Workflow
|
## Workflow
|
||||||
|
|
||||||
**IMPORTANT: Always run `./scripts/test-configuration <hostname>` after making any changes** to verify the NixOS configuration builds successfully. This is required before committing.
|
**IMPORTANT: Always run `./scripts/test-configuration <hostname>` after making any changes** to verify the NixOS configuration builds successfully. This is required before committing.
|
||||||
@@ -87,6 +94,7 @@ utils/pkgs/<package-name>/
|
|||||||
## Conventions
|
## Conventions
|
||||||
|
|
||||||
- Nix files: two-space indentation, lower kebab-case naming
|
- Nix files: two-space indentation, lower kebab-case naming
|
||||||
- Commits: Conventional Commits format (`fix:`, `feat:`, `chore:`), scope by host when relevant (`fix(mail):`)
|
- Commits: Conventional Commits format (`fix:`, `feat:`, `chore:`), scope by host when relevant (`fix(mail):`). Do not add "Generated with Claude Code" or "Co-Authored-By: Claude" footers.
|
||||||
- Modules import via explicit paths, not wildcards
|
- Modules import via explicit paths, not wildcards
|
||||||
- Comments explain non-obvious decisions (open ports, unusual service options)
|
- Comments explain non-obvious decisions (open ports, unusual service options)
|
||||||
|
- **Never update `system.stateVersion`** - it should remain at the original installation version. To upgrade NixOS, update the `channel` file instead.
|
||||||
|
|||||||
1
hosts/amzebs-01/channel
Normal file
1
hosts/amzebs-01/channel
Normal file
@@ -0,0 +1 @@
|
|||||||
|
https://channels.nixos.org/nixos-25.11
|
||||||
@@ -3,10 +3,12 @@
|
|||||||
./utils/bento.nix
|
./utils/bento.nix
|
||||||
./utils/modules/sops.nix
|
./utils/modules/sops.nix
|
||||||
./utils/modules/nginx.nix
|
./utils/modules/nginx.nix
|
||||||
|
./utils/modules/set-nix-channel.nix
|
||||||
|
|
||||||
./modules/mysql.nix
|
./modules/mysql.nix
|
||||||
./modules/web/stack.nix
|
./modules/web/stack.nix
|
||||||
./modules/laravel-storage.nix
|
./modules/laravel-storage.nix
|
||||||
|
./modules/laravel-scheduler.nix
|
||||||
./modules/blackbox-exporter.nix
|
./modules/blackbox-exporter.nix
|
||||||
./modules/postfix.nix
|
./modules/postfix.nix
|
||||||
./modules/rspamd.nix
|
./modules/rspamd.nix
|
||||||
@@ -67,7 +69,7 @@
|
|||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowedTCPPorts = [ 22 80 443 ];
|
allowedTCPPorts = [ 22 80 443 3306 ];
|
||||||
|
|
||||||
# Allow MariaDB access only from specific IP
|
# Allow MariaDB access only from specific IP
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
@@ -75,5 +77,5 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "25.11";
|
||||||
}
|
}
|
||||||
|
|||||||
51
hosts/amzebs-01/modules/laravel-scheduler.nix
Normal file
51
hosts/amzebs-01/modules/laravel-scheduler.nix
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
# Daily scheduled Laravel artisan jobs
|
||||||
|
# Runs artisan finish:reports at 01:00 for production and staging APIs
|
||||||
|
|
||||||
|
let
|
||||||
|
php = pkgs.php82;
|
||||||
|
|
||||||
|
sites = [
|
||||||
|
{
|
||||||
|
domain = "api.ebs.amz.at";
|
||||||
|
user = "api_ebs_amz_at";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
domain = "api.stage.ebs.amz.at";
|
||||||
|
user = "api_stage_ebs_amz_at";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
mkArtisanService = site: {
|
||||||
|
name = "artisan-finish-reports-${site.domain}";
|
||||||
|
value = {
|
||||||
|
description = "Laravel artisan finish:reports for ${site.domain}";
|
||||||
|
after = [ "network.target" "mysql.service" "phpfpm-${site.domain}.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
User = site.user;
|
||||||
|
Group = "nginx";
|
||||||
|
WorkingDirectory = "/var/www/${site.domain}";
|
||||||
|
ExecStart = "${php}/bin/php artisan finish:reports";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
mkArtisanTimer = site: {
|
||||||
|
name = "artisan-finish-reports-${site.domain}";
|
||||||
|
value = {
|
||||||
|
description = "Daily timer for artisan finish:reports on ${site.domain}";
|
||||||
|
wantedBy = [ "timers.target" ];
|
||||||
|
timerConfig = {
|
||||||
|
OnCalendar = "*-*-* 01:00:00";
|
||||||
|
Persistent = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
systemd.services = builtins.listToAttrs (map mkArtisanService sites);
|
||||||
|
systemd.timers = builtins.listToAttrs (map mkArtisanTimer sites);
|
||||||
|
}
|
||||||
@@ -3,15 +3,16 @@
|
|||||||
, config
|
, config
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
{
|
let
|
||||||
# Header checks file for validating email headers
|
headerChecksFile = pkgs.writeText "header_checks" ''
|
||||||
environment.etc."postfix/header_checks".text = ''
|
|
||||||
# Warn about missing critical headers (but don't reject from localhost)
|
# Warn about missing critical headers (but don't reject from localhost)
|
||||||
# These help identify misconfigured applications
|
# These help identify misconfigured applications
|
||||||
/^$/ WARN Missing headers detected
|
/^$/ WARN Missing headers detected
|
||||||
'';
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
services.postfix = {
|
services.postfix = {
|
||||||
|
mapFiles."header_checks" = headerChecksFile;
|
||||||
enable = true;
|
enable = true;
|
||||||
hostname = "amzebs-01.amz.at";
|
hostname = "amzebs-01.amz.at";
|
||||||
domain = "amz.at";
|
domain = "amz.at";
|
||||||
@@ -34,20 +35,20 @@
|
|||||||
compatibility_level = "2";
|
compatibility_level = "2";
|
||||||
|
|
||||||
# Only accept mail from localhost
|
# Only accept mail from localhost
|
||||||
mynetworks = "127.0.0.0/8 [::1]/128";
|
mynetworks = [ "127.0.0.0/8" "[::1]/128" ];
|
||||||
|
|
||||||
# Larger message size limits for attachments
|
# Larger message size limits for attachments
|
||||||
mailbox_size_limit = "202400000"; # ~200MB
|
mailbox_size_limit = 202400000; # ~200MB
|
||||||
message_size_limit = "51200000"; # ~50MB
|
message_size_limit = 51200000; # ~50MB
|
||||||
|
|
||||||
# Ensure proper header handling
|
# Ensure proper header handling
|
||||||
# Reject mail that's missing critical headers
|
# Reject mail that's missing critical headers
|
||||||
header_checks = "regexp:/etc/postfix/header_checks";
|
header_checks = "regexp:/var/lib/postfix/conf/header_checks";
|
||||||
|
|
||||||
# Rate limiting to prevent spam-like behavior
|
# Rate limiting to prevent spam-like behavior
|
||||||
# Allow reasonable sending rates for applications
|
# Allow reasonable sending rates for applications
|
||||||
smtpd_client_message_rate_limit = "100";
|
smtpd_client_message_rate_limit = 100;
|
||||||
smtpd_client_recipient_rate_limit = "200";
|
smtpd_client_recipient_rate_limit = 200;
|
||||||
|
|
||||||
# Milter configuration is handled automatically by rspamd.postfix.enable
|
# Milter configuration is handled automatically by rspamd.postfix.enable
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
https://channels.nixos.org/nixos-25.05
|
https://channels.nixos.org/nixos-25.11
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
./utils/modules/victoriametrics
|
./utils/modules/victoriametrics
|
||||||
./utils/modules/promtail
|
./utils/modules/promtail
|
||||||
./utils/modules/borgbackup.nix
|
./utils/modules/borgbackup.nix
|
||||||
|
./utils/modules/set-nix-channel.nix
|
||||||
|
|
||||||
# fw
|
# fw
|
||||||
./modules/network-prefix.nix
|
./modules/network-prefix.nix
|
||||||
@@ -103,7 +104,7 @@
|
|||||||
|
|
||||||
time.timeZone = "Europe/Vienna";
|
time.timeZone = "Europe/Vienna";
|
||||||
|
|
||||||
services.logind.extraConfig = "RuntimeDirectorySize=2G";
|
services.logind.settings.Login.RuntimeDirectorySize = "2G";
|
||||||
|
|
||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
|
|||||||
@@ -19,21 +19,19 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# n8n service configuration
|
# n8n service configuration
|
||||||
services.n8n = {
|
services.n8n.enable = true;
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
database.type = "postgresdb";
|
|
||||||
database.postgresdb.host = "/run/postgresql";
|
|
||||||
database.postgresdb.database = "n8n";
|
|
||||||
database.postgresdb.user = "n8n";
|
|
||||||
executions.pruneData = true;
|
|
||||||
executions.pruneDataMaxAge = 168; # 7 days
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Configure git integration via environment variables
|
# Configure n8n via environment variables
|
||||||
systemd.services.n8n = {
|
systemd.services.n8n = {
|
||||||
environment = lib.mkForce {
|
environment = lib.mkForce {
|
||||||
|
# Database configuration (migrated from services.n8n.settings)
|
||||||
|
DB_TYPE = "postgresdb";
|
||||||
|
DB_POSTGRESDB_HOST = "/run/postgresql";
|
||||||
|
DB_POSTGRESDB_DATABASE = "n8n";
|
||||||
|
DB_POSTGRESDB_USER = "n8n";
|
||||||
|
EXECUTIONS_DATA_PRUNE = "true";
|
||||||
|
EXECUTIONS_DATA_MAX_AGE = "168"; # 7 days
|
||||||
|
# Other settings
|
||||||
N8N_ENCRYPTION_KEY = ""; # Will be set via environmentFile
|
N8N_ENCRYPTION_KEY = ""; # Will be set via environmentFile
|
||||||
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
|
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
|
||||||
N8N_DIAGNOSTICS_ENABLED = "false";
|
N8N_DIAGNOSTICS_ENABLED = "false";
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
https://channels.nixos.org/nixos-25.05
|
https://channels.nixos.org/nixos-25.11
|
||||||
|
|||||||
@@ -240,11 +240,11 @@ in
|
|||||||
|
|
||||||
sops.secrets.dovecot-ldap-password = { };
|
sops.secrets.dovecot-ldap-password = { };
|
||||||
|
|
||||||
systemd.services.dovecot2.preStart = ''
|
systemd.services.dovecot.preStart = ''
|
||||||
sed -e "s/@ldap-password@/$(cat ${config.sops.secrets.dovecot-ldap-password.path})/" ${ldapConfig} > /run/dovecot2/ldap.conf
|
sed -e "s/@ldap-password@/$(cat ${config.sops.secrets.dovecot-ldap-password.path})/" ${ldapConfig} > /run/dovecot2/ldap.conf
|
||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.services.dovecot2 = {
|
systemd.services.dovecot = {
|
||||||
wants = [ "acme-imap.${domain}.service" ];
|
wants = [ "acme-imap.${domain}.service" ];
|
||||||
after = [ "acme-imap.${domain}.service" ];
|
after = [ "acme-imap.${domain}.service" ];
|
||||||
};
|
};
|
||||||
@@ -257,7 +257,7 @@ in
|
|||||||
"imap-test.${domain}"
|
"imap-test.${domain}"
|
||||||
"imap-02.${domain}"
|
"imap-02.${domain}"
|
||||||
];
|
];
|
||||||
postRun = "systemctl --no-block restart dovecot2.service";
|
postRun = "systemctl --no-block restart dovecot.service";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ in {
|
|||||||
olcTLSCACertificateFile = "/var/lib/acme/ldap.${domain}/full.pem";
|
olcTLSCACertificateFile = "/var/lib/acme/ldap.${domain}/full.pem";
|
||||||
olcTLSCertificateFile = "/var/lib/acme/ldap.${domain}/cert.pem";
|
olcTLSCertificateFile = "/var/lib/acme/ldap.${domain}/cert.pem";
|
||||||
olcTLSCertificateKeyFile = "/var/lib/acme/ldap.${domain}/key.pem";
|
olcTLSCertificateKeyFile = "/var/lib/acme/ldap.${domain}/key.pem";
|
||||||
olcTLSCipherSuite = "HIGH:MEDIUM:+3DES:+RC4:+aNULL";
|
olcTLSCipherSuite = "HIGH:!aNULL:!MD5:!3DES:!RC4";
|
||||||
olcTLSCRLCheck = "none";
|
olcTLSCRLCheck = "none";
|
||||||
olcTLSVerifyClient = "never";
|
olcTLSVerifyClient = "never";
|
||||||
olcTLSProtocolMin = "3.1";
|
olcTLSProtocolMin = "3.3";
|
||||||
olcSecurity = "tls=1";
|
olcSecurity = "tls=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -128,16 +128,16 @@ in
|
|||||||
compatibility_level = "2";
|
compatibility_level = "2";
|
||||||
|
|
||||||
# bigger attachement size
|
# bigger attachement size
|
||||||
mailbox_size_limit = "202400000";
|
mailbox_size_limit = 202400000;
|
||||||
message_size_limit = "51200000";
|
message_size_limit = 51200000;
|
||||||
smtpd_helo_required = "yes";
|
smtpd_helo_required = "yes";
|
||||||
smtpd_delay_reject = "yes";
|
smtpd_delay_reject = "yes";
|
||||||
strict_rfc821_envelopes = "yes";
|
strict_rfc821_envelopes = "yes";
|
||||||
|
|
||||||
# send Limit
|
# send Limit
|
||||||
smtpd_error_sleep_time = "1s";
|
smtpd_error_sleep_time = "1s";
|
||||||
smtpd_soft_error_limit = "10";
|
smtpd_soft_error_limit = 10;
|
||||||
smtpd_hard_error_limit = "20";
|
smtpd_hard_error_limit = 20;
|
||||||
|
|
||||||
smtpd_use_tls = "yes";
|
smtpd_use_tls = "yes";
|
||||||
smtp_tls_note_starttls_offer = "yes";
|
smtp_tls_note_starttls_offer = "yes";
|
||||||
@@ -151,14 +151,13 @@ in
|
|||||||
smtpd_tls_key_file = "/var/lib/acme/mail.cloonar.com/key.pem";
|
smtpd_tls_key_file = "/var/lib/acme/mail.cloonar.com/key.pem";
|
||||||
smtpd_tls_CAfile = "/var/lib/acme/mail.cloonar.com/fullchain.pem";
|
smtpd_tls_CAfile = "/var/lib/acme/mail.cloonar.com/fullchain.pem";
|
||||||
|
|
||||||
smtpd_tls_dh512_param_file = config.security.dhparams.params.postfix512.path;
|
|
||||||
smtpd_tls_dh1024_param_file = config.security.dhparams.params.postfix2048.path;
|
smtpd_tls_dh1024_param_file = config.security.dhparams.params.postfix2048.path;
|
||||||
|
|
||||||
smtpd_tls_session_cache_database = ''btree:''${data_directory}/smtpd_scache'';
|
smtpd_tls_session_cache_database = ''btree:''${data_directory}/smtpd_scache'';
|
||||||
smtpd_tls_mandatory_protocols = "!SSLv2,!SSLv3,!TLSv1,!TLSv1.1";
|
smtpd_tls_mandatory_protocols = "!SSLv2,!SSLv3,!TLSv1,!TLSv1.1";
|
||||||
smtpd_tls_protocols = "!SSLv2,!SSLv3,!TLSv1,!TLSv1.1";
|
smtpd_tls_protocols = "!SSLv2,!SSLv3,!TLSv1,!TLSv1.1";
|
||||||
smtpd_tls_mandatory_ciphers = "medium";
|
smtpd_tls_mandatory_ciphers = "medium";
|
||||||
tls_medium_cipherlist = "AES128+EECDH:AES128+EDH";
|
tls_medium_cipherlist = "ECDHE+AESGCM:DHE+AESGCM:ECDHE+CHACHA20:DHE+CHACHA20";
|
||||||
|
|
||||||
# authentication
|
# authentication
|
||||||
smtpd_sasl_auth_enable = "yes";
|
smtpd_sasl_auth_enable = "yes";
|
||||||
@@ -225,8 +224,7 @@ in
|
|||||||
|
|
||||||
security.dhparams = {
|
security.dhparams = {
|
||||||
enable = true;
|
enable = true;
|
||||||
params.postfix512.bits = 512;
|
params.postfix2048.bits = 2048;
|
||||||
params.postfix2048.bits = 1024;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
security.acme.certs."mail.${domain}" = {
|
security.acme.certs."mail.${domain}" = {
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ in
|
|||||||
|
|
||||||
# systemd.services.rspamd.serviceConfig.SupplementaryGroups = [ "redis-rspamd" ];
|
# systemd.services.rspamd.serviceConfig.SupplementaryGroups = [ "redis-rspamd" ];
|
||||||
|
|
||||||
systemd.services.dovecot2.preStart = ''
|
systemd.services.dovecot.preStart = ''
|
||||||
mkdir -p /var/lib/dovecot/sieve/
|
mkdir -p /var/lib/dovecot/sieve/
|
||||||
for i in ${sieve-spam-filter}/share/sieve-rspamd-filter/*.sieve; do
|
for i in ${sieve-spam-filter}/share/sieve-rspamd-filter/*.sieve; do
|
||||||
dest="/var/lib/dovecot/sieve/$(basename $i)"
|
dest="/var/lib/dovecot/sieve/$(basename $i)"
|
||||||
|
|||||||
60
hosts/nas/STORAGE.md
Normal file
60
hosts/nas/STORAGE.md
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
# NAS Storage Notes
|
||||||
|
|
||||||
|
## Current Issue: XFS Metadata Overhead
|
||||||
|
|
||||||
|
The XFS filesystem on `/var/lib/multimedia` uses ~100GB more than the actual file data due to metadata overhead.
|
||||||
|
|
||||||
|
### Root Cause
|
||||||
|
|
||||||
|
The filesystem was created with advanced features enabled:
|
||||||
|
|
||||||
|
```
|
||||||
|
rmapbt=1 # Reverse mapping btree - tracks block ownership
|
||||||
|
reflink=1 # Copy-on-write support
|
||||||
|
```
|
||||||
|
|
||||||
|
These features add metadata that scales with **filesystem size**, not file count. On a 5TB filesystem with 700GB of data, this results in ~100GB (~2%) overhead.
|
||||||
|
|
||||||
|
### Diagnostic Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Compare file data vs filesystem usage
|
||||||
|
du -sh /var/lib/multimedia # Actual file data
|
||||||
|
df -h /var/lib/multimedia # Filesystem reports
|
||||||
|
|
||||||
|
# Check XFS features
|
||||||
|
xfs_info /var/lib/multimedia
|
||||||
|
|
||||||
|
# Verify block allocation
|
||||||
|
xfs_db -r -c "freesp -s" /dev/mapper/vg--data-lv--multimedia
|
||||||
|
```
|
||||||
|
|
||||||
|
## Recommendation: LVM + ext4
|
||||||
|
|
||||||
|
For media storage (write-once, read-many), ext4 with minimal reserved space offers the lowest overhead:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Create filesystem with 0% reserved blocks
|
||||||
|
mkfs.ext4 -m 0 /dev/vg/lv
|
||||||
|
|
||||||
|
# Or adjust existing ext4
|
||||||
|
tune2fs -m 0 /dev/vg/lv
|
||||||
|
```
|
||||||
|
|
||||||
|
### Why ext4 over XFS for this use case
|
||||||
|
|
||||||
|
| Consideration | ext4 | XFS (current) |
|
||||||
|
|---------------|------|---------------|
|
||||||
|
| Reserved space | 0% with `-m 0` | N/A |
|
||||||
|
| Metadata overhead | ~0.5% | ~2% (with rmapbt) |
|
||||||
|
| Shrink support | Yes | No |
|
||||||
|
| Performance for 4K stream | Identical | Identical |
|
||||||
|
|
||||||
|
A single 4K remux stream requires ~12 MB/s. Any filesystem handles this trivially.
|
||||||
|
|
||||||
|
## Migration Path
|
||||||
|
|
||||||
|
1. Backup data from XFS volumes
|
||||||
|
2. Recreate LVs with ext4 (`mkfs.ext4 -m 0`)
|
||||||
|
3. Restore data
|
||||||
|
4. Update `/etc/fstab` or NixOS `fileSystems` config
|
||||||
1
hosts/nas/channel
Normal file
1
hosts/nas/channel
Normal file
@@ -0,0 +1 @@
|
|||||||
|
https://channels.nixos.org/nixos-25.11
|
||||||
@@ -9,6 +9,7 @@ in {
|
|||||||
"${impermanence}/nixos.nix"
|
"${impermanence}/nixos.nix"
|
||||||
./utils/bento.nix
|
./utils/bento.nix
|
||||||
./utils/modules/sops.nix
|
./utils/modules/sops.nix
|
||||||
|
./utils/modules/set-nix-channel.nix
|
||||||
./utils/modules/victoriametrics
|
./utils/modules/victoriametrics
|
||||||
./utils/modules/promtail
|
./utils/modules/promtail
|
||||||
|
|
||||||
@@ -76,6 +77,12 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# System packages
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
vim
|
||||||
|
screen
|
||||||
|
];
|
||||||
|
|
||||||
# Nix settings
|
# Nix settings
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@@ -24,12 +24,14 @@
|
|||||||
"i915.enable_fbc=1" # Frame buffer compression
|
"i915.enable_fbc=1" # Frame buffer compression
|
||||||
];
|
];
|
||||||
|
|
||||||
# RAID 1 array for data storage
|
# RAID 1 arrays for data storage
|
||||||
boot.swraid = {
|
boot.swraid = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mdadmConf = ''
|
mdadmConf = ''
|
||||||
DEVICE /dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52TBSB-part1
|
DEVICE /dev/disk/by-id/nvme-KIOXIA-EXCERIA_PLUS_G3_SSD_7FJKS1MAZ0E7-part1
|
||||||
DEVICE /dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52V9QX-part1
|
DEVICE /dev/disk/by-id/nvme-KIOXIA-EXCERIA_PLUS_G3_SSD_7FJKS1M9Z0E7-part1
|
||||||
|
DEVICE /dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_8582A01SF4MJ-part1
|
||||||
|
DEVICE /dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_75V2A0H3F4MJ-part1
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -84,14 +86,13 @@
|
|||||||
|
|
||||||
# LVM volumes on RAID array
|
# LVM volumes on RAID array
|
||||||
fileSystems."/var/lib/downloads" = {
|
fileSystems."/var/lib/downloads" = {
|
||||||
device = "/dev/vg-data/lv-downloads";
|
device = "/dev/vg-data-fast/downloads";
|
||||||
fsType = "xfs";
|
fsType = "ext4";
|
||||||
options = [ "noatime" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/var/lib/multimedia" = {
|
fileSystems."/var/lib/multimedia" = {
|
||||||
device = "/dev/vg-data/lv-multimedia";
|
device = "/dev/vg-data-slow/multimedia";
|
||||||
fsType = "xfs";
|
fsType = "ext4";
|
||||||
options = [ "noatime" ];
|
options = [ "noatime" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ let
|
|||||||
disks = [
|
disks = [
|
||||||
"/dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52TBSB"
|
"/dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52TBSB"
|
||||||
"/dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52V9QX"
|
"/dev/disk/by-id/ata-ST18000NM000J-2TV103_ZR52V9QX"
|
||||||
|
"/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_8582A01SF4MJ"
|
||||||
|
"/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_75V2A0H3F4MJ"
|
||||||
|
"/dev/disk/by-id/nvme-KIOXIA-EXCERIA_PLUS_G3_SSD_7FJKS1MAZ0E7"
|
||||||
|
"/dev/disk/by-id/nvme-KIOXIA-EXCERIA_PLUS_G3_SSD_7FJKS1M9Z0E7"
|
||||||
];
|
];
|
||||||
|
|
||||||
textfileDir = "/var/lib/prometheus-node-exporter";
|
textfileDir = "/var/lib/prometheus-node-exporter";
|
||||||
@@ -40,12 +44,16 @@ let
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Resolve symlink to get actual device
|
# Resolve symlink to get actual device (needed for hdparm/smartctl)
|
||||||
device=$(readlink -f "$disk")
|
device=$(readlink -f "$disk")
|
||||||
short_name=$(basename "$device")
|
|
||||||
|
|
||||||
# Extract serial from disk ID for labels
|
# Extract model+serial from disk-by-id path for stable labeling
|
||||||
serial=$(basename "$disk" | sed 's/ata-ST18000NM000J-2TV103_//')
|
# ata-ST18000NM000J-2TV103_ZR52TBSB → ST18000NM000J-2TV103-ZR52TBSB
|
||||||
|
# nvme-KIOXIA-EXCERIA_PLUS_G3_SSD_7FJKS1MAZ0E7 → KIOXIA-EXCERIA_PLUS_G3_SSD-7FJKS1MAZ0E7
|
||||||
|
disk_id=$(basename "$disk")
|
||||||
|
serial=$(echo "$disk_id" | sed 's/.*_//')
|
||||||
|
model=$(echo "$disk_id" | sed 's/^[^-]*-//; s/_[^_]*$//')
|
||||||
|
short_name="$model-$serial"
|
||||||
|
|
||||||
# Check power state without waking disk
|
# Check power state without waking disk
|
||||||
power_state=$(${pkgs.hdparm}/bin/hdparm -C "$device" 2>/dev/null | grep -oP '(standby|active/idle|active|idle)' | head -1 || echo "unknown")
|
power_state=$(${pkgs.hdparm}/bin/hdparm -C "$device" 2>/dev/null | grep -oP '(standby|active/idle|active|idle)' | head -1 || echo "unknown")
|
||||||
|
|||||||
@@ -15,5 +15,10 @@
|
|||||||
ACTION=="add", KERNEL=="sd[a-z]", SUBSYSTEM=="block", \
|
ACTION=="add", KERNEL=="sd[a-z]", SUBSYSTEM=="block", \
|
||||||
ATTRS{model}=="ST18000NM000J*", \
|
ATTRS{model}=="ST18000NM000J*", \
|
||||||
RUN+="${pkgs.hdparm}/bin/hdparm -B 127 -S 180 /dev/%k"
|
RUN+="${pkgs.hdparm}/bin/hdparm -B 127 -S 180 /dev/%k"
|
||||||
|
|
||||||
|
# Toshiba 20TB NAS drives - same settings
|
||||||
|
ACTION=="add", KERNEL=="sd[a-z]", SUBSYSTEM=="block", \
|
||||||
|
ATTRS{model}=="TOSHIBA MG10ACA2*", \
|
||||||
|
RUN+="${pkgs.hdparm}/bin/hdparm -B 127 -S 180 /dev/%k"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
# Disk mapping: ata port -> LED name
|
# Disk mapping: ata port -> LED name
|
||||||
# DXP4800 has bays 1-4, currently bays 2 and 4 are populated
|
# DXP4800 has bays 1-4, all populated
|
||||||
diskMapping = {
|
diskMapping = {
|
||||||
# ata-2 (sdb) -> disk2
|
"1" = "disk1";
|
||||||
"2" = "disk2";
|
"2" = "disk2";
|
||||||
# ata-4 (sdc) -> disk4
|
"3" = "disk3";
|
||||||
"4" = "disk4";
|
"4" = "disk4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,48 +1,48 @@
|
|||||||
pyload-extraction-passwords: ENC[AES256_GCM,data:M4ONmZXoSg==,iv:9+NEibTSoJwZ2uLJZZzQtJHMNtR084CCyBXq7ORqxI0=,tag:QE2QMlxycK+OJWgiLWKlRA==,type:str]
|
pyload-extraction-passwords: ENC[AES256_GCM,data:rYlrVlEpPw0ZH9MgH3zrWk9vERGN9BAiq7Luspxlf6gYFZvRfK/McA==,iv:+bVb7Km4e8x1jK3hB2aULWPfNlJzBTrOYvfpIYcLAh8=,tag:zgIQ8nG8CpI8+E2gMthkJw==,type:str]
|
||||||
cyberghost-auth: ENC[AES256_GCM,data:ZX+vfTcIH/8QMOIpIFdYV71sYBS5MA==,iv:4TeDcMs+lz7N6myLwZ9pG8mwzDzjWBpyi2CpsUtcaoc=,tag:RM24rTag4RfgPWKfrX3fnw==,type:str]
|
cyberghost-auth: ENC[AES256_GCM,data:v9RP+XTZv6llTaIiE7EzEgtNxJyCBw==,iv:hPlJ8UvAtlOTfWikd4NxcfkB8IA3EMzURWkjl0tYC1E=,tag:hEbN6u2QFt1hgw0SioXu2g==,type:str]
|
||||||
cyberghost-ca: ENC[AES256_GCM,data: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,iv:inCj141jhzAAUXPHYPyfWV34XLOs3IzZDu7F86zTCyA=,tag:r5Gg4q1B8SammluvIi+nxA==,type:str]
|
cyberghost-ca: ENC[AES256_GCM,data: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,iv:Vr9+Rqu+TR7AT4mdPFjDwjId0jxRD9GtFn/j4HRS8po=,tag:W9KGh26VKhQOcBwIel1lXw==,type:str]
|
||||||
cyberghost-cert: ENC[AES256_GCM,data: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,iv:TvtZ8/eeeUwMq07nl+fx7ixkifN06shxcyV7vIs5zvU=,tag:fZXmrkIvQ1ZH3aqkkfLLIQ==,type:str]
|
cyberghost-cert: ENC[AES256_GCM,data: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,iv:8QIh1mro4XQRVNA3jdpEYwQduIHQANvx0EDd4+jXGuo=,tag:UWxbmmtvDnU61YyKV5OgNw==,type:str]
|
||||||
cyberghost-key: ENC[AES256_GCM,data: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,iv:moUhCD9vW2fREB1hXGyP3ha4PEzXWhbW3kI0x1KWxVA=,tag:UIW2trbJ2g6nkU7IfI06fA==,type:str]
|
cyberghost-key: ENC[AES256_GCM,data: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,iv:coMt1mZj0pVnNEfxStG6NCg6BcC6jloahDWmBTu9ASs=,tag:V2PGkbP2RCHpWoWHeA4CBA==,type:str]
|
||||||
filebot-license: ENC[AES256_GCM,data:oOVGag9rzJkgPb7Sic+nVg6n//3E7o0BLamF5ugXCdKYVoEw1koZWrB8kVwAmGAmzgpT98gMmWFvej5eZBlTR1CDV/ZFJHE5nr+1b7RhcVrzxVfkanpr6JOu3JJ2TDx+z6+JyuZsoHQe6zGIlyz1DO1/+tgYChEInZB+apFvbEsKzwT92yQztaJ2TivjCwcxhjZR9lnFTQWvTsZZ8Fatwi03FsbHNkz5UdlKZ+N8yFJoKc7a2+UrnV91ClfGpvOpaGfmgls7Uen69LPb2TLujhc1W+WBOwvzgWrrG4+KF+4yMtJ0apVJd5iBKq2zZwZo6EdC8Ynv8DqJOhTrjScoVCZ+xPEmcZGuOa0y1bEFYcDO31Y8iyVEUpfMfyyjFIWIm6IGkPDP3tWQWAQIIhlsYbRipKKN7aCaetg/ib33q2M0M1XFME2IBVEZMyEJ/PMt+qi0CUJqx+S2nxqEB8jNnJTXc+ANJfiJ1YdgtG67wLCdzrDTkDPT/HEIvTUumwWSLdZnXvfqvB4f5ZO20vPN8S66EgGZeWU3x/HXqV6MSQSLOOtySP3kY3gn/hSWIo9JB+63BEgdI1WvqlkA4wBB7kHuA6YqBR9ofODUt3ae7X7qbVcimGN9fRBtKny5u9A04/+gJ9BhWsaQruX2EPvIb/evxmYqFvg+suvBPu50KExmdjXPJJsRgR6dwYyxXwVOtbrFhKIK17e7s3+DyXrYWhMGOfUOpl4ew377E4YHjLBm1r5WtU46NfK4TA1rDVTSlBXOfV6Hmhs3ThUhNJ3sgHzrrQiEZcC0Of+4RBLhKNMTgOO39Tjz48BAYObBxw2F3oiLT9RBXFAz5ebwxzf6ciBwjEi4Bf76rIcE2RTdiA90J4NsDTsFNoknEIxqvHE=,iv:dbmC8UBE1dwCBSWcYg94mBvdq6Xi+nBweMWlvvnxN9k=,tag:UQZ6rlM3loJg4vxav7dg+A==,type:str]
|
filebot-license: ENC[AES256_GCM,data:RM7VFeecAEN/vcMidDgQU2ghD3ujUax4XXS/1ilDlKZ5WeimNRDhdvx/cJyGsXpcR0vsiqhJhVVX8/0+4IVnFgyVd6MSFwdWf09mUEqB0TdjvHpn7InIuD0N9K6uQUWDUntyk+K6QkTVIvvT3dy4dU/evbhySCyccODvQdNFPFYCPDXb3dQvQpQaYU3EYVJhgWs8ZCYxRTVIBbzX71jjaSPHZDm+pdzC+CC2Wc8Ro8mCWqkdGKUrgMOxFeeghMkbj+QMg+B1yzuCUdFGIvNQKdlJzVjKjSpAgu8PhwxpPP6DqTP0oPtjyT9ZkUS982RdgykPSaIy2z2glfgKkrANCkQVvLGlG487tGhiRo4tzSyG9G/aExWrHYsRBroWsLMLX7Ca+l7DnUhyXRPVMdWWf8oQtunouh5K+oCexg14fKXUAexezKj1elyxGy/Qz2hIOeVkNzdKVTW4TTYDyRukFDvc4LN0DkfyXYGYM70KwEVyJO7lNmHdOIX4gFU5Kzcl1RRaDvaq6oqpNyW8q5WOi/JbOnbNP1+o8wb3iGAmh3cMr8Mu+2o/Z5rf+Q5WSbtiB59N1vqFrc6wz8CRPpyp/GTkFhuepjabWAPSG889H51u9+MRZhGyP1N6AGs8Vqjrk5f+qg46Fg3p9R2r6RL2zNrcRE4VBR9nLgVDyybvw4ZvUGUKbVyuT00TwN3NdlNahPd1OsXczQbKx3//ThwYEQcRfHo1wRFw7aZT8atGhCG9UUuSJTS8boiI6HbnL0NjTttLeTlTeoCpTrwaFzN2igqLVFMylic/xOAnmXY1kX7lVV5m+djLIQpdHZXJbM4TXTKu6fozVTSgr5fPzI+C1SXKGtltOX5QUQ5PmP8KqJMNtR+W298u0AKe6RbmR/s=,iv:2AlDfURrGXEs8tjpi5E2X7HSUXFVEGPf3hzpc84jE6I=,tag:+RwlLLHNe5Fkf3Np6cxw/Q==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age14grjcxaq4h55yfnjxvnqhtswxhj9sfdcvyas4lwvpa8py27pjy2sv3g6v7
|
- recipient: age14grjcxaq4h55yfnjxvnqhtswxhj9sfdcvyas4lwvpa8py27pjy2sv3g6v7
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvZW5uSzROdXE0R2VLOGlG
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVbGZhQ0J3bW5Pa3VFck5R
|
||||||
WXhTVW0rOGt0a1RRQzZaSlNNOWgydEN0cGxZClA0K0JnRnVmNTM3TGVRL25xT2pH
|
ODBWUjA0Qm9TZUNPaEdEMDR1OXMxbFloQlFnClQ2YUlacGlTMnl2TCs1TDAwb0pL
|
||||||
aTFld0ZDRERvb2NrVkJkbldWemtUQ0kKLS0tIENmTktaK2tJZmNCWWtPTDR4Q2JG
|
NmFLNVA5VkJDbzBqUE1LbXlKR3NDV2MKLS0tIHNnYmZ4aTREdW1wdXAzbTZ4U2tJ
|
||||||
MTY4dW52aXYzQmhOMjJnYnhCZXZxSzQKVaw9iZSG3MX4a8qfPqeN4VuEjHXX8L8J
|
RDJHZFkxRG9YRE43NURBa2dub0xzdE0KdukLUA5deF7z4jpVWb/JkkB/0PrCLujX
|
||||||
hn9nk5yHIOYjhmB8y1+Zoe/12+w4qHHF/yudnU+9oJCEcOvafhK83A==
|
ycweOSdwDe/ceME9rnckFISyQ++4g2aRVvUwaKl5thu5cl9p+2MDMQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
- recipient: age1exny8unxynaw03yu8ppahu5z28uermghr8ag34e7kdqnaduq9stsyettzz
|
- recipient: age1exny8unxynaw03yu8ppahu5z28uermghr8ag34e7kdqnaduq9stsyettzz
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVZy9vTVRIdElJZ3R4ckNN
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoeDdHNXU1cGRXaERQZ2Rt
|
||||||
aXhCS216Q0pjSGVERXRVVVE0Tng2cmhXZUhnCjliWEROcjh0NU1VUlpXNmtuOGxr
|
WGNtSHZRTTZYNmJ6WE5WMXkwQUFCcXcyeWpBCitPeHlJUVRYb2dlZDd4S3hqMmFP
|
||||||
cjNyeFFRNVRsUCs4emlHaVd0b0lzME0KLS0tIGw4ZE11M01uQjhUMUJNMnlyNXBM
|
T1F1bUFpOGZTclBYazlYeW1FYlVSZk0KLS0tIDRUeEdlRUdjdjZnSmlBR1VYb0s3
|
||||||
VkREd3FvRUVwOUNSa1lMMUZQdU5aK0EK/RUCQuPK/mgFfjqStVapOD/XpTVe63OY
|
Q2VDbnMvVHlVT1JPR0xOZ0psRVY4cGMK+hTtRCa1DdmmxrKi/M1PF6izWHhkFnIl
|
||||||
9z9I3LLD54OlkQFyK1oPXxnMmjo0QezA+30E6rcxKERoe5N55ffxUA==
|
3P1nR7qDtVcnV4NrAp0IyY0NN+F3JgMqK1u9CoBpNtaUifZk67oqew==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
- recipient: age1v6p8dan2t3w9h94fz4flldl32082j3s9x6zqq7u5j66keth9aphsd6pvch
|
- recipient: age1v6p8dan2t3w9h94fz4flldl32082j3s9x6zqq7u5j66keth9aphsd6pvch
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNNDJzbGRGTC9ibEYwb0VE
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZXhGZ01nNHg2YS9iOTlq
|
||||||
Z1BXcU42YmsxTTMvQzZUYmpWM29PaDFTeFZBCkV0MHhKdjdLaitGZ0RGRHdnQlI2
|
aW5zMnFyaGF5U2xhKzhMM3NPVFI4QXhxUmpzCnpNL25wVkgyMEhKcXUwZlc1T2pZ
|
||||||
KysvSk0rbS9PazAzOVRoSjNQSEordEEKLS0tIFlQNnJ0a1dzbDR5NVVkM3JxMzVq
|
b3RtWGJXVTJjWXdId0xUQ3ltYTgwUFUKLS0tIEZ5cjV3OVh2a1g5bGk3TzdDMEdn
|
||||||
bjBGUW5SQ3lVMW9BV3lzVklISHVrOFkKkkQTxWMLVzt6XGdu+WdphYigSzeeoIWr
|
S3FnSUFvZG95ZDk0d1lsdFhSclZMN1kKWJ/G7punUyloNy1rPk0FW8lL3A1xojpy
|
||||||
ImJuy1oXVd69XK4KUkXOrg4XfeKXXjslAHTVVI0+PFnDaM4SBC1h3Q==
|
lEdKj2GK5ml9HAi/aRb3AmSyBXnpjyMAX6piCa3a+ixzCve/ttwjMA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
- recipient: age1x3elhtccp4u8ha5ry32juj9fkpg0qg7qqx4gduuehgwwnnhcxp8s892hek
|
- recipient: age1x3elhtccp4u8ha5ry32juj9fkpg0qg7qqx4gduuehgwwnnhcxp8s892hek
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZTXdqdVd6ZmxtYSsrWDA0
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHOFI0Y3U3S3NTUXZZRnBl
|
||||||
WWtzZEhuVWxCNkZwbjJJcDBSU0t0cEpjRkRJCkp4TkRqeUJiVnBFS0pkdEM3eEpx
|
U2V2Y1pnQ0lzb1RFZkUrcGhERTk2bUpIWlNVCnY4WHpQemdoczNtN1VHa095ai9N
|
||||||
K2JlN2lSQ3NWdzd1R1NoYTVmSzByajQKLS0tIFB4ZHA1WG1DU29CbWlTSlAxdDA2
|
TEltU1c0cDNRWDVjTXFKVHp2a1M1QUEKLS0tIGF6VzNCait4QU1MdGI0T2x4dU0v
|
||||||
Um9vMWRwQWk4VGF6eExMU2FvMjJSblUK/XiDETNk97IvN9A3yP+sfRxQMO2bXXdm
|
aWsyT0hTWUU1N3RxUStRditOWFNJT0UKtCOhjZ1q0FaTZekXUh3JpLxL+K9+I6x+
|
||||||
GDODc3E65x7Gftbvu44KS9UARFPzj32W+JhE0k/C+ihECUzz3ChyLg==
|
WxAKrhw9vpCiUs2UQkr+xYh8lwIR+qVpcDn6LRlq0WqW1PhypR8L2g==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-11-30T18:50:08Z"
|
lastmodified: "2025-12-04T22:54:18Z"
|
||||||
mac: ENC[AES256_GCM,data:A7cQQgB6RMe3JdGSv7SjHrD9eoEY86ElfjIUp2PtYdzDiQfrxTsJf962P/IRRWdMn7cCwQDNwxJkiZCRZ7lv/iDznvibC+0FGkGIiFvbkIK88hr7hqvpzf/CQOpNvyvXfJb1Y13R00mSfNzJw7xo98IjZYlsLAAFxpapCbUV7Bc=,iv:/Gmq6AnMGVy7QKjvruFs8c3WcbGxW61P7VjYT2u2ooc=,tag:BT9gv7ebsWEpSARCI97rqg==,type:str]
|
mac: ENC[AES256_GCM,data:mIcIvHI6RsXMGJ0W6YgtpNLtXd4xOF2PelnGcCCR/EhyVHr6sTGItkvlzWpPjGjZ1t4mgCS8J9t228BU6OIBW/liOAA+1G8P09PNq/FKRnQuXUz3Q1aLawtk6gTWMdkxQ01Wr7P+nWzFcZ4Qi9TktYS0Omu7l+JmUrd0KoY4xdI=,iv:WcquzmjFd6fXj59oRwYMjYnFegn9eVw+vLKDzpf0lw0=,tag:QY6sEBkzT3HhWXQtsaKF3Q==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.11.0
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
https://channels.nixos.org/nixos-25.05
|
https://channels.nixos.org/nixos-25.11
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
|
services.desktopManager.gnome.extraGSettingsOverrides = ''
|
||||||
[org.gnome.desktop.interface]
|
[org.gnome.desktop.interface]
|
||||||
cursor-size=24
|
cursor-size=24
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -115,7 +115,7 @@
|
|||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
vaapiVdpau
|
libva-vdpau-driver
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
libva
|
libva
|
||||||
libva-utils
|
libva-utils
|
||||||
|
|||||||
@@ -26,14 +26,13 @@ in
|
|||||||
description = "Bitwarden Desktop";
|
description = "Bitwarden Desktop";
|
||||||
after = [ "graphical-session.target" "network-online.target" ];
|
after = [ "graphical-session.target" "network-online.target" ];
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
serviceConfig.ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
|
serviceConfig.ExecStart = "${pkgs.bitwarden-desktop}/bin/bitwarden-desktop";
|
||||||
serviceConfig.Restart = "on-abort";
|
serviceConfig.Restart = "on-abort";
|
||||||
};
|
};
|
||||||
|
|
||||||
#### Handy tools #############################################################
|
#### Handy tools #############################################################
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
goldwarden
|
bitwarden-desktop
|
||||||
bitwarden
|
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
fprintd
|
fprintd
|
||||||
lxqt.lxqt-policykit
|
lxqt.lxqt-policykit
|
||||||
|
|||||||
@@ -57,10 +57,10 @@ in {
|
|||||||
netflix
|
netflix
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
onlyoffice-bin
|
onlyoffice-desktopeditors
|
||||||
obs-studio
|
obs-studio
|
||||||
pavucontrol
|
pavucontrol
|
||||||
pinentry
|
pinentry-gnome3
|
||||||
rbw
|
rbw
|
||||||
rofi-rbw
|
rofi-rbw
|
||||||
swayimg
|
swayimg
|
||||||
@@ -103,7 +103,7 @@ in {
|
|||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
nerd-fonts._0xproto
|
nerd-fonts._0xproto
|
||||||
nerd-fonts.droid-sans-mono
|
nerd-fonts.droid-sans-mono
|
||||||
open-sans
|
open-sans
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ in {
|
|||||||
nixpkgs.config.android_sdk.accept_license = true;
|
nixpkgs.config.android_sdk.accept_license = true;
|
||||||
|
|
||||||
programs.adb.enable = true; # sets up udev + adb group
|
programs.adb.enable = true; # sets up udev + adb group
|
||||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
# android-udev-rules removed in 25.11 - superseded by built-in systemd uaccess rules
|
||||||
|
|
||||||
users.users.dominik.extraGroups = [ "adbusers" ];
|
users.users.dominik.extraGroups = [ "adbusers" ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ in {
|
|||||||
rbw
|
rbw
|
||||||
sops
|
sops
|
||||||
unzip
|
unzip
|
||||||
|
uv
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
@@ -52,11 +53,6 @@ in {
|
|||||||
# Socket activation - only start when needed to save battery
|
# Socket activation - only start when needed to save battery
|
||||||
onBoot = "ignore";
|
onBoot = "ignore";
|
||||||
onShutdown = "shutdown";
|
onShutdown = "shutdown";
|
||||||
qemu = {
|
# qemu.swtpm.enable = true; # enable if you need TPM emulation, etc.
|
||||||
ovmf = {
|
|
||||||
enable = true; # Enable OVMF firmware support
|
|
||||||
};
|
|
||||||
# swtpm.enable = true; # enable if you need TPM emulation, etc.
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
-- Set leader key before any other mappings
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- vim.opt.expandtab = true
|
-- vim.opt.expandtab = true
|
||||||
-- vim.opt.hidden = true
|
-- vim.opt.hidden = true
|
||||||
-- vim.opt.incsearch = true
|
-- vim.opt.incsearch = true
|
||||||
|
|||||||
@@ -1,54 +1,31 @@
|
|||||||
local status, lspc = pcall(require, 'lspconfig')
|
-- LSP Capabilities (for nvim-cmp integration)
|
||||||
if (not status) then return end
|
|
||||||
|
|
||||||
lspc.clangd.setup{}
|
|
||||||
|
|
||||||
local buf_map = function(bufnr, mode, lhs, rhs, opts)
|
|
||||||
vim.api.nvim_buf_set_keymap(bufnr, mode, lhs, rhs, opts or {
|
|
||||||
silent = true,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
local protocol = require('vim.lsp.protocol')
|
|
||||||
|
|
||||||
local on_attach = function(client, buffnr)
|
|
||||||
if client.server.capabilities.documentFormattingProvider then
|
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
|
||||||
group = vim.api.nvim_create_augroup("format", { clear = true }),
|
|
||||||
buffer = buffnr,
|
|
||||||
callback = function() vim.lsp.buf.formatting_seq_sync() end
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
local servers = { 'ts_ls', 'lua_ls', 'cssls', 'yamlls', 'intelephense', 'gopls' }
|
-- Global LSP configuration
|
||||||
for _, lsp in pairs(servers) do
|
vim.lsp.config('*', {
|
||||||
require('lspconfig')[lsp].setup {
|
capabilities = capabilities,
|
||||||
-- on_attach = on_attach,
|
})
|
||||||
capabilities = capabilities,
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
lspc.yamlls.setup({
|
-- Server-specific configurations
|
||||||
|
vim.lsp.config('clangd', {})
|
||||||
|
|
||||||
|
vim.lsp.config('yamlls', {
|
||||||
settings = {
|
settings = {
|
||||||
yaml = {
|
yaml = {
|
||||||
keyOrdering = false,
|
keyOrdering = false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
|
||||||
|
|
||||||
-- autoformat json files with jq
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
|
||||||
pattern = "json",
|
|
||||||
callback = function(ev)
|
|
||||||
vim.bo[ev.buf].formatprg = "jq"
|
|
||||||
print("It's a json file")
|
|
||||||
end,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- Enable all LSP servers
|
||||||
|
vim.lsp.enable({ 'clangd', 'ts_ls', 'lua_ls', 'cssls', 'yamlls', 'intelephense', 'gopls' })
|
||||||
|
|
||||||
-- lspc.intelephense.setup()
|
-- JSON file formatting with jq
|
||||||
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
|
pattern = "json",
|
||||||
|
callback = function(ev)
|
||||||
|
vim.bo[ev.buf].formatprg = "jq"
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|||||||
@@ -1,41 +1,13 @@
|
|||||||
config = {
|
local status_ok, project = pcall(require, "project")
|
||||||
---@usage set to false to disable project.nvim.
|
|
||||||
--- This is on by default since it's currently the expected behavior.
|
|
||||||
active = true,
|
|
||||||
|
|
||||||
on_config_done = nil,
|
|
||||||
|
|
||||||
---@usage set to true to disable setting the current-woriking directory
|
|
||||||
--- Manual mode doesn't automatically change your root directory, so you have
|
|
||||||
--- the option to manually do so using `:ProjectRoot` command.
|
|
||||||
manual_mode = false,
|
|
||||||
|
|
||||||
---@usage Methods of detecting the root directory
|
|
||||||
--- Allowed values: **"lsp"** uses the native neovim lsp
|
|
||||||
--- **"pattern"** uses vim-rooter like glob pattern matching. Here
|
|
||||||
--- order matters: if one is not detected, the other is used as fallback. You
|
|
||||||
--- can also delete or rearangne the detection methods.
|
|
||||||
-- detection_methods = { "lsp", "pattern" }, -- NOTE: lsp detection will get annoying with multiple langs in one project
|
|
||||||
detection_methods = { "pattern" },
|
|
||||||
|
|
||||||
---@usage patterns used to detect root dir, when **"pattern"** is in detection_methods
|
|
||||||
patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json", "pom.xml" },
|
|
||||||
|
|
||||||
---@ Show hidden files in telescope when searching for files in a project
|
|
||||||
show_hidden = false,
|
|
||||||
|
|
||||||
---@usage When set to false, you will get a message when project.nvim changes your directory.
|
|
||||||
-- When set to false, you will get a message when project.nvim changes your directory.
|
|
||||||
silent_chdir = true,
|
|
||||||
|
|
||||||
---@usage list of lsp client names to ignore when using **lsp** detection. eg: { "efm", ... }
|
|
||||||
ignore_lsp = {},
|
|
||||||
}
|
|
||||||
|
|
||||||
local status_ok, project = pcall(require, "project_nvim")
|
|
||||||
if not status_ok then
|
if not status_ok then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
project.setup(config)
|
project.setup({
|
||||||
|
use_lsp = false, -- Use pattern matching only (equivalent to old detection_methods = { "pattern" })
|
||||||
|
manual_mode = false,
|
||||||
|
patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json", "pom.xml" },
|
||||||
|
show_hidden = false,
|
||||||
|
silent_chdir = true,
|
||||||
|
ignore_lsp = {},
|
||||||
|
})
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
-- none-ls
|
-- none-ls (module is still named "null-ls" for backward compatibility)
|
||||||
local status_ok_nls, none_ls_module = pcall(require, "none-ls")
|
local status_ok_nls, none_ls_module = pcall(require, "null-ls")
|
||||||
if not status_ok_nls then
|
if not status_ok_nls then
|
||||||
vim.notify("none-ls plugin not found or failed to load. Check Nix config and plugin paths.", vim.log.levels.WARN)
|
vim.notify("null-ls plugin not found or failed to load. Check Nix config and plugin paths.", vim.log.levels.WARN)
|
||||||
else
|
else
|
||||||
local nb = none_ls_module.builtins
|
local nb = none_ls_module.builtins
|
||||||
none_ls_module.setup({
|
none_ls_module.setup({
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
vim.g.mapleader = " "
|
|
||||||
|
|
||||||
local function smart_quit()
|
local function smart_quit()
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
local bufnr = vim.api.nvim_get_current_buf()
|
||||||
local modified = vim.api.nvim_buf_get_option(bufnr, "modified")
|
local modified = vim.api.nvim_buf_get_option(bufnr, "modified")
|
||||||
@@ -27,122 +25,77 @@ end
|
|||||||
|
|
||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
|
|
||||||
wk.setup({})
|
wk.setup({
|
||||||
|
preset = "classic",
|
||||||
wk.register({
|
delay = 0,
|
||||||
["<leader>"] = {
|
triggers = {
|
||||||
|
{ "<auto>", mode = "nxso" },
|
||||||
[";"] = { "<cmd>Alpha<CR>", "Dashboard" },
|
{ " ", mode = "n" }, -- literal space character
|
||||||
["w"] = { "<cmd>w!<CR>", "Save" },
|
},
|
||||||
["q"] = { "<cmd>smart_quit()<CR>", "Quit" },
|
|
||||||
["/"] = { "<Plug>(comment_toggle_linewise_current)", "Comment toggle current line" },
|
|
||||||
["c"] = { "<cmd>BufferKill<CR>", "Close Buffer" },
|
|
||||||
["f"] = { find_project_files, "Find File" },
|
|
||||||
["h"] = { "<cmd>nohlsearch<CR>", "No Highlight" },
|
|
||||||
["t"] = { "<cmd>TodoTelescope keywords=TODO,FIX<CR>", "Find TODO,FIX" },
|
|
||||||
b = {
|
|
||||||
name = "Buffers",
|
|
||||||
j = { "<cmd>BufferLinePick<cr>", "Jump" },
|
|
||||||
f = { "<cmd>Telescope buffers<cr>", "Find" },
|
|
||||||
b = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
|
|
||||||
n = { "<cmd>BufferLineCycleNext<cr>", "Next" },
|
|
||||||
-- w = { "<cmd>BufferWipeout<cr>", "Wipeout" }, -- TODO: implement this for bufferline
|
|
||||||
e = {
|
|
||||||
"<cmd>BufferLinePickClose<cr>",
|
|
||||||
"Pick which buffer to close",
|
|
||||||
},
|
|
||||||
h = { "<cmd>BufferLineCloseLeft<cr>", "Close all to the left" },
|
|
||||||
l = {
|
|
||||||
"<cmd>BufferLineCloseRight<cr>",
|
|
||||||
"Close all to the right",
|
|
||||||
},
|
|
||||||
D = {
|
|
||||||
"<cmd>BufferLineSortByDirectory<cr>",
|
|
||||||
"Sort by directory",
|
|
||||||
},
|
|
||||||
L = {
|
|
||||||
"<cmd>BufferLineSortByExtension<cr>",
|
|
||||||
"Sort by language",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- " Available Debug Adapters:
|
|
||||||
-- " https://microsoft.github.io/debug-adapter-protocol/implementors/adapters/
|
|
||||||
-- " Adapter configuration and installation instructions:
|
|
||||||
-- " https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation
|
|
||||||
-- " Debug Adapter protocol:
|
|
||||||
-- " https://microsoft.github.io/debug-adapter-protocol/
|
|
||||||
-- " Debugging
|
|
||||||
g = {
|
|
||||||
name = "Git",
|
|
||||||
g = { Lazygit_toggle, "Lazygit" },
|
|
||||||
j = { "<cmd>lua require 'gitsigns'.next_hunk({navigation_message = false})<cr>", "Next Hunk" },
|
|
||||||
k = { "<cmd>lua require 'gitsigns'.prev_hunk({navigation_message = false})<cr>", "Prev Hunk" },
|
|
||||||
l = { "<cmd>lua require 'gitsigns'.blame_line()<cr>", "Blame" },
|
|
||||||
p = { "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", "Preview Hunk" },
|
|
||||||
r = { "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", "Reset Hunk" },
|
|
||||||
R = { "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", "Reset Buffer" },
|
|
||||||
s = { "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", "Stage Hunk" },
|
|
||||||
u = {
|
|
||||||
"<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>",
|
|
||||||
"Undo Stage Hunk",
|
|
||||||
},
|
|
||||||
o = { "<cmd>Telescope git_status<cr>", "Open changed file" },
|
|
||||||
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
|
|
||||||
c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" },
|
|
||||||
C = {
|
|
||||||
"<cmd>Telescope git_bcommits<cr>",
|
|
||||||
"Checkout commit(for current file)",
|
|
||||||
},
|
|
||||||
d = {
|
|
||||||
"<cmd>Gitsigns diffthis HEAD<cr>",
|
|
||||||
"Git Diff",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
l = {
|
|
||||||
name = "LSP",
|
|
||||||
a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
|
|
||||||
d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" },
|
|
||||||
w = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
|
|
||||||
-- f = { require("lvim.lsp.utils").format, "Format" },
|
|
||||||
i = { "<cmd>LspInfo<cr>", "Info" },
|
|
||||||
I = { "<cmd>Mason<cr>", "Mason Info" },
|
|
||||||
j = {
|
|
||||||
vim.diagnostic.goto_next,
|
|
||||||
"Next Diagnostic",
|
|
||||||
},
|
|
||||||
k = {
|
|
||||||
vim.diagnostic.goto_prev,
|
|
||||||
"Prev Diagnostic",
|
|
||||||
},
|
|
||||||
l = { vim.lsp.codelens.run, "CodeLens Action" },
|
|
||||||
q = { vim.diagnostic.setloclist, "Quickfix" },
|
|
||||||
r = { vim.lsp.buf.rename, "Rename" },
|
|
||||||
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
|
|
||||||
S = {
|
|
||||||
"<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
|
|
||||||
"Workspace Symbols",
|
|
||||||
},
|
|
||||||
e = { "<cmd>Telescope quickfix<cr>", "Telescope Quickfix" },
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
a = { "<cmd>lua require('telescope.builtin').lsp_code_actions()<cr>", "Code Actions" },
|
|
||||||
d = { "<cmd>lua require('telescope.builtin').lsp_document_diagnostics()<cr>", "LSP Diagnostics" },
|
|
||||||
k = { "<cmd>lua vim.lsp.buf.signature_help()<cr>", "Signature Help" },
|
|
||||||
P = { "<cmd>lua require'telescope'.extensions.projects.projects{}<cr>", "Signature Help" },
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
wk.register(
|
wk.add({
|
||||||
{
|
-- Single key mappings
|
||||||
["/"] = { "<Plug>(comment_toggle_linewise_visual)", "Comment toggle linewise (visual)" },
|
{ "<leader>;", "<cmd>Alpha<CR>", desc = "Dashboard" },
|
||||||
},
|
{ "<leader>w", "<cmd>w!<CR>", desc = "Save" },
|
||||||
{
|
{ "<leader>q", smart_quit, desc = "Quit" },
|
||||||
mode = "v", -- VISUAL mode
|
{ "<leader>/", "<Plug>(comment_toggle_linewise_current)", desc = "Comment toggle current line" },
|
||||||
prefix = "<leader>",
|
{ "<leader>c", "<cmd>BufferKill<CR>", desc = "Close Buffer" },
|
||||||
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
|
{ "<leader>f", find_project_files, desc = "Find File" },
|
||||||
silent = true, -- use `silent` when creating keymaps
|
{ "<leader>h", "<cmd>nohlsearch<CR>", desc = "No Highlight" },
|
||||||
noremap = true, -- use `noremap` when creating keymaps
|
{ "<leader>t", "<cmd>TodoTelescope keywords=TODO,FIX<CR>", desc = "Find TODO,FIX" },
|
||||||
nowait = true, -- use `nowait` when creating keymaps
|
|
||||||
}
|
-- Buffers group
|
||||||
)
|
{ "<leader>b", group = "Buffers" },
|
||||||
|
{ "<leader>bj", "<cmd>BufferLinePick<cr>", desc = "Jump" },
|
||||||
|
{ "<leader>bf", "<cmd>Telescope buffers<cr>", desc = "Find" },
|
||||||
|
{ "<leader>bb", "<cmd>BufferLineCyclePrev<cr>", desc = "Previous" },
|
||||||
|
{ "<leader>bn", "<cmd>BufferLineCycleNext<cr>", desc = "Next" },
|
||||||
|
{ "<leader>be", "<cmd>BufferLinePickClose<cr>", desc = "Pick which buffer to close" },
|
||||||
|
{ "<leader>bh", "<cmd>BufferLineCloseLeft<cr>", desc = "Close all to the left" },
|
||||||
|
{ "<leader>bl", "<cmd>BufferLineCloseRight<cr>", desc = "Close all to the right" },
|
||||||
|
{ "<leader>bD", "<cmd>BufferLineSortByDirectory<cr>", desc = "Sort by directory" },
|
||||||
|
{ "<leader>bL", "<cmd>BufferLineSortByExtension<cr>", desc = "Sort by language" },
|
||||||
|
|
||||||
|
-- Git group
|
||||||
|
{ "<leader>g", group = "Git" },
|
||||||
|
{ "<leader>gg", Lazygit_toggle, desc = "Lazygit" },
|
||||||
|
{ "<leader>gj", "<cmd>lua require 'gitsigns'.next_hunk({navigation_message = false})<cr>", desc = "Next Hunk" },
|
||||||
|
{ "<leader>gk", "<cmd>lua require 'gitsigns'.prev_hunk({navigation_message = false})<cr>", desc = "Prev Hunk" },
|
||||||
|
{ "<leader>gl", "<cmd>lua require 'gitsigns'.blame_line()<cr>", desc = "Blame" },
|
||||||
|
{ "<leader>gp", "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", desc = "Preview Hunk" },
|
||||||
|
{ "<leader>gr", "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", desc = "Reset Hunk" },
|
||||||
|
{ "<leader>gR", "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", desc = "Reset Buffer" },
|
||||||
|
{ "<leader>gs", "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", desc = "Stage Hunk" },
|
||||||
|
{ "<leader>gu", "<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>", desc = "Undo Stage Hunk" },
|
||||||
|
{ "<leader>go", "<cmd>Telescope git_status<cr>", desc = "Open changed file" },
|
||||||
|
{ "<leader>gb", "<cmd>Telescope git_branches<cr>", desc = "Checkout branch" },
|
||||||
|
{ "<leader>gc", "<cmd>Telescope git_commits<cr>", desc = "Checkout commit" },
|
||||||
|
{ "<leader>gC", "<cmd>Telescope git_bcommits<cr>", desc = "Checkout commit(for current file)" },
|
||||||
|
{ "<leader>gd", "<cmd>Gitsigns diffthis HEAD<cr>", desc = "Git Diff" },
|
||||||
|
|
||||||
|
-- LSP group
|
||||||
|
{ "<leader>l", group = "LSP" },
|
||||||
|
{ "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code Action" },
|
||||||
|
{ "<leader>ld", "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", desc = "Buffer Diagnostics" },
|
||||||
|
{ "<leader>lw", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
|
||||||
|
{ "<leader>li", "<cmd>LspInfo<cr>", desc = "Info" },
|
||||||
|
{ "<leader>lI", "<cmd>Mason<cr>", desc = "Mason Info" },
|
||||||
|
{ "<leader>lj", vim.diagnostic.goto_next, desc = "Next Diagnostic" },
|
||||||
|
{ "<leader>lk", vim.diagnostic.goto_prev, desc = "Prev Diagnostic" },
|
||||||
|
{ "<leader>ll", vim.lsp.codelens.run, desc = "CodeLens Action" },
|
||||||
|
{ "<leader>lq", vim.diagnostic.setloclist, desc = "Quickfix" },
|
||||||
|
{ "<leader>lr", vim.lsp.buf.rename, desc = "Rename" },
|
||||||
|
{ "<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document Symbols" },
|
||||||
|
{ "<leader>lS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace Symbols" },
|
||||||
|
{ "<leader>le", "<cmd>Telescope quickfix<cr>", desc = "Telescope Quickfix" },
|
||||||
|
|
||||||
|
-- Direct LSP shortcuts
|
||||||
|
{ "<leader>a", "<cmd>lua require('telescope.builtin').lsp_code_actions()<cr>", desc = "Code Actions" },
|
||||||
|
{ "<leader>d", "<cmd>lua require('telescope.builtin').lsp_document_diagnostics()<cr>", desc = "LSP Diagnostics" },
|
||||||
|
{ "<leader>k", "<cmd>lua vim.lsp.buf.signature_help()<cr>", desc = "Signature Help" },
|
||||||
|
{ "<leader>P", "<cmd>lua require'telescope'.extensions.projects.projects{}<cr>", desc = "Projects" },
|
||||||
|
|
||||||
|
-- Visual mode mappings
|
||||||
|
{ "<leader>/", "<Plug>(comment_toggle_linewise_visual)", desc = "Comment toggle linewise (visual)", mode = "v" },
|
||||||
|
})
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ in
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
sumneko-lua-language-server
|
lua-language-server
|
||||||
nest
|
nest
|
||||||
nodePackages.intelephense
|
nodePackages.intelephense
|
||||||
nodePackages.vscode-langservers-extracted
|
nodePackages.vscode-langservers-extracted
|
||||||
@@ -105,9 +105,9 @@ in
|
|||||||
"sops"
|
"sops"
|
||||||
]);
|
]);
|
||||||
in ''
|
in ''
|
||||||
lua << EOF
|
lua << EOF
|
||||||
${luaConfig}
|
${luaConfig}
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
|
extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
|
||||||
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -135,11 +135,11 @@ let
|
|||||||
{ name = "q"; value = "{searchTerms}"; }
|
{ name = "q"; value = "{searchTerms}"; }
|
||||||
];
|
];
|
||||||
}];
|
}];
|
||||||
iconUpdateURL = "https://perplexity.ai/favicon.ico";
|
icon = "https://perplexity.ai/favicon.ico";
|
||||||
definedAliases = [ "@perplexity" ];
|
definedAliases = [ "@perplexity" ];
|
||||||
};
|
};
|
||||||
"Google".metaData.hidden = true;
|
"google".metaData.hidden = true;
|
||||||
"Bing".metaData.hidden = true;
|
"bing".metaData.hidden = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -301,26 +301,23 @@ in
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitFull;
|
||||||
userName = "Dominik Polakovics";
|
|
||||||
userEmail = "dominik.polakovics@cloonar.com";
|
|
||||||
# signing = {
|
# signing = {
|
||||||
# key = "dominik.polakovics@cloonar.com";
|
# key = "dominik.polakovics@cloonar.com";
|
||||||
# signByDefault = false;
|
# signByDefault = false;
|
||||||
# };
|
# };
|
||||||
iniContent = {
|
settings = {
|
||||||
|
user.name = "Dominik Polakovics";
|
||||||
|
user.email = "dominik.polakovics@cloonar.com";
|
||||||
# Branch with most recent change comes first
|
# Branch with most recent change comes first
|
||||||
branch.sort = "-committerdate";
|
branch.sort = "-committerdate";
|
||||||
# Remember and auto-resolve merge conflicts
|
# Remember and auto-resolve merge conflicts
|
||||||
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
||||||
rerere.enabled = true;
|
rerere.enabled = true;
|
||||||
};
|
"url \"gitea@git.cloonar.com:\"" = {
|
||||||
extraConfig = {
|
|
||||||
"url.gitea@git.cloonar.com:" = {
|
|
||||||
insteadOf = "https://git.cloonar.com/";
|
insteadOf = "https://git.cloonar.com/";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.thunderbird = {
|
programs.thunderbird = {
|
||||||
@@ -525,7 +522,7 @@ in
|
|||||||
settings = firefoxSettings;
|
settings = firefoxSettings;
|
||||||
# userChrome = firefoxUserChrome;
|
# userChrome = firefoxUserChrome;
|
||||||
search = firefoxSearchSettings;
|
search = firefoxSearchSettings;
|
||||||
extensions = firefoxExtensions;
|
extensions.packages = firefoxExtensions;
|
||||||
};
|
};
|
||||||
social = {
|
social = {
|
||||||
id = 1;
|
id = 1;
|
||||||
@@ -560,7 +557,7 @@ in
|
|||||||
id = 3;
|
id = 3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extensions = firefoxExtensions;
|
extensions.packages = firefoxExtensions;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
https://channels.nixos.org/nixos-25.05
|
https://channels.nixos.org/nixos-25.11
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
time.timeZone = "Europe/Vienna";
|
time.timeZone = "Europe/Vienna";
|
||||||
|
|
||||||
services.logind.extraConfig = "RuntimeDirectorySize=2G";
|
services.logind.settings.Login.RuntimeDirectorySize = "2G";
|
||||||
|
|
||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
datasourceUid = "vm-datasource-uid";
|
datasourceUid = "vm-datasource-uid";
|
||||||
model = {
|
model = {
|
||||||
editorMode = "code";
|
editorMode = "code";
|
||||||
expr = "node_systemd_unit_state{state=\"active\", name=\"dovecot2.service\"} OR on() vector(0)";
|
expr = "node_systemd_unit_state{state=\"active\", name=\"dovecot.service\"} OR on() vector(0)";
|
||||||
hide = false;
|
hide = false;
|
||||||
intervalMs = 1000;
|
intervalMs = 1000;
|
||||||
legendFormat = "__auto";
|
legendFormat = "__auto";
|
||||||
|
|||||||
17
hosts/web-arm/modules/grafana/dashboards/default.nix
Normal file
17
hosts/web-arm/modules/grafana/dashboards/default.nix
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{ lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
smartDashboard = import ./smart-dashboard.nix { inherit lib pkgs; };
|
||||||
|
dashboardDir = pkgs.linkFarm "grafana-dashboards" [
|
||||||
|
{ name = "smart.json"; path = smartDashboard; }
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.grafana.provision.dashboards.settings = {
|
||||||
|
apiVersion = 1;
|
||||||
|
providers = [{
|
||||||
|
name = "nix-dashboards";
|
||||||
|
type = "file";
|
||||||
|
options.path = dashboardDir;
|
||||||
|
}];
|
||||||
|
};
|
||||||
|
}
|
||||||
463
hosts/web-arm/modules/grafana/dashboards/smart-dashboard.nix
Normal file
463
hosts/web-arm/modules/grafana/dashboards/smart-dashboard.nix
Normal file
@@ -0,0 +1,463 @@
|
|||||||
|
{ lib, pkgs }:
|
||||||
|
let
|
||||||
|
datasourceUid = "vm-datasource-uid";
|
||||||
|
|
||||||
|
# Helper to create a panel with common defaults
|
||||||
|
mkPanel = { id, title, type, gridPos, targets, options ? { }, fieldConfig ? { }, ... }@args:
|
||||||
|
{
|
||||||
|
inherit id title type gridPos targets;
|
||||||
|
datasource = { uid = datasourceUid; type = "prometheus"; };
|
||||||
|
options = options;
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = fieldConfig.defaults or { };
|
||||||
|
overrides = fieldConfig.overrides or [ ];
|
||||||
|
};
|
||||||
|
} // (builtins.removeAttrs args [ "id" "title" "type" "gridPos" "targets" "options" "fieldConfig" ]);
|
||||||
|
|
||||||
|
# Dashboard definition
|
||||||
|
dashboard = {
|
||||||
|
uid = "smart-disk-health";
|
||||||
|
title = "S.M.A.R.T Disk Health";
|
||||||
|
description = "S.M.A.R.T metrics and RAID array status";
|
||||||
|
tags = [ "disk" "smart" "storage" "nas" ];
|
||||||
|
timezone = "browser";
|
||||||
|
editable = false;
|
||||||
|
refresh = "5m";
|
||||||
|
schemaVersion = 39;
|
||||||
|
version = 1;
|
||||||
|
|
||||||
|
# Variables
|
||||||
|
templating.list = [
|
||||||
|
{
|
||||||
|
name = "host";
|
||||||
|
label = "Host";
|
||||||
|
type = "query";
|
||||||
|
datasource = { uid = datasourceUid; type = "prometheus"; };
|
||||||
|
query = "label_values(smart_health_passed, instance)";
|
||||||
|
regex = "";
|
||||||
|
sort = 1;
|
||||||
|
refresh = 1;
|
||||||
|
includeAll = true;
|
||||||
|
multi = false;
|
||||||
|
current = { selected = true; text = "All"; value = "$__all"; };
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
# Panels
|
||||||
|
panels = [
|
||||||
|
# === OVERVIEW ROW ===
|
||||||
|
{
|
||||||
|
id = 1;
|
||||||
|
type = "row";
|
||||||
|
title = "Overview";
|
||||||
|
collapsed = false;
|
||||||
|
gridPos = { x = 0; y = 0; w = 24; h = 1; };
|
||||||
|
panels = [ ];
|
||||||
|
}
|
||||||
|
|
||||||
|
# Alert Status - Shows firing disk alerts
|
||||||
|
{
|
||||||
|
id = 5;
|
||||||
|
title = "Alert Status";
|
||||||
|
type = "alertlist";
|
||||||
|
gridPos = { x = 0; y = 1; w = 6; h = 5; };
|
||||||
|
options = {
|
||||||
|
alertInstanceLabelFilter = "";
|
||||||
|
alertName = "Disk";
|
||||||
|
dashboardAlerts = false;
|
||||||
|
groupBy = [ ];
|
||||||
|
groupMode = "default";
|
||||||
|
maxItems = 20;
|
||||||
|
sortOrder = 1;
|
||||||
|
stateFilter = {
|
||||||
|
"error" = true;
|
||||||
|
firing = true;
|
||||||
|
noData = false;
|
||||||
|
normal = false;
|
||||||
|
pending = false;
|
||||||
|
};
|
||||||
|
viewMode = "list";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
# Health Status - Stat panel
|
||||||
|
(mkPanel {
|
||||||
|
id = 2;
|
||||||
|
title = "Disk Health Status";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 6; y = 1; w = 6; h = 5; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_health_passed{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "auto";
|
||||||
|
colorMode = "background";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
mappings = [
|
||||||
|
{ type = "value"; options."1" = { text = "PASSED"; color = "green"; index = 0; }; }
|
||||||
|
{ type = "value"; options."0" = { text = "FAILED"; color = "red"; index = 1; }; }
|
||||||
|
];
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "red"; value = null; }
|
||||||
|
{ color = "green"; value = 1; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# Temperature Gauge
|
||||||
|
(mkPanel {
|
||||||
|
id = 3;
|
||||||
|
title = "Disk Temperatures";
|
||||||
|
type = "gauge";
|
||||||
|
gridPos = { x = 12; y = 1; w = 6; h = 8; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_temperature_celsius{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "auto";
|
||||||
|
showThresholdLabels = false;
|
||||||
|
showThresholdMarkers = true;
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "celsius";
|
||||||
|
min = 0;
|
||||||
|
max = 70;
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "green"; value = null; }
|
||||||
|
{ color = "yellow"; value = 45; }
|
||||||
|
{ color = "red"; value = 55; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# RAID Status - Stat panel
|
||||||
|
(mkPanel {
|
||||||
|
id = 4;
|
||||||
|
title = "RAID Array Status";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 18; y = 1; w = 6; h = 8; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''mdadm_array_state{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{array}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "auto";
|
||||||
|
colorMode = "background";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
mappings = [
|
||||||
|
{ type = "value"; options."1" = { text = "Healthy"; color = "green"; index = 0; }; }
|
||||||
|
{ type = "value"; options."0" = { text = "Degraded"; color = "red"; index = 1; }; }
|
||||||
|
];
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "red"; value = null; }
|
||||||
|
{ color = "green"; value = 1; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# Sector Health Table - Promoted to overview for visibility
|
||||||
|
(mkPanel {
|
||||||
|
id = 13;
|
||||||
|
title = "Sector Health";
|
||||||
|
type = "table";
|
||||||
|
gridPos = { x = 0; y = 6; w = 12; h = 4; };
|
||||||
|
targets = [
|
||||||
|
{
|
||||||
|
expr = ''smart_reallocated_sector_ct{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
format = "table";
|
||||||
|
instant = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
expr = ''smart_current_pending_sector{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "B";
|
||||||
|
format = "table";
|
||||||
|
instant = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
expr = ''smart_offline_uncorrectable{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "C";
|
||||||
|
format = "table";
|
||||||
|
instant = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
options = {
|
||||||
|
showHeader = true;
|
||||||
|
cellHeight = "sm";
|
||||||
|
};
|
||||||
|
transformations = [
|
||||||
|
{ id = "merge"; options = { }; }
|
||||||
|
{
|
||||||
|
id = "organize";
|
||||||
|
options = {
|
||||||
|
excludeByName = { Time = true; __name__ = true; instance = true; job = true; serial = true; };
|
||||||
|
renameByName = {
|
||||||
|
device = "Device";
|
||||||
|
"Value #A" = "Reallocated Sectors";
|
||||||
|
"Value #B" = "Pending Sectors";
|
||||||
|
"Value #C" = "Offline Uncorrectable";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "green"; value = null; }
|
||||||
|
{ color = "yellow"; value = 1; }
|
||||||
|
{ color = "red"; value = 10; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
custom = { displayMode = "color-background-solid"; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# === DETAILED METRICS ROW ===
|
||||||
|
{
|
||||||
|
id = 10;
|
||||||
|
type = "row";
|
||||||
|
title = "Detailed Metrics";
|
||||||
|
collapsed = false;
|
||||||
|
gridPos = { x = 0; y = 10; w = 24; h = 1; };
|
||||||
|
panels = [ ];
|
||||||
|
}
|
||||||
|
|
||||||
|
# Temperature Time Series
|
||||||
|
(mkPanel {
|
||||||
|
id = 11;
|
||||||
|
title = "Temperature Over Time";
|
||||||
|
type = "timeseries";
|
||||||
|
gridPos = { x = 0; y = 11; w = 12; h = 8; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_temperature_celsius{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
legend = { displayMode = "list"; placement = "bottom"; showLegend = true; };
|
||||||
|
tooltip = { mode = "multi"; sort = "desc"; };
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "celsius";
|
||||||
|
custom = {
|
||||||
|
drawStyle = "line";
|
||||||
|
lineInterpolation = "smooth";
|
||||||
|
fillOpacity = 10;
|
||||||
|
pointSize = 5;
|
||||||
|
showPoints = "auto";
|
||||||
|
};
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "green"; value = null; }
|
||||||
|
{ color = "yellow"; value = 45; }
|
||||||
|
{ color = "red"; value = 55; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# Power On Hours
|
||||||
|
(mkPanel {
|
||||||
|
id = 12;
|
||||||
|
title = "Power On Hours";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 12; y = 11; w = 12; h = 8; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_power_on_hours{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "value_and_name";
|
||||||
|
colorMode = "none";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "h";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# === RAID DETAILS ROW ===
|
||||||
|
{
|
||||||
|
id = 20;
|
||||||
|
type = "row";
|
||||||
|
title = "RAID Details";
|
||||||
|
collapsed = false;
|
||||||
|
gridPos = { x = 0; y = 19; w = 24; h = 1; };
|
||||||
|
panels = [ ];
|
||||||
|
}
|
||||||
|
|
||||||
|
# RAID Devices
|
||||||
|
(mkPanel {
|
||||||
|
id = 21;
|
||||||
|
title = "RAID Array Devices";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 0; y = 20; w = 12; h = 4; };
|
||||||
|
targets = [
|
||||||
|
{
|
||||||
|
expr = ''mdadm_array_devices_active{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{array}} Active";
|
||||||
|
refId = "A";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
expr = ''mdadm_array_devices_total{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{array}} Total";
|
||||||
|
refId = "B";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "value_and_name";
|
||||||
|
colorMode = "value";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "short";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# UDMA CRC Errors
|
||||||
|
(mkPanel {
|
||||||
|
id = 22;
|
||||||
|
title = "UDMA CRC Errors";
|
||||||
|
type = "timeseries";
|
||||||
|
gridPos = { x = 12; y = 20; w = 12; h = 4; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_udma_crc_error_count{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
legend = { displayMode = "list"; placement = "bottom"; showLegend = true; };
|
||||||
|
tooltip = { mode = "multi"; sort = "desc"; };
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "short";
|
||||||
|
custom = {
|
||||||
|
drawStyle = "line";
|
||||||
|
lineInterpolation = "stepAfter";
|
||||||
|
fillOpacity = 0;
|
||||||
|
pointSize = 5;
|
||||||
|
showPoints = "auto";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# Last Update Timestamp
|
||||||
|
(mkPanel {
|
||||||
|
id = 30;
|
||||||
|
title = "Last Metrics Update";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 0; y = 24; w = 6; h = 5; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''time() - disk_metrics_last_update{instance=~"$host"}'';
|
||||||
|
legendFormat = "Age";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "value";
|
||||||
|
colorMode = "value";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
unit = "s";
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "green"; value = null; }
|
||||||
|
{ color = "yellow"; value = 1800; }
|
||||||
|
{ color = "red"; value = 3600; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
# Device Activity Status
|
||||||
|
(mkPanel {
|
||||||
|
id = 31;
|
||||||
|
title = "Device Activity";
|
||||||
|
type = "stat";
|
||||||
|
gridPos = { x = 6; y = 24; w = 18; h = 5; };
|
||||||
|
targets = [{
|
||||||
|
expr = ''smart_device_active{instance=~"$host"}'';
|
||||||
|
legendFormat = "{{device}}";
|
||||||
|
refId = "A";
|
||||||
|
}];
|
||||||
|
options = {
|
||||||
|
reduceOptions = { values = false; calcs = [ "lastNotNull" ]; fields = ""; };
|
||||||
|
orientation = "horizontal";
|
||||||
|
textMode = "auto";
|
||||||
|
colorMode = "background";
|
||||||
|
graphMode = "none";
|
||||||
|
};
|
||||||
|
fieldConfig = {
|
||||||
|
defaults = {
|
||||||
|
mappings = [
|
||||||
|
{ type = "value"; options."1" = { text = "Active"; color = "green"; index = 0; }; }
|
||||||
|
{ type = "value"; options."0" = { text = "Standby"; color = "blue"; index = 1; }; }
|
||||||
|
];
|
||||||
|
thresholds = {
|
||||||
|
mode = "absolute";
|
||||||
|
steps = [
|
||||||
|
{ color = "blue"; value = null; }
|
||||||
|
{ color = "green"; value = 1; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
pkgs.writeText "smart-dashboard.json" (builtins.toJSON dashboard)
|
||||||
@@ -36,6 +36,8 @@ in
|
|||||||
./datasources/victoriametrics.nix
|
./datasources/victoriametrics.nix
|
||||||
./datasources/loki.nix
|
./datasources/loki.nix
|
||||||
|
|
||||||
|
./dashboards/default.nix
|
||||||
|
|
||||||
./alert-cleanup.nix
|
./alert-cleanup.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ buildGoModule rec {
|
|||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
# Optional tuning
|
# Optional tuning
|
||||||
CGO_ENABLED = 0;
|
env.CGO_ENABLED = "0";
|
||||||
ldflags = [ "-s" "-w" ];
|
ldflags = [ "-s" "-w" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ fi
|
|||||||
|
|
||||||
HOSTNAME="$1"
|
HOSTNAME="$1"
|
||||||
|
|
||||||
# Check if 'nixos-rebuild' command is available
|
# Check if 'nix-instantiate' command is available
|
||||||
if ! command -v nixos-rebuild > /dev/null; then
|
if ! command -v nix-instantiate > /dev/null; then
|
||||||
echo "ERROR: 'nixos-rebuild' command not found. Please ensure it is installed and in your PATH." >&2
|
echo "ERROR: 'nix-instantiate' command not found. Please ensure Nix is installed and in your PATH." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -38,27 +38,42 @@ if [ ! -f "$CONFIG_PATH" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check for host-specific channel file
|
||||||
|
CHANNEL_PATH="$SCRIPT_DIR/../hosts/$HOSTNAME/channel"
|
||||||
|
CHANNEL_OPT=""
|
||||||
|
|
||||||
|
if [ -f "$CHANNEL_PATH" ]; then
|
||||||
|
CHANNEL_URL=$(cat "$CHANNEL_PATH")
|
||||||
|
# Append /nixexprs.tar.xz to get the actual tarball URL
|
||||||
|
TARBALL_URL="${CHANNEL_URL}/nixexprs.tar.xz"
|
||||||
|
echo "INFO: Using channel '$TARBALL_URL' from '$CHANNEL_PATH'."
|
||||||
|
CHANNEL_OPT="-I nixpkgs=$TARBALL_URL"
|
||||||
|
else
|
||||||
|
echo "WARNING: No channel file found at '$CHANNEL_PATH'. Using system default." >&2
|
||||||
|
fi
|
||||||
|
|
||||||
echo "INFO: Attempting dry-build for host '$HOSTNAME' using configuration '$CONFIG_PATH'..."
|
echo "INFO: Attempting dry-build for host '$HOSTNAME' using configuration '$CONFIG_PATH'..."
|
||||||
if [ "$VERBOSE" = true ]; then
|
if [ "$VERBOSE" = true ]; then
|
||||||
echo "INFO: Verbose mode enabled, --show-trace will be used."
|
echo "INFO: Verbose mode enabled, --show-trace will be used."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Execute nixos-rebuild dry-build
|
# Execute nix-instantiate to evaluate the configuration
|
||||||
# Store the output and error streams, and the exit code
|
# nix-instantiate fetches fresh tarballs and catches all evaluation errors
|
||||||
NIX_OUTPUT_ERR=$(nixos-rebuild dry-build $SHOW_TRACE_OPT -I nixos-config="$CONFIG_PATH" --show-trace 2>&1)
|
# unlike nixos-rebuild which may use cached results
|
||||||
|
NIX_OUTPUT_ERR=$(nix-instantiate $SHOW_TRACE_OPT $CHANNEL_OPT -I nixos-config="$CONFIG_PATH" '<nixpkgs/nixos>' -A system 2>&1)
|
||||||
NIX_EXIT_STATUS=$?
|
NIX_EXIT_STATUS=$?
|
||||||
|
|
||||||
# Check the exit status
|
# Check the exit status
|
||||||
if [ "$NIX_EXIT_STATUS" -eq 0 ]; then
|
if [ "$NIX_EXIT_STATUS" -eq 0 ]; then
|
||||||
echo "INFO: Dry-build for host '$HOSTNAME' completed successfully."
|
echo "INFO: Dry-build for host '$HOSTNAME' completed successfully."
|
||||||
if [ "$VERBOSE" = true ]; then
|
if [ "$VERBOSE" = true ]; then
|
||||||
echo "Output from nixos-rebuild:"
|
echo "Output from nix-instantiate:"
|
||||||
echo "$NIX_OUTPUT_ERR"
|
echo "$NIX_OUTPUT_ERR"
|
||||||
fi
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
echo "ERROR: Dry-build for host '$HOSTNAME' failed. 'nixos-rebuild' exited with status $NIX_EXIT_STATUS." >&2
|
echo "ERROR: Dry-build for host '$HOSTNAME' failed. 'nix-instantiate' exited with status $NIX_EXIT_STATUS." >&2
|
||||||
echo "Output from nixos-rebuild:" >&2
|
echo "Output from nix-instantiate:" >&2
|
||||||
echo "$NIX_OUTPUT_ERR" >&2
|
echo "$NIX_OUTPUT_ERR" >&2
|
||||||
exit "$NIX_EXIT_STATUS"
|
exit "$NIX_EXIT_STATUS"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ self: super: {
|
|||||||
# Python packages
|
# Python packages
|
||||||
python3 = super.python3.override {
|
python3 = super.python3.override {
|
||||||
packageOverrides = pself: psuper: {
|
packageOverrides = pself: psuper: {
|
||||||
|
aia-chaser = pself.callPackage ../pkgs/aia-chaser { };
|
||||||
mini-racer = pself.callPackage ../pkgs/mini-racer.nix { };
|
mini-racer = pself.callPackage ../pkgs/mini-racer.nix { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
32
utils/pkgs/aia-chaser/default.nix
Normal file
32
utils/pkgs/aia-chaser/default.nix
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, cryptography
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "aia-chaser";
|
||||||
|
version = "3.3.0";
|
||||||
|
format = "wheel";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
pname = "aia_chaser";
|
||||||
|
inherit version format;
|
||||||
|
dist = "py3";
|
||||||
|
python = "py3";
|
||||||
|
hash = "sha256-L0aBV3kfAVI1aJH7VgiiEXzGBSP/HU2zAlahkHeT8hk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
cryptography
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "aia_chaser" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Retrieve missing certificates to complete SSL certificate chains";
|
||||||
|
homepage = "https://github.com/dirkjanm/aia-chaser";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -6,8 +6,8 @@ pyload-ng.overridePythonAttrs (oldAttrs: rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pyload";
|
owner = "pyload";
|
||||||
repo = "pyload";
|
repo = "pyload";
|
||||||
rev = "3115740a2210fd57b5d050cd0850a0e61ec493ed"; # [DdownloadCom] fix #4537
|
rev = "71f2700184ee9344dc313d9833ca7a6bb36007db"; # [DdownloadCom] fix #4537
|
||||||
hash = "sha256-g1eEeNnr3Axtr+0BJzMcNQomTEX4EsUG1Jxt+huPyoc=";
|
hash = "sha256-XAa+XbC3kko+zvEMZkPXRoaHAmEFGsNBDxysX+X06Jc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@@ -16,6 +16,7 @@ pyload-ng.overridePythonAttrs (oldAttrs: rec {
|
|||||||
|
|
||||||
# Add new dependencies required in newer versions
|
# Add new dependencies required in newer versions
|
||||||
propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ (with python3Packages; [
|
propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ (with python3Packages; [
|
||||||
|
aia-chaser
|
||||||
mini-racer
|
mini-racer
|
||||||
packaging
|
packaging
|
||||||
pydantic
|
pydantic
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
diff --git a/src/pyload/core/__init__.py b/src/pyload/core/__init__.py
|
|
||||||
index 4324fc700..5d915a85e 100644
|
|
||||||
--- a/src/pyload/core/__init__.py
|
--- a/src/pyload/core/__init__.py
|
||||||
+++ b/src/pyload/core/__init__.py
|
+++ b/src/pyload/core/__init__.py
|
||||||
@@ -130,6 +130,14 @@ class Core:
|
@@ -130,6 +130,14 @@ class Core:
|
||||||
@@ -17,12 +15,13 @@ index 4324fc700..5d915a85e 100644
|
|||||||
# If no argument set, read storage dir from config file,
|
# If no argument set, read storage dir from config file,
|
||||||
# otherwise save setting to config dir
|
# otherwise save setting to config dir
|
||||||
if storagedir is None:
|
if storagedir is None:
|
||||||
@@ -227,6 +235,18 @@ class Core:
|
@@ -226,6 +234,20 @@ class Core:
|
||||||
|
self.acm = self.account_manager = AccountManager(self)
|
||||||
self.thm = self.thread_manager = ThreadManager(self)
|
self.thm = self.thread_manager = ThreadManager(self)
|
||||||
self.cpm = self.captcha_manager = CaptchaManager(self)
|
self.cpm = self.captcha_manager = CaptchaManager(self)
|
||||||
self.adm = self.addon_manager = AddonManager(self)
|
|
||||||
+
|
+
|
||||||
+ # Process plugin config environment variables after plugins are loaded (NixOS declarative config)
|
+ # Process plugin config environment variables BEFORE AddonManager (NixOS declarative config)
|
||||||
|
+ # This must happen before AddonManager reads the enabled flag to decide which addons to start
|
||||||
+ # Build case-insensitive lookup map for plugin names
|
+ # Build case-insensitive lookup map for plugin names
|
||||||
+ plugin_name_map = {name.lower(): name for name in self.config.plugin.keys()}
|
+ plugin_name_map = {name.lower(): name for name in self.config.plugin.keys()}
|
||||||
+
|
+
|
||||||
@@ -33,6 +32,7 @@ index 4324fc700..5d915a85e 100644
|
|||||||
+ if len(parts) == 2 and parts[0] in plugin_name_map:
|
+ if len(parts) == 2 and parts[0] in plugin_name_map:
|
||||||
+ actual_plugin_name = plugin_name_map[parts[0]]
|
+ actual_plugin_name = plugin_name_map[parts[0]]
|
||||||
+ self.config.set_plugin(actual_plugin_name, parts[1], value)
|
+ self.config.set_plugin(actual_plugin_name, parts[1], value)
|
||||||
|
+
|
||||||
|
self.adm = self.addon_manager = AddonManager(self)
|
||||||
|
|
||||||
def _setup_permissions(self):
|
def _setup_permissions(self):
|
||||||
self.log.debug("Setup permissions...")
|
|
||||||
|
|||||||
@@ -7,9 +7,10 @@ GREEN='\033[0;32m'
|
|||||||
YELLOW='\033[1;33m'
|
YELLOW='\033[1;33m'
|
||||||
NC='\033[0m' # No Color
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
# Script directory
|
# Script and repo directories
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||||
REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
PKG_DIR="$(pwd)"
|
||||||
|
REPO_ROOT="$(cd ../../.. && pwd)"
|
||||||
|
|
||||||
# Check if commit SHA is provided
|
# Check if commit SHA is provided
|
||||||
if [ $# -ne 1 ]; then
|
if [ $# -ne 1 ]; then
|
||||||
@@ -34,7 +35,7 @@ fi
|
|||||||
echo -e "${GREEN}==> Updating pyload-ng to commit: ${COMMIT_SHA}${NC}"
|
echo -e "${GREEN}==> Updating pyload-ng to commit: ${COMMIT_SHA}${NC}"
|
||||||
|
|
||||||
# File to update
|
# File to update
|
||||||
PKG_FILE="$REPO_ROOT/utils/pkgs/pyload-ng-updated.nix"
|
PKG_FILE="$PKG_DIR/default.nix"
|
||||||
|
|
||||||
if [ ! -f "$PKG_FILE" ]; then
|
if [ ! -f "$PKG_FILE" ]; then
|
||||||
echo -e "${RED}Error: Package file not found: $PKG_FILE${NC}"
|
echo -e "${RED}Error: Package file not found: $PKG_FILE${NC}"
|
||||||
@@ -53,7 +54,8 @@ echo " ✓ Updated hash in $PKG_FILE"
|
|||||||
|
|
||||||
# Step 3: Build package to discover the correct hash
|
# Step 3: Build package to discover the correct hash
|
||||||
echo -e "${YELLOW}Step 3: Building package to discover hash...${NC}"
|
echo -e "${YELLOW}Step 3: Building package to discover hash...${NC}"
|
||||||
BUILD_OUTPUT=$(nix-build --impure -E "with import <nixpkgs> { overlays = [ (import $REPO_ROOT/utils/overlays/packages.nix) ]; }; callPackage $PKG_FILE { }" 2>&1 || true)
|
cd "$REPO_ROOT"
|
||||||
|
BUILD_OUTPUT=$(nix-build --impure -E "with import <nixpkgs> { overlays = [ (import ./utils/overlays/packages.nix) ]; }; callPackage ./utils/pkgs/pyload-ng { }" 2>&1 || true)
|
||||||
|
|
||||||
# Extract hash from error message
|
# Extract hash from error message
|
||||||
HASH=$(echo "$BUILD_OUTPUT" | grep -oP '\s+got:\s+\Ksha256-[A-Za-z0-9+/=]+' | head -1)
|
HASH=$(echo "$BUILD_OUTPUT" | grep -oP '\s+got:\s+\Ksha256-[A-Za-z0-9+/=]+' | head -1)
|
||||||
@@ -74,7 +76,7 @@ echo " ✓ Updated hash in $PKG_FILE"
|
|||||||
|
|
||||||
# Step 5: Verify the build succeeds
|
# Step 5: Verify the build succeeds
|
||||||
echo -e "${YELLOW}Step 5: Verifying build with correct hash...${NC}"
|
echo -e "${YELLOW}Step 5: Verifying build with correct hash...${NC}"
|
||||||
if nix-build --impure -E "with import <nixpkgs> { overlays = [ (import $REPO_ROOT/utils/overlays/packages.nix) ]; }; callPackage $PKG_FILE { }" > /dev/null 2>&1; then
|
if nix-build --impure -E "with import <nixpkgs> { overlays = [ (import ./utils/overlays/packages.nix) ]; }; callPackage ./utils/pkgs/pyload-ng { }" > /dev/null 2>&1; then
|
||||||
echo " ✓ Build verification successful"
|
echo " ✓ Build verification successful"
|
||||||
else
|
else
|
||||||
echo -e "${RED}Error: Build verification failed${NC}"
|
echo -e "${RED}Error: Build verification failed${NC}"
|
||||||
@@ -83,7 +85,6 @@ fi
|
|||||||
|
|
||||||
# Step 6: Test configuration for fw host (which uses pyload)
|
# Step 6: Test configuration for fw host (which uses pyload)
|
||||||
echo -e "${YELLOW}Step 6: Testing fw configuration...${NC}"
|
echo -e "${YELLOW}Step 6: Testing fw configuration...${NC}"
|
||||||
cd "$REPO_ROOT"
|
|
||||||
if ./scripts/test-configuration fw > /dev/null 2>&1; then
|
if ./scripts/test-configuration fw > /dev/null 2>&1; then
|
||||||
echo " ✓ Configuration test passed"
|
echo " ✓ Configuration test passed"
|
||||||
else
|
else
|
||||||
Reference in New Issue
Block a user