From 290471fcc224fa0a513141561d75bc486a05b840 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Fri, 20 Mar 2026 20:16:28 +0100
Subject: [PATCH 01/22] Update default-creds
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index a5b0a3a..e884087 100644
--- a/flake.lock
+++ b/flake.lock
@@ -224,11 +224,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1773701105,
- "narHash": "sha256-d0bhUPWteTX0MIC26e1ublxnHDQmgiQz7C08lTsgI8M=",
+ "lastModified": 1773941596,
+ "narHash": "sha256-1SuoMqdhJ/wyeYMx6JDsw3xRQDnp+Gt6liaorOHdOkM=",
"owner": "anotherhadi",
"repo": "default-creds",
- "rev": "c79a5cc407030afd70d75a04fe48c23ae35e7538",
+ "rev": "4866d28ebd4d0b0de221acf178480cc5c45b4750",
"type": "github"
},
"original": {
From aba6dafffaa7e93ea2552a6e188ec7ec6cbc5b89 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Tue, 24 Mar 2026 22:57:28 +0100
Subject: [PATCH 02/22] Remove eleakxir for now #53
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 115 +++++++-------------------
flake.nix | 5 +-
home/programs/group/cybersecurity.nix | 2 +-
hosts/server/configuration.nix | 2 +-
4 files changed, 37 insertions(+), 87 deletions(-)
diff --git a/flake.lock b/flake.lock
index e884087..0273700 100644
--- a/flake.lock
+++ b/flake.lock
@@ -237,25 +237,6 @@
"type": "github"
}
},
- "eleakxir": {
- "inputs": {
- "nixpkgs": "nixpkgs_2",
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1771187409,
- "narHash": "sha256-kGeEqAj+cvY7autKbE/Jl/uxC5yPHLYgwWF5Ad9JHWc=",
- "owner": "anotherhadi",
- "repo": "eleakxir",
- "rev": "8b0fcfd8edefd9d70651d3d598190a844f74f0f8",
- "type": "github"
- },
- "original": {
- "owner": "anotherhadi",
- "repo": "eleakxir",
- "type": "github"
- }
- },
"firefox-gnome-theme": {
"flake": false,
"locked": {
@@ -542,9 +523,9 @@
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks",
- "systems": "systems_3",
+ "systems": "systems_2",
"xdph": "xdph"
},
"locked": {
@@ -868,7 +849,7 @@
},
"nixarr": {
"inputs": {
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"vpnconfinement": "vpnconfinement",
"website-builder": "website-builder"
},
@@ -890,7 +871,7 @@
"inputs": {
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_4",
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
@@ -1002,22 +983,6 @@
}
},
"nixpkgs_2": {
- "locked": {
- "lastModified": 1767379071,
- "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
"locked": {
"lastModified": 1773389992,
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
@@ -1033,7 +998,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1765608474,
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
@@ -1049,7 +1014,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
@@ -1065,7 +1030,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1773646010,
"narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
@@ -1081,7 +1046,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
@@ -1097,7 +1062,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1773507054,
"narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
@@ -1113,7 +1078,7 @@
"type": "github"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1767767207,
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
@@ -1160,8 +1125,8 @@
"flake-parts": "flake-parts_3",
"mnw": "mnw",
"ndg": "ndg",
- "nixpkgs": "nixpkgs_7",
- "systems": "systems_4"
+ "nixpkgs": "nixpkgs_6",
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1773579076,
@@ -1248,14 +1213,13 @@
"caelestia-cli": "caelestia-cli",
"caelestia-shell": "caelestia-shell_2",
"default-creds": "default-creds",
- "eleakxir": "eleakxir",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-index-database": "nix-index-database",
"nixarr": "nixarr",
"nixcord": "nixcord",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_6",
+ "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable",
"nvf": "nvf",
"sops-nix": "sops-nix",
@@ -1265,7 +1229,7 @@
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_8"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1773550941,
@@ -1286,7 +1250,7 @@
"nixpkgs": [
"nixpkgs"
],
- "systems": "systems_5"
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1773619901,
@@ -1311,9 +1275,9 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_4",
"gnome-shell": "gnome-shell",
- "nixpkgs": "nixpkgs_9",
+ "nixpkgs": "nixpkgs_8",
"nur": "nur",
- "systems": "systems_6",
+ "systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@@ -1350,21 +1314,6 @@
}
},
"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"
- }
- },
- "systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1379,6 +1328,21 @@
"type": "github"
}
},
+ "systems_3": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"systems_4": {
"locked": {
"lastModified": 1681028828,
@@ -1409,21 +1373,6 @@
"type": "github"
}
},
- "systems_6": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"tinted-foot": {
"flake": false,
"locked": {
diff --git a/flake.nix b/flake.nix
index bb534c9..a1ae486 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
# Server
- eleakxir.url = "github:anotherhadi/eleakxir";
+ # FIXME: Deleted repo for now
+ # eleakxir.url = "github:anotherhadi/eleakxir";
nixarr.url = "github:rasmus-kirk/nixarr";
};
@@ -82,7 +83,7 @@
inputs.stylix.nixosModules.stylix
inputs.sops-nix.nixosModules.sops
inputs.nixarr.nixosModules.default
- inputs.eleakxir.nixosModules.eleakxir
+ # inputs.eleakxir.nixosModules.eleakxir
inputs.nix-index-database.nixosModules.default
inputs.default-creds.nixosModules.default
./hosts/server/configuration.nix
diff --git a/home/programs/group/cybersecurity.nix b/home/programs/group/cybersecurity.nix
index abf463c..7b20d2b 100644
--- a/home/programs/group/cybersecurity.nix
+++ b/home/programs/group/cybersecurity.nix
@@ -9,7 +9,7 @@
nmap
john
hashcat
- inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
+ # inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
caido
nuclei
];
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index e28e21a..ee15bad 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -16,7 +16,7 @@
../../server-modules/glance
../../server-modules/adguardhome.nix
../../server-modules/arr.nix
- ../../server-modules/eleakxir.nix
+ # ../../server-modules/eleakxir.nix
../../server-modules/stirling-pdf.nix
../../server-modules/cyberchef.nix
../../server-modules/linkding.nix
From 5de0ce50d6b3c2acac0742b982359b0579995ba6 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:34:43 +0100
Subject: [PATCH 03/22] edit secrets
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/server/secrets/secrets.yaml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hosts/server/secrets/secrets.yaml b/hosts/server/secrets/secrets.yaml
index d15cce8..055d82a 100644
--- a/hosts/server/secrets/secrets.yaml
+++ b/hosts/server/secrets/secrets.yaml
@@ -1,4 +1,3 @@
-freshrss: ENC[AES256_GCM,data:xJzlm5cOQVl/bZA=,iv:DgZN6EInXfkA8nhPeIPH1T+x0z7X3WlHGcoRDF3dpI4=,tag:YqUhltbHAq2kmmdiffn4tQ==,type:str]
umami-secret: ENC[AES256_GCM,data:tImpd4sD92Omf/YFB8YE4gxAu+g801wQNR+k5rhY6AbzIIYOzpVmQL4XGjfp9Teky3olii4s3XTcmTyuMoxMWg==,iv:QFAEzYnAnxOOtrHWiM2IkvSs0Aqk3s1T5X7j5WC+tO8=,tag:FIbgHLfRVMJ2qZ6dOJ8zLw==,type:str]
sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
@@ -7,7 +6,7 @@ recyclarr: ENC[AES256_GCM,data:eJNbGHb4SZvbF7FAHMrpRynmpVyPiTpyZqNx40Fo+lanqdm7d
wireguard-pia: ENC[AES256_GCM,data:2IvJARGhesMuH9RdWzsyrwA7eqrhLyacQqZ1RNEkGOPUkQGX4uimKBSzkxXRy/haZ4V2k73JdLSaB9rAuI0n65GmWHmarwZekOyhRZSNb+zvFgw5BPZmywG1wR2HiTGR/qILovAaz47q/VnohUnjbbMCUvarC4PytWGxMUH96GIgZar8HjHFtK8grCSxlvpHKiDeKx8VSXnY/Pxj1EplBtIqwmtAeZdf/VjtwOL0nY54doPwHdIAvJ0B8Cu0a1zJIGEbV1NlKIHEJ1YA7rmv1ODkBnbXbIHMxAR3jeqR/UDqhDmXe41KujhiJI7nNeO7FKo2v92jK3fSbxYKatLrzXktHpE9JsMYVBXzTK7yAXPgoDdgLXzWH0OrJGBSisPrvqmxUko7MPreuwVYfFlKpll6JLifk8sML4A+94UPR8b89guXn7kBkLg1Y1oIAyguCdKpNOD31nXBMFF0nTcmCwyshDySaGTfJDgox65/77AiN1wH,iv:cdu6lBjLnEEfSFmWMC4Vn2sLKsvpCaatzXlgRNkEMeA=,tag:y1rAeNPB+DNGTpnP94iQrA==,type:str]
signing-key: ENC[AES256_GCM,data:FrJzuTgH/ooZkcnYL55uQcc4u+QzNnFvNVs2wDSE4nnwku+EuCJBlb8pd/6W0KPwIXzcki/8CY0YfRcRrzjExMgMa4hwxrlxS9bk3LNPzJsrRK5RJgPg3iA8L791f1zcDxNf8RuWatIqm1TCK+Vhdk/p+221zy1Gcq1dW8X+o4XzbPBzHdLagcIdB0wpjYTtIoGP2X8GoL/NJpuzIiQBK1HdGNKvUI2+ztqCQZOsxm+Fki57NteX3/Llw8AwABjdZvviOBZ62OvJ/SsOQ9NYAvKfAkog5zCn8DLvaqAPGSxRBQEYWM8GyL2imgs54YfEsOpGa4DzMiv4Sc5m398E/asaPq357eksUqh3EYpzoKZ5bIbd5+Vs3KBWKHltUCzXLHaLrIX0CuJFQFi7DCxEbYqlb04x5t3jc/c+/7uwqBHv1Y5gwAjd8JswDWmE7Q3xSk96Za57SCxWPYTo2ErsA2XdL+yxXdhmqkhDZKtUzrcHExhnYe7YLpSlBEclJ/G2BeTOFIWoAmN+1y4rh21R,iv:VaZrv5/41ZyIax702Yae4QmFKpcEaWwPmTo2Mxao3bU=,tag:HC0eqDNit7jQKeeDAKWXKg==,type:str]
signing-pub-key: ENC[AES256_GCM,data:CB7uU2Q4oTEKihpTIXGLaV0fJ1cv/p4oJJ5kjaU6BZiKhsiMA1JILUw2oVIDTDb+80WPzolDzZwWM8v31d5QIrZpHcPrdRLyV0X2USfG9U4aQ/ls79QAyOOJXA==,iv:/Eb5/+p86tw3tqNiDVHGu7HS1KBtFiYIgasRYJsAiEo=,tag:dGdJlcrnuU73s+IMQ3w3hA==,type:str]
-cloudflared-token: ENC[AES256_GCM,data:uavOnRWtehxWpANgeCVasQ5jEQNT4oqp/3G3PmXdEUxQ7rpBGRplW0gcWz3KfUkE23BPDwES0pPPWgOKrpNqJjnisLX5uHUw+1atA/Qqw8QIimsvtPRgBO4+6fLIY+0q05Gr2gAm/JqQGflNuY4eUEbyzIYTDlGGE7p5sUIQJR4YWJssc2NLrxv1XH47UQS9MvZkoc5y8aC7YxoxS9VpJYDci9SHThh1ZGF8+HkrQuU=,iv:yPR0ido6l/4qpWRkJQYxlPhUkr4RBseCpio0uYEPekY=,tag:NpptYmlQO3khrrZTDRNC1A==,type:str]
+cloudflared-token: ENC[AES256_GCM,data:7DwWFL6JbJXuc6fSyrZkMt/+DAcqDYBQOzJ1QhBL4yfCpQ57mjDV2beRZ8H7SuyoKY3caifHfAVVPDGG1YnffZ9anLRyDW383aHKmgaeztOXj44eVQcHi3evnSiH6h0HasiyO8pNzhnKpYew8CwHSvYZMraX3ITz8UKOTtsanO9/8ZD6Y9gyxfLoySqbeBy2x/0Ql5hrDfrX854C+vYuXM9VJbtQqMBa7+IBydUvddk=,iv:jZTk5ptuwc+1aP2rimqGnyCHR4/J+W4Kyn3LKXXkv/I=,tag:xr/LhoNH5aWdIJr0Py6nAg==,type:str]
sops:
age:
- recipient: age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
@@ -19,7 +18,7 @@ sops:
TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-03-16T20:32:08Z"
- mac: ENC[AES256_GCM,data:kREf/IsxZp74r/1r0ySwyrz+YGHbMZfR/1+CHLKOP7z/PjH3btjpAEU4lJ2kDSOYwA6gdNI2rpPzWKoXsCpLAeJJ39ezxzUuUnyUh3Nt4dbr94B9FZpv0RQPY3Q26FAIK1+6cW/2/3O1qHwOOG3ZI2MduQtZQ+XsAmhkJoFmkVY=,iv:vOEHu3QahSZQOrx/iCtLFqCzZP6+HX/I9zQHSDcb7Mg=,tag:YxXOFcL0E5VlWufg+YJCbQ==,type:str]
+ lastmodified: "2026-03-25T17:31:48Z"
+ mac: ENC[AES256_GCM,data:H2rA9l2v1UhDX7EQH7mYKLEDfRetKH6o4oBYOd7sviuPojk/wMzf2lGYASuEdT7zi1UmrnvHiT7fybVcb5yQQ9ktoRI4QGU3jy2MzXzs+yvlEb+umfjld6LTTRZM7IqzH7ld3F1TovwSZJ2gxT2ExmQqdq0H/7WVqesjqcOdxzM=,iv:8GgP0fuzppdJKovQy71l6z/raeXZNUdlsVsaNZ5KhLg=,tag:Lmf0QkY34Albr/vPNEtouA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.1
From b4d8e87abe7254f4c446f7ae3e5b2c849a7a8d83 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:35:27 +0100
Subject: [PATCH 04/22] change domain name
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
home/system/hyprland/bindings.nix | 2 +-
server-modules/adguardhome.nix | 2 +-
server-modules/arr.nix | 18 +++++++++---------
server-modules/cloudflared.nix | 2 +-
server-modules/cyberchef.nix | 2 +-
server-modules/default-creds.nix | 2 +-
server-modules/eleakxir.nix | 2 +-
server-modules/freshrss.nix | 31 -------------------------------
server-modules/glance/default.nix | 8 ++++----
server-modules/glance/home.nix | 10 +++++-----
server-modules/glance/server.nix | 30 +++++++++++++++---------------
server-modules/linkding.nix | 24 ------------------------
server-modules/mazanoke.nix | 2 +-
server-modules/mealie.nix | 2 +-
server-modules/ssh.nix | 2 +-
server-modules/stirling-pdf.nix | 2 +-
server-modules/umami.nix | 5 +++--
17 files changed, 46 insertions(+), 100 deletions(-)
delete mode 100644 server-modules/freshrss.nix
delete mode 100644 server-modules/linkding.nix
diff --git a/home/system/hyprland/bindings.nix b/home/system/hyprland/bindings.nix
index 6f573df..ad71096 100644
--- a/home/system/hyprland/bindings.nix
+++ b/home/system/hyprland/bindings.nix
@@ -83,7 +83,7 @@ in {
{
key = "h";
desc = "Home";
- cmd = "${pkgs.brave}/bin/brave 'https://home.hadi.diy'";
+ cmd = "${pkgs.brave}/bin/brave 'https://home.hadi.icu'";
}
{
key = "m";
diff --git a/server-modules/adguardhome.nix b/server-modules/adguardhome.nix
index d64df92..d5703c1 100644
--- a/server-modules/adguardhome.nix
+++ b/server-modules/adguardhome.nix
@@ -11,5 +11,5 @@
allowedUDPPorts = [53];
};
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."adguard.hadi.diy" = "http://localhost:${toString config.services.adguardhome.port}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."adguard.hadi.icu" = "http://localhost:${toString config.services.adguardhome.port}";
}
diff --git a/server-modules/arr.nix b/server-modules/arr.nix
index 760e71e..869dcf2 100644
--- a/server-modules/arr.nix
+++ b/server-modules/arr.nix
@@ -52,14 +52,14 @@ in {
users.users.jellyfin.extraGroups = ["video" "render"];
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress = {
- "media.hadi.diy" = "http://localhost:8096";
- "demandemedia.hadi.diy" = "http://localhost:5055";
- "bazarr.hadi.diy" = "http://localhost:6767";
- "prowlarr.hadi.diy" = "http://localhost:9696";
- "radarr.hadi.diy" = "http://localhost:7878";
- "sonarr.hadi.diy" = "http://localhost:8989";
- "transmission.hadi.diy" = "http://localhost:9091";
- "readarr.hadi.diy" = "http://localhost:8787";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
+ "media.hadi.icu" = "http://localhost:8096";
+ "demandemedia.hadi.icu" = "http://localhost:5055";
+ "bazarr.hadi.icu" = "http://localhost:6767";
+ "prowlarr.hadi.icu" = "http://localhost:9696";
+ "radarr.hadi.icu" = "http://localhost:7878";
+ "sonarr.hadi.icu" = "http://localhost:8989";
+ "transmission.hadi.icu" = "http://localhost:9091";
+ "readarr.hadi.icu" = "http://localhost:8787";
};
}
diff --git a/server-modules/cloudflared.nix b/server-modules/cloudflared.nix
index bc70a18..063344b 100644
--- a/server-modules/cloudflared.nix
+++ b/server-modules/cloudflared.nix
@@ -14,7 +14,7 @@
# This will create a credentials file & give you the tunnel ID to use below.
services.cloudflared = {
enable = true;
- tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73" = {
+ tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
credentialsFile = config.sops.secrets."cloudflared-token".path;
default = "http_status:404";
};
diff --git a/server-modules/cyberchef.nix b/server-modules/cyberchef.nix
index e84ae94..b71c371 100644
--- a/server-modules/cyberchef.nix
+++ b/server-modules/cyberchef.nix
@@ -10,6 +10,6 @@
}
];
};
- cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."cyberchef.hadi.diy" = "http://localhost:8754";
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."cyberchef.hadi.icu" = "http://localhost:8754";
};
}
diff --git a/server-modules/default-creds.nix b/server-modules/default-creds.nix
index 3f59d33..1708f98 100644
--- a/server-modules/default-creds.nix
+++ b/server-modules/default-creds.nix
@@ -4,5 +4,5 @@
port = 8087;
};
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."default-creds.hadi.diy" = "http://localhost:${toString config.services.default-creds.port}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."default-creds.hadi.icu" = "http://localhost:${toString config.services.default-creds.port}";
}
diff --git a/server-modules/eleakxir.nix b/server-modules/eleakxir.nix
index c1b445d..7f28886 100644
--- a/server-modules/eleakxir.nix
+++ b/server-modules/eleakxir.nix
@@ -22,5 +22,5 @@
inputs.eleakxir.packages.${pkgs.stdenv.hostPlatform.system}.leak-utils
];
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."eleakxir-back.hadi.diy" = "http://localhost:${toString config.services.eleakxir.port}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."eleakxir-back.hadi.icu" = "http://localhost:${toString config.services.eleakxir.port}";
}
diff --git a/server-modules/freshrss.nix b/server-modules/freshrss.nix
deleted file mode 100644
index 2dab2f6..0000000
--- a/server-modules/freshrss.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- pkgs,
- config,
- ...
-}: let
- user = config.var.username;
-in {
- sops.secrets = {
- freshrss = {
- owner = "freshrss";
- mode = "0600";
- };
- };
-
- services.freshrss = {
- enable = true;
- defaultUser = user;
- passwordFile = config.sops.secrets.freshrss.path;
- user = "freshrss";
- baseUrl = "https://rss.hadi.diy";
- webserver = "nginx";
-
- extensions = with pkgs.freshrss-extensions; [
- youtube
- title-wrap
- reading-time
- ];
- };
-
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."rss.hadi.diy" = "http://localhost:80";
-}
diff --git a/server-modules/glance/default.nix b/server-modules/glance/default.nix
index 8d75bbf..53dab96 100644
--- a/server-modules/glance/default.nix
+++ b/server-modules/glance/default.nix
@@ -14,10 +14,10 @@
server.port = 5678;
};
};
- cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress = {
- "start.hadi.diy" = "http://localhost:8755";
- "home.hadi.diy" = "http://localhost:8755";
- "glance.hadi.diy" = "http://localhost:8755";
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
+ "start.hadi.icu" = "http://localhost:8755";
+ "home.hadi.icu" = "http://localhost:8755";
+ "glance.hadi.icu" = "http://localhost:8755";
};
nginx.virtualHosts."glance.local" = {
diff --git a/server-modules/glance/home.nix b/server-modules/glance/home.nix
index 2d175df..289ede9 100644
--- a/server-modules/glance/home.nix
+++ b/server-modules/glance/home.nix
@@ -58,7 +58,7 @@
links = [
{
title = "Linkding";
- url = "https://linkding.hadi.diy";
+ url = "https://linkding.hadi.icu";
}
{
title = "Mail";
@@ -101,11 +101,11 @@
}
{
title = "Mazanoke (image downgrading)";
- url = "https://mazanoke.hadi.diy";
+ url = "https://mazanoke.hadi.icu";
}
{
title = "Stirling PDF";
- url = "https://pdf.hadi.diy";
+ url = "https://pdf.hadi.icu";
}
{
title = "Vert (file converter)";
@@ -204,11 +204,11 @@
links = [
{
title = "Nix 4 Cyber";
- url = "https://n4c.hadi.diy";
+ url = "https://n4c.hadi.icu";
}
{
title = "Cyberchef";
- url = "https://cyberchef.hadi.diy";
+ url = "https://cyberchef.hadi.icu";
}
{
title = "TryHackMe";
diff --git a/server-modules/glance/server.nix b/server-modules/glance/server.nix
index 7d6e09a..1d0822e 100644
--- a/server-modules/glance/server.nix
+++ b/server-modules/glance/server.nix
@@ -26,37 +26,37 @@
sites = [
{
title = "Adguard";
- url = "https://adguard.hadi.diy";
+ url = "https://adguard.hadi.icu";
icon = "si:adguard";
}
{
title = "Mealie";
- url = "https://mealie.hadi.diy";
+ url = "https://mealie.hadi.icu";
icon = "si:mealie";
}
{
title = "Linkding";
- url = "https://linkding.hadi.diy";
+ url = "https://linkding.hadi.icu";
icon = "sh:linkding";
}
{
title = "Mazanoke";
- url = "https://mazanoke.hadi.diy";
+ url = "https://mazanoke.hadi.icu";
icon = "sh:mazanoke";
}
{
title = "Stirling PDF";
- url = "https://pdf.hadi.diy";
+ url = "https://pdf.hadi.icu";
icon = "sh:stirling-pdf";
}
{
title = "Eleakxir";
- url = "https://eleakxir.hadi.diy";
+ url = "https://eleakxir.hadi.icu";
icon = "si:elixir";
}
{
title = "Cyberchef";
- url = "https://cyberchef.hadi.diy";
+ url = "https://cyberchef.hadi.icu";
icon = "si:codechef";
}
];
@@ -68,42 +68,42 @@
sites = [
{
title = "Jellyfin";
- url = "https://media.hadi.diy";
+ url = "https://media.hadi.icu";
icon = "si:jellyfin";
}
{
title = "Jellyseerr";
- url = "https://demandemedia.hadi.diy";
+ url = "https://demandemedia.hadi.icu";
icon = "si:odysee";
}
{
title = "Radarr";
- url = "https://radarr.hadi.diy";
+ url = "https://radarr.hadi.icu";
icon = "si:radarr";
}
{
title = "Sonarr";
- url = "https://sonarr.hadi.diy";
+ url = "https://sonarr.hadi.icu";
icon = "si:sonarr";
}
{
title = "Readarr";
- url = "https://readarr.hadi.diy";
+ url = "https://readarr.hadi.icu";
icon = "si:bookstack";
}
{
title = "Bazarr";
- url = "https://bazarr.hadi.diy";
+ url = "https://bazarr.hadi.icu";
icon = "si:subtitleedit";
}
{
title = "Prowlarr";
- url = "https://prowlarr.hadi.diy";
+ url = "https://prowlarr.hadi.icu";
icon = "si:podcastindex";
}
{
title = "Transmission";
- url = "https://transmission.hadi.diy";
+ url = "https://transmission.hadi.icu";
icon = "si:transmission";
}
];
diff --git a/server-modules/linkding.nix b/server-modules/linkding.nix
deleted file mode 100644
index ebd9476..0000000
--- a/server-modules/linkding.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# Linkding is a self-hosted bookmark manager
-{...}: let
- port = 9090;
-in {
- virtualisation.oci-containers.containers.linkding = {
- autoStart = true;
- image = "sissbruecker/linkding@sha256:6d4fcc50bee8ee054ad2dfebbc41217f325398b907aff7ec011996c6a5ec17c9";
- volumes = ["/var/lib/linkding/data:/etc/linkding/data"];
- ports = ["${builtins.toString port}:${builtins.toString port}"];
- };
-
- # Ensure our mount point exists
- systemd.tmpfiles.settings."10-linkding" = {
- "/var/lib/linkding/data" = {
- d = {
- mode = "0755";
- user = "root";
- group = "root";
- };
- };
- };
-
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."linkding.hadi.diy" = "http://localhost:${toString port}";
-}
diff --git a/server-modules/mazanoke.nix b/server-modules/mazanoke.nix
index bb0ab34..4aff26b 100644
--- a/server-modules/mazanoke.nix
+++ b/server-modules/mazanoke.nix
@@ -30,6 +30,6 @@ in {
}
];
};
- cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."mazanoke.hadi.diy" = "http://localhost:8755";
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mazanoke.hadi.icu" = "http://localhost:8755";
};
}
diff --git a/server-modules/mealie.nix b/server-modules/mealie.nix
index 054307f..a398430 100644
--- a/server-modules/mealie.nix
+++ b/server-modules/mealie.nix
@@ -5,5 +5,5 @@
port = 8092;
};
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."mealie.hadi.diy" = "http://localhost:${toString config.services.mealie.port}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mealie.hadi.icu" = "http://localhost:${toString config.services.mealie.port}";
}
diff --git a/server-modules/ssh.nix b/server-modules/ssh.nix
index d9ec325..361305b 100644
--- a/server-modules/ssh.nix
+++ b/server-modules/ssh.nix
@@ -18,5 +18,5 @@ in {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy"
];
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."ssh.hadi.diy" = "ssh://localhost:22";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."ssh.hadi.icu" = "ssh://localhost:22";
}
diff --git a/server-modules/stirling-pdf.nix b/server-modules/stirling-pdf.nix
index 4215a37..458854b 100644
--- a/server-modules/stirling-pdf.nix
+++ b/server-modules/stirling-pdf.nix
@@ -5,5 +5,5 @@
environment."SERVER_PORT" = "8083";
};
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."pdf.hadi.diy" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."pdf.hadi.icu" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}";
}
diff --git a/server-modules/umami.nix b/server-modules/umami.nix
index 80a1f4c..f282041 100644
--- a/server-modules/umami.nix
+++ b/server-modules/umami.nix
@@ -13,9 +13,10 @@
DISABLE_BOT_CHECK = true;
};
};
- services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."umami.hadi.diy" = "http://localhost:${toString config.services.umami.settings.PORT}";
+ services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."umami.hadi.icu" = "http://localhost:${toString config.services.umami.settings.PORT}";
systemd.services.default-creds.environment = {
- PUBLIC_UMAMI_URL = "https://umami.hadi.diy";
+ PUBLIC_UMAMI_URL = "https://umami.hadi.icu";
+ # FIXME:
PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
UMAMI_URL = "http://localhost:8097";
UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
From e4a2a7abd015da2d4ada815c5b1f828097fd5152 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:51:17 +0100
Subject: [PATCH 05/22] edit tunnels
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/server/configuration.nix | 2 --
server-modules/cloudflared.nix | 6 ++++++
server-modules/glance/default.nix | 6 +-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index ee15bad..a333237 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -19,11 +19,9 @@
# ../../server-modules/eleakxir.nix
../../server-modules/stirling-pdf.nix
../../server-modules/cyberchef.nix
- ../../server-modules/linkding.nix
../../server-modules/mazanoke.nix
../../server-modules/nginx.nix
../../server-modules/fail2ban.nix
- ../../server-modules/freshrss.nix
../../server-modules/default-creds.nix
../../server-modules/umami.nix
diff --git a/server-modules/cloudflared.nix b/server-modules/cloudflared.nix
index 063344b..8aa7947 100644
--- a/server-modules/cloudflared.nix
+++ b/server-modules/cloudflared.nix
@@ -24,6 +24,12 @@
cloudflared
];
+ systemd.services."cloudflared-tunnel-a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
+ wantedBy = ["multi-user.target"];
+ after = ["network-online.target"];
+ wants = ["network-online.target"];
+ };
+
# At the moment (2025), for support of browser rendering of the tunnels, this line is required:
services.openssh.settings.Macs = [
"hmac-sha2-256"
diff --git a/server-modules/glance/default.nix b/server-modules/glance/default.nix
index 53dab96..9a9144c 100644
--- a/server-modules/glance/default.nix
+++ b/server-modules/glance/default.nix
@@ -14,11 +14,7 @@
server.port = 5678;
};
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
- "start.hadi.icu" = "http://localhost:8755";
- "home.hadi.icu" = "http://localhost:8755";
- "glance.hadi.icu" = "http://localhost:8755";
- };
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."home.hadi.icu" = "http://localhost:8755";
nginx.virtualHosts."glance.local" = {
listen = [
From 9a41aff92d7b0977406db16291b8500623ec050f Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 20:30:02 +0100
Subject: [PATCH 06/22] migration hadi.diy > hadi.icu
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 417 ++++++++++++++++++--------
flake.nix | 4 +-
hosts/server/configuration.nix | 2 +
hosts/server/secrets/secrets.yaml | 6 +-
server-modules/arr.nix | 2 -
server-modules/awesome-wallpapers.nix | 25 ++
server-modules/blog.nix | 26 ++
7 files changed, 358 insertions(+), 124 deletions(-)
create mode 100644 server-modules/awesome-wallpapers.nix
create mode 100644 server-modules/blog.nix
diff --git a/flake.lock b/flake.lock
index 0273700..77a748e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
]
},
"locked": {
- "lastModified": 1773436376,
- "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=",
+ "lastModified": 1774211390,
+ "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8",
+ "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
"type": "github"
},
"original": {
@@ -33,6 +33,24 @@
"type": "github"
}
},
+ "awesome-wallpapers": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1774465437,
+ "narHash": "sha256-8tbInCtwFY9XsM/ZTXkM8qR73S8LJCwn+52dEuB7oCc=",
+ "owner": "anotherhadi",
+ "repo": "awesome-wallpapers",
+ "rev": "78a2beefafbe5ae0b863ba1adcc6f99464e9d406",
+ "type": "github"
+ },
+ "original": {
+ "owner": "anotherhadi",
+ "repo": "awesome-wallpapers",
+ "type": "github"
+ }
+ },
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@@ -101,12 +119,31 @@
"type": "github"
}
},
+ "blog": {
+ "inputs": {
+ "bun2nix": "bun2nix",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1774462561,
+ "narHash": "sha256-7O/cvwCvp9nI1U2Ll13aJ9573Z4K8JisXH91AwYaw4I=",
+ "owner": "anotherhadi",
+ "repo": "blog",
+ "rev": "8a6133dd15a266fb156f94260b55d03421f4f405",
+ "type": "github"
+ },
+ "original": {
+ "owner": "anotherhadi",
+ "repo": "blog",
+ "type": "github"
+ }
+ },
"bun2nix": {
"inputs": {
"flake-parts": "flake-parts",
"import-tree": "import-tree",
"nixpkgs": [
- "default-creds",
+ "blog",
"nixpkgs"
],
"systems": "systems",
@@ -126,6 +163,31 @@
"type": "github"
}
},
+ "bun2nix_2": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "import-tree": "import-tree_2",
+ "nixpkgs": [
+ "default-creds",
+ "nixpkgs"
+ ],
+ "systems": "systems_2",
+ "treefmt-nix": "treefmt-nix_2"
+ },
+ "locked": {
+ "lastModified": 1770895533,
+ "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=",
+ "owner": "nix-community",
+ "repo": "bun2nix",
+ "rev": "c843f477b15f51151f8c6bcc886954699440a6e1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "bun2nix",
+ "type": "github"
+ }
+ },
"caelestia-cli": {
"inputs": {
"caelestia-shell": "caelestia-shell",
@@ -134,11 +196,11 @@
]
},
"locked": {
- "lastModified": 1773630886,
- "narHash": "sha256-zVz05a5qAe8rhZhGGQF0mioEsiZm02hzEyZg3OjErXk=",
+ "lastModified": 1774320558,
+ "narHash": "sha256-A9PIRLTV3bOX3sl9G6IO+BRO9Q6vP1KmfPYUVmtVZt4=",
"owner": "caelestia-dots",
"repo": "cli",
- "rev": "8c6d9332678442bc020f7efbae1585f050cc8f4b",
+ "rev": "5bb3276b1418463e7c313f1b2fc064dcbf5b2c86",
"type": "github"
},
"original": {
@@ -183,11 +245,11 @@
"quickshell": "quickshell"
},
"locked": {
- "lastModified": 1772962569,
- "narHash": "sha256-ctRw4pVgx0IYKfA2hy90Ku37pnVX2T4q57UWp+l69fs=",
+ "lastModified": 1774280005,
+ "narHash": "sha256-Sj28gSYkCgN0ZXpTMYpnpAu4lK51ieCMngOGedB82So=",
"owner": "caelestia-dots",
"repo": "shell",
- "rev": "e183599ce9e2c8d30a14631d53eb9947220c0812",
+ "rev": "501a14bd2a8ab7703aac6a224824a23818552554",
"type": "github"
},
"original": {
@@ -205,11 +267,11 @@
"quickshell": "quickshell_2"
},
"locked": {
- "lastModified": 1773574600,
- "narHash": "sha256-RsBgiq93SjlYVHSYtz/ESALa7WgbLu+xcH0oTJRjztQ=",
+ "lastModified": 1774280005,
+ "narHash": "sha256-Sj28gSYkCgN0ZXpTMYpnpAu4lK51ieCMngOGedB82So=",
"owner": "caelestia-dots",
"repo": "shell",
- "rev": "377778596acf90451d1bd19f0c03b5f1c0467958",
+ "rev": "501a14bd2a8ab7703aac6a224824a23818552554",
"type": "github"
},
"original": {
@@ -220,8 +282,8 @@
},
"default-creds": {
"inputs": {
- "bun2nix": "bun2nix",
- "nixpkgs": "nixpkgs"
+ "bun2nix": "bun2nix_2",
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1773941596,
@@ -321,6 +383,24 @@
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
+ "locked": {
+ "lastModified": 1769996383,
+ "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_3": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib_3"
+ },
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
@@ -335,7 +415,7 @@
"type": "github"
}
},
- "flake-parts_3": {
+ "flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nvf",
@@ -356,7 +436,7 @@
"type": "github"
}
},
- "flake-parts_4": {
+ "flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"stylix",
@@ -441,11 +521,11 @@
]
},
"locked": {
- "lastModified": 1773681856,
- "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
+ "lastModified": 1774379316,
+ "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
+ "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
"type": "github"
},
"original": {
@@ -523,17 +603,17 @@
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks",
- "systems": "systems_2",
+ "systems": "systems_3",
"xdph": "xdph"
},
"locked": {
- "lastModified": 1773615208,
- "narHash": "sha256-3iP2i2cthe+W7FwG1bqrla404dz4hHHJlQyi63UH2ZE=",
+ "lastModified": 1774445873,
+ "narHash": "sha256-chWRF3JavLDD9tOI8Av/1LSAkpvk/+BYvNQvTB8Ctyo=",
"ref": "refs/heads/main",
- "rev": "30c498acf4173930dfd8afd6279ebceacb1941e9",
- "revCount": 7032,
+ "rev": "8196711aaa78c8f62e6f720636ef707783685036",
+ "revCount": 7054,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -708,11 +788,11 @@
]
},
"locked": {
- "lastModified": 1773436263,
- "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=",
+ "lastModified": 1774211405,
+ "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "5e228db6821380a5875d5643176c5c46a47b8134",
+ "rev": "cb4e152dc72095a2af422956c6b689590572231a",
"type": "github"
},
"original": {
@@ -790,6 +870,21 @@
"type": "github"
}
},
+ "import-tree_2": {
+ "locked": {
+ "lastModified": 1763762820,
+ "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
+ "owner": "vic",
+ "repo": "import-tree",
+ "rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
+ "type": "github"
+ },
+ "original": {
+ "owner": "vic",
+ "repo": "import-tree",
+ "type": "github"
+ }
+ },
"mnw": {
"locked": {
"lastModified": 1770419553,
@@ -834,11 +929,11 @@
]
},
"locked": {
- "lastModified": 1773552174,
- "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=",
+ "lastModified": 1774156144,
+ "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "8faeb68130df077450451b6734a221ba0d6cde42",
+ "rev": "55b588747fa3d7fc351a11831c4b874dab992862",
"type": "github"
},
"original": {
@@ -849,7 +944,7 @@
},
"nixarr": {
"inputs": {
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_5",
"vpnconfinement": "vpnconfinement",
"website-builder": "website-builder"
},
@@ -870,16 +965,16 @@
"nixcord": {
"inputs": {
"flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_4",
+ "flake-parts": "flake-parts_3",
+ "nixpkgs": "nixpkgs_6",
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
- "lastModified": 1773597570,
- "narHash": "sha256-A6KsirR9kxR1wVFTr8aagk5vUT3rvKTf79Qht6YkxUA=",
+ "lastModified": 1774456554,
+ "narHash": "sha256-FwlMuGluoa1iWkDsLrzi1ha5nGQzBbw3i+N385BQMgc=",
"owner": "kaylorben",
"repo": "nixcord",
- "rev": "1cc0ddb766e459b7187e6aeb8b2e046d37361dc4",
+ "rev": "82c0155f98000cc691d2b25cc36908b9ba6a05aa",
"type": "github"
},
"original": {
@@ -890,11 +985,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1773533765,
- "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
+ "lastModified": 1774422943,
+ "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
+ "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f",
"type": "github"
},
"original": {
@@ -906,15 +1001,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1772773019,
- "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
- "owner": "NixOS",
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
- "owner": "NixOS",
+ "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -936,6 +1031,21 @@
}
},
"nixpkgs-lib_2": {
+ "locked": {
+ "lastModified": 1769909678,
+ "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "72716169fe93074c333e8d0173151350670b824c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
+ }
+ },
+ "nixpkgs-lib_3": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
@@ -982,13 +1092,29 @@
"type": "github"
}
},
- "nixpkgs_2": {
+ "nixpkgs_10": {
"locked": {
- "lastModified": 1773389992,
- "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
+ "lastModified": 1767767207,
+ "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
+ "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -999,6 +1125,38 @@
}
},
"nixpkgs_3": {
+ "locked": {
+ "lastModified": 1772773019,
+ "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "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_5": {
"locked": {
"lastModified": 1765608474,
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
@@ -1014,7 +1172,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
@@ -1030,13 +1188,13 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_7": {
"locked": {
- "lastModified": 1773646010,
- "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -1046,7 +1204,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
@@ -1062,13 +1220,13 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_9": {
"locked": {
- "lastModified": 1773507054,
- "narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
+ "lastModified": 1773840656,
+ "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
+ "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
"type": "github"
},
"original": {
@@ -1078,22 +1236,6 @@
"type": "github"
}
},
- "nixpkgs_8": {
- "locked": {
- "lastModified": 1767767207,
- "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nur": {
"inputs": {
"flake-parts": [
@@ -1122,18 +1264,18 @@
"nvf": {
"inputs": {
"flake-compat": "flake-compat_3",
- "flake-parts": "flake-parts_3",
+ "flake-parts": "flake-parts_4",
"mnw": "mnw",
"ndg": "ndg",
- "nixpkgs": "nixpkgs_6",
- "systems": "systems_3"
+ "nixpkgs": "nixpkgs_8",
+ "systems": "systems_4"
},
"locked": {
- "lastModified": 1773579076,
- "narHash": "sha256-GRuK5zh0Z68YXIoTpHQW2CFdpZRhGJRxpYh4vPOqjt4=",
+ "lastModified": 1774375131,
+ "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=",
"owner": "notashelf",
"repo": "nvf",
- "rev": "baf207654ca613173e9d4b5255dba52f8c0c5577",
+ "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d",
"type": "github"
},
"original": {
@@ -1152,11 +1294,11 @@
]
},
"locked": {
- "lastModified": 1772893680,
- "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+ "lastModified": 1774104215,
+ "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+ "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
"type": "github"
},
"original": {
@@ -1210,6 +1352,8 @@
},
"root": {
"inputs": {
+ "awesome-wallpapers": "awesome-wallpapers",
+ "blog": "blog",
"caelestia-cli": "caelestia-cli",
"caelestia-shell": "caelestia-shell_2",
"default-creds": "default-creds",
@@ -1219,7 +1363,7 @@
"nixarr": "nixarr",
"nixcord": "nixcord",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable",
"nvf": "nvf",
"sops-nix": "sops-nix",
@@ -1229,14 +1373,14 @@
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_7"
+ "nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1773550941,
- "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
+ "lastModified": 1774303811,
+ "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
+ "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
"type": "github"
},
"original": {
@@ -1250,14 +1394,14 @@
"nixpkgs": [
"nixpkgs"
],
- "systems": "systems_4"
+ "systems": "systems_5"
},
"locked": {
- "lastModified": 1773619901,
- "narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=",
+ "lastModified": 1774157037,
+ "narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e",
+ "rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa",
"type": "github"
},
"original": {
@@ -1273,11 +1417,11 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
- "flake-parts": "flake-parts_4",
+ "flake-parts": "flake-parts_5",
"gnome-shell": "gnome-shell",
- "nixpkgs": "nixpkgs_8",
+ "nixpkgs": "nixpkgs_10",
"nur": "nur",
- "systems": "systems_5",
+ "systems": "systems_6",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@@ -1285,11 +1429,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
- "lastModified": 1772296853,
- "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
+ "lastModified": 1774124764,
+ "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
"owner": "danth",
"repo": "stylix",
- "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
+ "rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
"type": "github"
},
"original": {
@@ -1314,21 +1458,6 @@
}
},
"systems_2": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1343,6 +1472,21 @@
"type": "github"
}
},
+ "systems_3": {
+ "locked": {
+ "lastModified": 1689347949,
+ "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "type": "github"
+ }
+ },
"systems_4": {
"locked": {
"lastModified": 1681028828,
@@ -1373,6 +1517,21 @@
"type": "github"
}
},
+ "systems_6": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"tinted-foot": {
"flake": false,
"locked": {
@@ -1455,6 +1614,28 @@
}
},
"treefmt-nix": {
+ "inputs": {
+ "nixpkgs": [
+ "blog",
+ "bun2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1770228511,
+ "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ },
+ "treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"default-creds",
@@ -1540,11 +1721,11 @@
]
},
"locked": {
- "lastModified": 1772669058,
- "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=",
+ "lastModified": 1773601989,
+ "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "906d0ac159803a7df2dc1f948df9327670380f69",
+ "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index a1ae486..5d3aae9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,6 @@
nixcord.url = "github:kaylorben/nixcord";
sops-nix.url = "github:Mic92/sops-nix";
nvf.url = "github:notashelf/nvf";
- default-creds.url = "github:anotherhadi/default-creds";
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
@@ -39,6 +38,9 @@
# FIXME: Deleted repo for now
# eleakxir.url = "github:anotherhadi/eleakxir";
nixarr.url = "github:rasmus-kirk/nixarr";
+ default-creds.url = "github:anotherhadi/default-creds";
+ blog.url = "github:anotherhadi/blog";
+ awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
};
outputs = inputs @ {nixpkgs, ...}: {
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index a333237..a8302bc 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -17,6 +17,8 @@
../../server-modules/adguardhome.nix
../../server-modules/arr.nix
# ../../server-modules/eleakxir.nix
+ ../../server-modules/blog.nix
+ ../../server-modules/awesome-wallpapers.nix
../../server-modules/stirling-pdf.nix
../../server-modules/cyberchef.nix
../../server-modules/mazanoke.nix
diff --git a/hosts/server/secrets/secrets.yaml b/hosts/server/secrets/secrets.yaml
index 055d82a..39ad5f2 100644
--- a/hosts/server/secrets/secrets.yaml
+++ b/hosts/server/secrets/secrets.yaml
@@ -1,7 +1,7 @@
umami-secret: ENC[AES256_GCM,data:tImpd4sD92Omf/YFB8YE4gxAu+g801wQNR+k5rhY6AbzIIYOzpVmQL4XGjfp9Teky3olii4s3XTcmTyuMoxMWg==,iv:QFAEzYnAnxOOtrHWiM2IkvSs0Aqk3s1T5X7j5WC+tO8=,tag:FIbgHLfRVMJ2qZ6dOJ8zLw==,type:str]
sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
-adguard-pwd: ENC[AES256_GCM,data:QavwLWENAURnRrFwiLntkiM=,iv:bxdQfBxNL5rwUr7CEKbwXtv5mUUXZHhvyqQL2KoPwEY=,tag:T+cSyzbGeo7E5smSsuFlHw==,type:str]
+adguard-pwd: ENC[AES256_GCM,data:dOFEyLRG3yG9h74J,iv:S/TpCjqakvK5NgSzDukDyI58Y6SLl7NkuutUOY/SrY8=,tag:I9Rv3XYBG8T492ozHoCOWQ==,type:str]
recyclarr: ENC[AES256_GCM,data:eJNbGHb4SZvbF7FAHMrpRynmpVyPiTpyZqNx40Fo+lanqdm7d7oRhkLD2PfqxpTcIyV6BxJk12wGUC0uWVuAihmToL/Ih2FJWIQFUOdbaov/xNWHE9mtoRX/A3gIwD8e3DoFMK/dAk2/TyvvAfxi2eYTDJvxecEttHQGxafq1jveHFDcC9e1aFk3M8O8YlX5yF3zl90mugsUVP+iaSURnY/nglZuEDzfJ6Edge7r5OSL6WYh3OUIu1yzuuKXRZ47B/gpXO/cP89JMmxdPj3FUJkk7Htf0s9ALzpVE9fRohDGcpPIkR6COCLTL+mqvVmyopA1zPoX8/X8eiuocpaT3vqJit7Bc6InzflY/5rlg1x0SyoXWQfEsperfNBeiZGngp382I7rrZ8QSwF4AIsmngNeyDRAnfasAU5OVwK+yPIVhRueEFLNrJPG3j2hpArlzpvY2EPBVJDrYwFslis8CASoUdvu6C7VxtJXFcOZR8QemwJarJFU7v1bVhQoIkarn3V7FfAXg/8RfYrn9HAIq5AiFFbQRNHWXzIceIgNKQFb5yfagtMtMq6XKhjsV07jeYt9X/YU80XRfkPm05yiLdLQHcDNmlB3R+SFPD7qjTE7LuSH1Kdc3DvxwrKfHJLsJ+nSIL1po8gDMW8BPc0g4n4dpQ6CFK5BaDFK4eovNpgAXoRC9orkGw/16YmMozp6J78VJLzu3jcYMFbySFznDUuWcFf/7dVV+7pLAj2ffWXzScLISRBhZ9RNUMaZAKAk7WTmxBhw0yzNiih8OFUkbpp1FFLuU0bnBY0iEz+8/OSwv8H7t0HYe29HO61p1huH34B/ZkPA5VLKivFh2mOPNzbvMqtIAkq1ro82Psvc6t88gVIc+VAOZ9zDLohp0FXrNVXwnrs7fxevQa0pUClDivO1ib5G4Znor7q+13jZglmh3G7nHiniO607dRoxszzVEQdTn8ku3XAfIPStsSfQwH46nXhr2kDkspcA7BqwJph0dsKKlfzf22C0OJkDY0L1DgKFvJRmmKAhOdB6XxXYwS+BcDT+8ugejTKpulyPSsbdb0m9p9lVAVu0GMxFEbUsuE+QHiAAP5Vle7swpl4h3i8uHSfKFra3qEswwRnPAHhPSdLSaSU6O6T5gN/b0hhO6dAiNR0UOkOG59fPasL0MRpeb3SkM4Nd6g5b/hY8dXaXR7pQHvh+4GmfJFWYaWm/cZ8k9JAYAw9Sn/spWnjRmpv9bnSxADGbkdV8NDHquDDDFVIIoDnWhQJpqrL61KZITx2Ete1SYdNiy++p3mOYisJgHDsRR1RNQNxhRW4EY8c5nCzgc8x+rU432pCOfMbAuGEfQXMwMGFGeoUg6EL5xEyUEJ/aqymxI+Vjk8h7KfDnOyyL/+1BKEd/GccrjeQfeZGRLI0Tu5gVgL6twc+u4av6inNMMhPFzZuVrfeo6bip5C8R0dK6Pbdz2L/fsgn3E4NNi14NM/DgLLhJRLvKQdCQx+BT+3soNRw5htTzuNS48MD2YDwZYvNfu6mo0r4j4I7Tj8zuCjddbGVa2/5XnhcfdUBx1VOd90H1RKkk8kgSoR0bgo7mLls=,iv:HT3a2YnFy0cF9qUO671kwqxuzFfNnfqynCUVGHf+3dM=,tag:nrA++7fsnc4Cx0OPSDKaRw==,type:str]
wireguard-pia: ENC[AES256_GCM,data:2IvJARGhesMuH9RdWzsyrwA7eqrhLyacQqZ1RNEkGOPUkQGX4uimKBSzkxXRy/haZ4V2k73JdLSaB9rAuI0n65GmWHmarwZekOyhRZSNb+zvFgw5BPZmywG1wR2HiTGR/qILovAaz47q/VnohUnjbbMCUvarC4PytWGxMUH96GIgZar8HjHFtK8grCSxlvpHKiDeKx8VSXnY/Pxj1EplBtIqwmtAeZdf/VjtwOL0nY54doPwHdIAvJ0B8Cu0a1zJIGEbV1NlKIHEJ1YA7rmv1ODkBnbXbIHMxAR3jeqR/UDqhDmXe41KujhiJI7nNeO7FKo2v92jK3fSbxYKatLrzXktHpE9JsMYVBXzTK7yAXPgoDdgLXzWH0OrJGBSisPrvqmxUko7MPreuwVYfFlKpll6JLifk8sML4A+94UPR8b89guXn7kBkLg1Y1oIAyguCdKpNOD31nXBMFF0nTcmCwyshDySaGTfJDgox65/77AiN1wH,iv:cdu6lBjLnEEfSFmWMC4Vn2sLKsvpCaatzXlgRNkEMeA=,tag:y1rAeNPB+DNGTpnP94iQrA==,type:str]
signing-key: ENC[AES256_GCM,data:FrJzuTgH/ooZkcnYL55uQcc4u+QzNnFvNVs2wDSE4nnwku+EuCJBlb8pd/6W0KPwIXzcki/8CY0YfRcRrzjExMgMa4hwxrlxS9bk3LNPzJsrRK5RJgPg3iA8L791f1zcDxNf8RuWatIqm1TCK+Vhdk/p+221zy1Gcq1dW8X+o4XzbPBzHdLagcIdB0wpjYTtIoGP2X8GoL/NJpuzIiQBK1HdGNKvUI2+ztqCQZOsxm+Fki57NteX3/Llw8AwABjdZvviOBZ62OvJ/SsOQ9NYAvKfAkog5zCn8DLvaqAPGSxRBQEYWM8GyL2imgs54YfEsOpGa4DzMiv4Sc5m398E/asaPq357eksUqh3EYpzoKZ5bIbd5+Vs3KBWKHltUCzXLHaLrIX0CuJFQFi7DCxEbYqlb04x5t3jc/c+/7uwqBHv1Y5gwAjd8JswDWmE7Q3xSk96Za57SCxWPYTo2ErsA2XdL+yxXdhmqkhDZKtUzrcHExhnYe7YLpSlBEclJ/G2BeTOFIWoAmN+1y4rh21R,iv:VaZrv5/41ZyIax702Yae4QmFKpcEaWwPmTo2Mxao3bU=,tag:HC0eqDNit7jQKeeDAKWXKg==,type:str]
@@ -18,7 +18,7 @@ sops:
TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-03-25T17:31:48Z"
- mac: ENC[AES256_GCM,data:H2rA9l2v1UhDX7EQH7mYKLEDfRetKH6o4oBYOd7sviuPojk/wMzf2lGYASuEdT7zi1UmrnvHiT7fybVcb5yQQ9ktoRI4QGU3jy2MzXzs+yvlEb+umfjld6LTTRZM7IqzH7ld3F1TovwSZJ2gxT2ExmQqdq0H/7WVqesjqcOdxzM=,iv:8GgP0fuzppdJKovQy71l6z/raeXZNUdlsVsaNZ5KhLg=,tag:Lmf0QkY34Albr/vPNEtouA==,type:str]
+ lastmodified: "2026-03-25T19:14:13Z"
+ mac: ENC[AES256_GCM,data:x1OqP6JxTExZm+J75hbLsbZ3X2/WO/ncAF0U+vvI7da+ft+yjT7zf7+nGlaTL3Aus1QBrDBI0WElyemILsRlLZ6dN5tZNBPivsec1HCoJ9wb5hKtM3poZiQWYZDyFUqbFvBiXShJZI8gC7wPKxkycPe8IFLzpJhf2B/WPCBKjUc=,iv:oUZb8hZkEX3APUMllJEZ6c1wdVUJaOuZT4M7ZjW1bZY=,tag:sF/gB8qizWJRliR8PWAoMA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.1
diff --git a/server-modules/arr.nix b/server-modules/arr.nix
index 869dcf2..d49a5fd 100644
--- a/server-modules/arr.nix
+++ b/server-modules/arr.nix
@@ -34,7 +34,6 @@ in {
radarr.enable = true;
sonarr.enable = true;
bazarr.enable = true;
- readarr.enable = true;
transmission = {
enable = true;
extraSettings = {
@@ -60,6 +59,5 @@ in {
"radarr.hadi.icu" = "http://localhost:7878";
"sonarr.hadi.icu" = "http://localhost:8989";
"transmission.hadi.icu" = "http://localhost:9091";
- "readarr.hadi.icu" = "http://localhost:8787";
};
}
diff --git a/server-modules/awesome-wallpapers.nix b/server-modules/awesome-wallpapers.nix
new file mode 100644
index 0000000..cb84da7
--- /dev/null
+++ b/server-modules/awesome-wallpapers.nix
@@ -0,0 +1,25 @@
+{
+ inputs,
+ pkgs,
+ ...
+}: {
+ services = {
+ nginx.virtualHosts."wall.local" = {
+ root = "${inputs.awesome-wallpapers.packages.${pkgs.system}.default}/share/awesome-wallpapers";
+ listen = [
+ {
+ addr = "127.0.0.1";
+ port = 8759;
+ }
+ ];
+ locations."/" = {
+ tryFiles = "$uri $uri/ /index.html";
+ };
+ extraConfig = ''
+ port_in_redirect off;
+ absolute_redirect off;
+ '';
+ };
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."wallpapers.hadi.icu" = "http://127.0.0.1:8759";
+ };
+}
diff --git a/server-modules/blog.nix b/server-modules/blog.nix
new file mode 100644
index 0000000..12e341d
--- /dev/null
+++ b/server-modules/blog.nix
@@ -0,0 +1,26 @@
+{
+ inputs,
+ pkgs,
+ ...
+}: {
+ services = {
+ nginx.virtualHosts."blog.local" = {
+ root = "${inputs.blog.packages.${pkgs.system}.default}/share/blog";
+ listen = [
+ {
+ addr = "127.0.0.1";
+ port = 8758;
+ }
+ ];
+ locations."/" = {
+ tryFiles = "$uri $uri/ /index.html";
+ };
+ extraConfig = ''
+ port_in_redirect off;
+ absolute_redirect off;
+ '';
+ };
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."hadi.icu" = "http://127.0.0.1:8758";
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."www.hadi.icu" = "http://127.0.0.1:8758";
+ };
+}
From 86fd60fd3d700b8494b997737cd10d6ed633305a Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 20:53:09 +0100
Subject: [PATCH 07/22] update flake
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 235 ++++++++++++++++++++++++++++++++----------
flake.nix | 2 +
hosts/laptop/home.nix | 2 +
3 files changed, 183 insertions(+), 56 deletions(-)
diff --git a/flake.lock b/flake.lock
index 77a748e..3bc591f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,12 +167,34 @@
"inputs": {
"flake-parts": "flake-parts_2",
"import-tree": "import-tree_2",
+ "nixpkgs": "nixpkgs_3",
+ "systems": "systems_2",
+ "treefmt-nix": "treefmt-nix_2"
+ },
+ "locked": {
+ "lastModified": 1770895533,
+ "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=",
+ "owner": "nix-community",
+ "repo": "bun2nix",
+ "rev": "c843f477b15f51151f8c6bcc886954699440a6e1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "bun2nix",
+ "type": "github"
+ }
+ },
+ "bun2nix_3": {
+ "inputs": {
+ "flake-parts": "flake-parts_3",
+ "import-tree": "import-tree_3",
"nixpkgs": [
"default-creds",
"nixpkgs"
],
- "systems": "systems_2",
- "treefmt-nix": "treefmt-nix_2"
+ "systems": "systems_3",
+ "treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1770895533,
@@ -282,8 +304,8 @@
},
"default-creds": {
"inputs": {
- "bun2nix": "bun2nix_2",
- "nixpkgs": "nixpkgs_3"
+ "bun2nix": "bun2nix_3",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1773941596,
@@ -401,6 +423,24 @@
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
+ "locked": {
+ "lastModified": 1769996383,
+ "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_4": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib_4"
+ },
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
@@ -415,7 +455,7 @@
"type": "github"
}
},
- "flake-parts_4": {
+ "flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nvf",
@@ -436,7 +476,7 @@
"type": "github"
}
},
- "flake-parts_5": {
+ "flake-parts_6": {
"inputs": {
"nixpkgs-lib": [
"stylix",
@@ -603,9 +643,9 @@
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_5",
"pre-commit-hooks": "pre-commit-hooks",
- "systems": "systems_3",
+ "systems": "systems_4",
"xdph": "xdph"
},
"locked": {
@@ -885,6 +925,21 @@
"type": "github"
}
},
+ "import-tree_3": {
+ "locked": {
+ "lastModified": 1763762820,
+ "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
+ "owner": "vic",
+ "repo": "import-tree",
+ "rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
+ "type": "github"
+ },
+ "original": {
+ "owner": "vic",
+ "repo": "import-tree",
+ "type": "github"
+ }
+ },
"mnw": {
"locked": {
"lastModified": 1770419553,
@@ -944,7 +999,7 @@
},
"nixarr": {
"inputs": {
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_6",
"vpnconfinement": "vpnconfinement",
"website-builder": "website-builder"
},
@@ -965,8 +1020,8 @@
"nixcord": {
"inputs": {
"flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_6",
+ "flake-parts": "flake-parts_4",
+ "nixpkgs": "nixpkgs_7",
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
@@ -1046,6 +1101,21 @@
}
},
"nixpkgs-lib_3": {
+ "locked": {
+ "lastModified": 1769909678,
+ "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "72716169fe93074c333e8d0173151350670b824c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
+ }
+ },
+ "nixpkgs-lib_4": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
@@ -1093,6 +1163,22 @@
}
},
"nixpkgs_10": {
+ "locked": {
+ "lastModified": 1773840656,
+ "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_11": {
"locked": {
"lastModified": 1767767207,
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
@@ -1125,6 +1211,22 @@
}
},
"nixpkgs_3": {
+ "locked": {
+ "lastModified": 1770562336,
+ "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
"locked": {
"lastModified": 1772773019,
"narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
@@ -1140,7 +1242,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
@@ -1156,7 +1258,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1765608474,
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
@@ -1172,7 +1274,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
@@ -1188,7 +1290,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
@@ -1204,7 +1306,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_9": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
@@ -1220,22 +1322,6 @@
"type": "github"
}
},
- "nixpkgs_9": {
- "locked": {
- "lastModified": 1773840656,
- "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nur": {
"inputs": {
"flake-parts": [
@@ -1264,11 +1350,11 @@
"nvf": {
"inputs": {
"flake-compat": "flake-compat_3",
- "flake-parts": "flake-parts_4",
+ "flake-parts": "flake-parts_5",
"mnw": "mnw",
"ndg": "ndg",
- "nixpkgs": "nixpkgs_8",
- "systems": "systems_4"
+ "nixpkgs": "nixpkgs_9",
+ "systems": "systems_5"
},
"locked": {
"lastModified": 1774375131,
@@ -1354,6 +1440,7 @@
"inputs": {
"awesome-wallpapers": "awesome-wallpapers",
"blog": "blog",
+ "bun2nix": "bun2nix_2",
"caelestia-cli": "caelestia-cli",
"caelestia-shell": "caelestia-shell_2",
"default-creds": "default-creds",
@@ -1363,7 +1450,7 @@
"nixarr": "nixarr",
"nixcord": "nixcord",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_8",
"nixpkgs-stable": "nixpkgs-stable",
"nvf": "nvf",
"sops-nix": "sops-nix",
@@ -1373,7 +1460,7 @@
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_9"
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1774303811,
@@ -1394,7 +1481,7 @@
"nixpkgs": [
"nixpkgs"
],
- "systems": "systems_5"
+ "systems": "systems_6"
},
"locked": {
"lastModified": 1774157037,
@@ -1417,11 +1504,11 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
- "flake-parts": "flake-parts_5",
+ "flake-parts": "flake-parts_6",
"gnome-shell": "gnome-shell",
- "nixpkgs": "nixpkgs_10",
+ "nixpkgs": "nixpkgs_11",
"nur": "nur",
- "systems": "systems_6",
+ "systems": "systems_7",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@@ -1473,21 +1560,6 @@
}
},
"systems_3": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1502,6 +1574,21 @@
"type": "github"
}
},
+ "systems_4": {
+ "locked": {
+ "lastModified": 1689347949,
+ "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "type": "github"
+ }
+ },
"systems_5": {
"locked": {
"lastModified": 1681028828,
@@ -1532,6 +1619,21 @@
"type": "github"
}
},
+ "systems_7": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"tinted-foot": {
"flake": false,
"locked": {
@@ -1636,6 +1738,27 @@
}
},
"treefmt-nix_2": {
+ "inputs": {
+ "nixpkgs": [
+ "bun2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1770228511,
+ "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ },
+ "treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"default-creds",
diff --git a/flake.nix b/flake.nix
index 5d3aae9..4310726 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,8 @@
nixcord.url = "github:kaylorben/nixcord";
sops-nix.url = "github:Mic92/sops-nix";
nvf.url = "github:notashelf/nvf";
+ bun2nix.url = "github:nix-community/bun2nix";
+
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index aab70d4..36b6719 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -1,6 +1,7 @@
{
pkgs,
config,
+ inputs,
...
}: {
imports = [
@@ -60,6 +61,7 @@
# Dev
go
bun
+ inputs.bun2nix.packages.${system}.default
docker
nodejs
python3
From 641411ad51a539a29fc1c39e2105051e6e289adf Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 21:40:13 +0100
Subject: [PATCH 08/22] edit bookmarks
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
server-modules/glance/home.nix | 12 ++++--------
server-modules/glance/server.nix | 18 +++++++++---------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/server-modules/glance/home.nix b/server-modules/glance/home.nix
index 289ede9..3c77d94 100644
--- a/server-modules/glance/home.nix
+++ b/server-modules/glance/home.nix
@@ -56,10 +56,6 @@
same-tab = true;
color = "245 50 64";
links = [
- {
- title = "Linkding";
- url = "https://linkding.hadi.icu";
- }
{
title = "Mail";
url = "https://mail.proton.me";
@@ -130,10 +126,6 @@
same-tab = true;
color = "245 50 64";
links = [
- {
- title = "X";
- url = "https://x.com";
- }
{
title = "Bsky";
url = "https://bsky.app";
@@ -181,6 +173,10 @@
title = "Nixpkgs";
url = "https://github.com/NixOS/nixpkgs";
}
+ {
+ title = "Claude";
+ url = "https://claude.ai";
+ }
{
title = "Gemini";
url = "https://gemini.google.com";
diff --git a/server-modules/glance/server.nix b/server-modules/glance/server.nix
index 1d0822e..06d977a 100644
--- a/server-modules/glance/server.nix
+++ b/server-modules/glance/server.nix
@@ -50,9 +50,14 @@
icon = "sh:stirling-pdf";
}
{
- title = "Eleakxir";
- url = "https://eleakxir.hadi.icu";
- icon = "si:elixir";
+ title = "Default-creds";
+ url = "https://default-creds.hadi.icu";
+ icon = "si:passbolt";
+ }
+ {
+ title = "Blog";
+ url = "https://hadi.icu";
+ icon = "si:blogger";
}
{
title = "Cyberchef";
@@ -86,11 +91,6 @@
url = "https://sonarr.hadi.icu";
icon = "si:sonarr";
}
- {
- title = "Readarr";
- url = "https://readarr.hadi.icu";
- icon = "si:bookstack";
- }
{
title = "Bazarr";
url = "https://bazarr.hadi.icu";
@@ -141,7 +141,7 @@
}
{
title = "Cloudflare Access";
- url = "anotherhadi.cloudflareaccess.com";
+ url = "https://anotherhadi.cloudflareaccess.com";
}
];
}
From 0a01e8f3e8e0beb29c114a9fd83c6dee309bc03e Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 21:40:18 +0100
Subject: [PATCH 09/22] update flake
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 3bc591f..ee79474 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1774465437,
- "narHash": "sha256-8tbInCtwFY9XsM/ZTXkM8qR73S8LJCwn+52dEuB7oCc=",
+ "lastModified": 1774468429,
+ "narHash": "sha256-AhjM8WakpzjzXNJI5oDmsRFE7qs60se6sU2MxAN1oc0=",
"owner": "anotherhadi",
"repo": "awesome-wallpapers",
- "rev": "78a2beefafbe5ae0b863ba1adcc6f99464e9d406",
+ "rev": "5a09bfbd0bbad8045a675d67de96337db8971563",
"type": "github"
},
"original": {
@@ -308,11 +308,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1773941596,
- "narHash": "sha256-1SuoMqdhJ/wyeYMx6JDsw3xRQDnp+Gt6liaorOHdOkM=",
+ "lastModified": 1774468489,
+ "narHash": "sha256-VQfXEaN08eR5rVjwF1Wk5arNhoebZQst2ommdIIAHF4=",
"owner": "anotherhadi",
"repo": "default-creds",
- "rev": "4866d28ebd4d0b0de221acf178480cc5c45b4750",
+ "rev": "1c9d554b74e5acdd43cd83243fcd20671d707708",
"type": "github"
},
"original": {
@@ -1040,11 +1040,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1774422943,
- "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=",
+ "lastModified": 1774465523,
+ "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f",
+ "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
"type": "github"
},
"original": {
From c482e6e075dd21efb2b93a28c37bc0c4703cb411 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 25 Mar 2026 21:57:24 +0100
Subject: [PATCH 10/22] update flake
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index ee79474..2482b9f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1774468429,
- "narHash": "sha256-AhjM8WakpzjzXNJI5oDmsRFE7qs60se6sU2MxAN1oc0=",
+ "lastModified": 1774471529,
+ "narHash": "sha256-WEBeASUv9MBSp8Ch8m7x4NoE4JMoHkjRU6mw7aA/qp8=",
"owner": "anotherhadi",
"repo": "awesome-wallpapers",
- "rev": "5a09bfbd0bbad8045a675d67de96337db8971563",
+ "rev": "1c2105b7e594e5a96fe7eaa2c9a00ec215e053bd",
"type": "github"
},
"original": {
@@ -125,11 +125,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1774462561,
- "narHash": "sha256-7O/cvwCvp9nI1U2Ll13aJ9573Z4K8JisXH91AwYaw4I=",
+ "lastModified": 1774471448,
+ "narHash": "sha256-fK0DhC17S0DJVnvnwoPXQ1UGwmOzcma2zhwncBP5UYw=",
"owner": "anotherhadi",
"repo": "blog",
- "rev": "8a6133dd15a266fb156f94260b55d03421f4f405",
+ "rev": "7362feb3f58ac6f65e99315acc0101e0303862ba",
"type": "github"
},
"original": {
From 983c83b981a70353070aadc52cc5cdac7eb34c31 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Sat, 28 Mar 2026 18:59:02 +0100
Subject: [PATCH 11/22] change gitlab secret
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/laptop/secrets/default.nix | 1 +
hosts/laptop/secrets/secrets.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hosts/laptop/secrets/default.nix b/hosts/laptop/secrets/default.nix
index f6f8d8a..9dad639 100644
--- a/hosts/laptop/secrets/default.nix
+++ b/hosts/laptop/secrets/default.nix
@@ -13,6 +13,7 @@
secrets = {
sshconfig = {path = "/home/hadi/.ssh/config";};
github-key = {path = "/home/hadi/.ssh/github";};
+ gitlab-key = {path = "/home/hadi/.ssh/gitlab";};
jack-key = {path = "/home/hadi/.ssh/jack";};
signing-key = {path = "/home/hadi/.ssh/key";};
signing-pub-key = {path = "/home/hadi/.ssh/key.pub";};
diff --git a/hosts/laptop/secrets/secrets.yaml b/hosts/laptop/secrets/secrets.yaml
index e1cf623..9ea4d2f 100644
--- a/hosts/laptop/secrets/secrets.yaml
+++ b/hosts/laptop/secrets/secrets.yaml
@@ -1,7 +1,7 @@
pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
-sshconfig: ENC[AES256_GCM,data:ZDGH1Ws2o418RVfUtF2GCPAd98QTX/ETSjFuuj0xcjhydwclifsTQ9+NCf2YK/pEyrxdSStvZKXGzHJ+sU7hsPxoNaSyR4CPAkIcS+drWJiIvtqolJ3VhfCcCLzL4m7DHu8ss7anIv8MRNpLY0K1M4kJ1EouKnVCfrzcBccEhGxI3memyLmHPm0vqd3d7GK4MzltThVGpVA8jm/NPJ68YBgiNu7EDpVq913Ii82bcD/rHzcM73vp+9GYCyYZ0z0m8GrbvYWW5LmqyL+xiycz/1xLHg3hEaVMzqbz4jDl1mKKeVLHjFKzXQqhXOgTbttXU312CeKSNCiNslpyorG+62Ff8YcbEonuSzyPPLyZTayIKVu25q6yeKCa2hhYabJjRPC99q/XO+jYvC5FEsfE7Y/g5OQZz4BF/l7wBUjMExqkVHewGp9cY8woqKWYk1Gcg/X+Gak1lo69SCz5EAti3HHcpRXmMcZlbML8iLnsrZdC6NGYbiI2A6eWWKMUBSfVMWGDRw3YjjXIkNEPz8L1bUcjw3yPNGh3MBidTK0n62d78Yd/XQ3p4NwetThBXwiRHTp0sLUbQSZxB3zBO1Ie+wE8l9hrws6E+uY3T5pxbuP0zrjby4u1IkUvSUiIRKKpM5V9KaGV1a5Ssxvuav8F4Hylg183Ni8N7ljYuoKdF+b/FCY4NWIQt2OaNTCyjkPQEZ7TaGxXEDJ4647KFhNE4fiCp7AMfyYD6V3TmPThPVUAh8yFWqzx5G7lls/jLB7fv7G7PFXpK81mqwkktkDnwgvQi2vBhF471x1+NIKllrTUJdgKeMxZjXSPa0tS/UCM41gkbgw=,iv:nZ2cSwkziO2URUA3yOMXW6gcU1P5lvs9RkF+8kTAxGA=,tag:8gwQDuRYZnePOqxY0YIdWA==,type:str]
+sshconfig: ENC[AES256_GCM,data:tgwFyF8Vp8euhMhMx+QEKNadN6qKHNza8Ke0Oc+6vkZRtmE3RoFoSjCw34OBD3Mpm+t/l0d03uWlgFTklLn1hqmK0Ep6B4Tssd+YwzAFQsBUiahUynEHHeCwRGd5CAq4u7qxeTFEflUAkQqBNyPHtFUeeO+OB73lnj7uAqDE7FXffDurtoPof2JdjCoIX53zlQ7s6hp/Unl5tGFFOa0Ag7qhjY1d5J5b8X3eUPcI04gwLVYuqnqEC9XeX9gxxSr/Wb+8pZmYCdRGAHIx8QHMo160l2bByIy+iJo/vNjJpryo5+fZnKurE/7kZDl2gYgdL26CA9WQ18kBNB507rOK4Pj40hP1Nbq215KzOQi68CA/okbYU2KjawoLNdNAIrc46YLXahnxEsFo7Vn4lJQp9WZbi4uV3COQLitRg/nFXt7oWcNMYkZe691SdcqWJJSOZiOEE+Cnm7uxJpB6ZmMueILrk/d+XzMi8l55PaCKOqJI/6M3AkHDLE2/ZGHzSCJNS2ltw8FcouN+uaTOZwmB9DWloPqEXPnD6V69MDOC0nY4Q8vtjHt8t02cAU7Ehh+lLd7UXWA04/0DdcX8HAR+PMK4,iv:49aUE3Ri/55tNKfgttX/AGPWi4l3ya/vEujA6xxvQJE=,tag:HrD/6wg8yMJvINL11MLDYQ==,type:str]
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
-gitlab-key: ENC[AES256_GCM,data:6271Tg7LIJsXAw7Co32vva+iUWv+eRAfVfXaGkoirHxiPTAgZfq8yDpGJwti2D/aFnLvbURcUgp3B5zy1aURu9puXi6QMu3orJOE2Zx0dX3lyeHyIhOZ1hAWsQxwBDkJYODuMZbIKHNrF26Mkk6smFF9SrGoADZGxY7XSou/iopw6yrLvQAXP6lN55PQvoP5/ek/QzKNwjJAbAjp7FjjtPqPUbUdj7bfIfr9avs6gpRYnRzb2H3auyhb5qvyuRWnKu4+FeZUofC7HnfRU1eSI8UzG49Rg4f2b1Xqr0JtsjvEmuRx7lbptINXEAjW7zaSZ2B9NgotWPIzkNZRNZkuTEaOulBf5iH3wJ9GM1FcbUu2gpCt6y+CMIk5QkVvETYtKuALLbcPx9/sc90doiH1411LeKQCs5l88BBILG9KPkKmXiGGUVNxzFtjbRYQIUEmmyl95kPPEdCkkzGzHXNfE3F9HRu4MCGKPK2yZPZtCXd3Jp1b21wKSIRNYqLqxru+J8eLSljd3czO0SuTG/Vx,iv:E+y3aVLaiStlPLTQBqyfJuEXtAQyOvDUYS+XfuOHuA0=,tag:6d1IAsGcmcpgL1pE9dDcbw==,type:str]
+gitlab-key: ENC[AES256_GCM,data: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,iv:g4X2GC/9+je4qkvUT4UJl40+r/FzFY88XtYkthiwGVY=,tag:XFfEzXJEeKXB/QJt2fT4Qw==,type:str]
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
signing-key: ENC[AES256_GCM,data:NvLqmt7NzrWkbQQqFfosmSMvEv8C8+MDDpxSoDo3zZ3MR6WXr9B+6CnUc6rtevM230wgE17VC9XlmcQxX+PjJsWq6gZteK5THTIcrR5zPJVNlVCEyeLKoFj/6m7qBgyyoN3OjCNjgMkhsm009jwBgNk0qJMAYebOGo8eoP/al+4ytm7dhna+iX5WZabAg0J4z4JMDQonqQl3SaDnCEdHvk9m7ZEP2vUFscPkbLj4ewgFq+bUCHOOQb2uqRJoEgcR/NetRFcQfzcU6lp7JxobaICaO3zdmomUm7oabIUTrc3Kom3Wjw8ryqfqC1/SC0SHr5XGk2ygk0WnlQ4kNshqriL2dwbWAzy1Z/cTX9+aB/KNtC0U6zWG1bpnL3dgSgvhRiocIis/eNg1HWsLWVicmdebL/lXHztxFMdTuX/gWgQBotggTmx+OFGZfP9ZGlF3635mDxM/fEOCtTyA195dMicCUsjEpBegNtXsp+oOtxyRI0jSW47MBcXFP09f5ywELTPyz4eOUHO8sQ6UfJ6X,iv:KNQUlMPaiR4x1Fw+HZe/EOmh/gfsrqlefpq23uflz/8=,tag:illu42HKunQXnijjsUIvnQ==,type:str]
signing-pub-key: ENC[AES256_GCM,data:XuokZmCsnaNQ0rvVa3k81T4vtxw//r63xp1yHDLaNAMwA2r2bh6addl9WoAmm76g1rweqZrAAIw1PXDb90ubPaBP1iEHSkGZpwUpy/tOTePRdHMW2WtVvidpHQ==,iv:auB/bA89cJK6DnQi1BK2uldXRPyJfo+r7nl5qOLefUk=,tag:/I3kB6El1yesBMGOjJ+oHA==,type:str]
@@ -16,7 +16,7 @@ sops:
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-01-04T23:44:17Z"
- mac: ENC[AES256_GCM,data:Btjr564Yjmo//JIqLcnDqH4QT9poRIyblsFX+eEbCxuij+UB4CgE/e/Td5kedgxTcpCZD3BsMwR0HC+IixVtApVS9261r5YJVMFhvce1NwfJLIg5Nx2YjPLC6NM7Y4zC4rmmRiYjbVE8Mxl6HMNwTEvIgD4j/sl4/+h2slTuxXU=,iv:ubDdacxT26nwTKkb31q3T+ihrOe77re8qs7G/4hjfVU=,tag:vPNkilF0eZqV2w7TzGH5/Q==,type:str]
+ lastmodified: "2026-03-28T16:27:39Z"
+ mac: ENC[AES256_GCM,data:zzfoI6D/IBVGWTmXh/iSCsYM666snoWHAKJ1nd/1zXYt49hA9N2XKqCo7a65BYJ9RFhir2FGWRZj3hzM312Ot4bajYNSUABQ0yBsiW3DmAuLK5tcZeQ4IAu+4CXaeQLlBJt/wwxP8CJyeRqxpJ5vZtHVt0uKEl2N3loUhErg7R0=,iv:Wqk6CVmb9V/KDFIz0KsIE5sd5S9If5kIphEOv49pTTY=,tag:abrQUG6Np7SHAvx0+dNnpA==,type:str]
unencrypted_suffix: _unencrypted
- version: 3.11.0
+ version: 3.12.2
From 3f3666576767ef046d936990a5f13b03f8649900 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Sat, 28 Mar 2026 19:31:18 +0100
Subject: [PATCH 12/22] new secret
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/laptop/secrets/default.nix | 1 +
hosts/laptop/secrets/secrets.yaml | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hosts/laptop/secrets/default.nix b/hosts/laptop/secrets/default.nix
index 9dad639..58f2a75 100644
--- a/hosts/laptop/secrets/default.nix
+++ b/hosts/laptop/secrets/default.nix
@@ -14,6 +14,7 @@
sshconfig = {path = "/home/hadi/.ssh/config";};
github-key = {path = "/home/hadi/.ssh/github";};
gitlab-key = {path = "/home/hadi/.ssh/gitlab";};
+ netrc = {path = "/home/hadi/.netrc";};
jack-key = {path = "/home/hadi/.ssh/jack";};
signing-key = {path = "/home/hadi/.ssh/key";};
signing-pub-key = {path = "/home/hadi/.ssh/key.pub";};
diff --git a/hosts/laptop/secrets/secrets.yaml b/hosts/laptop/secrets/secrets.yaml
index 9ea4d2f..a4f8f90 100644
--- a/hosts/laptop/secrets/secrets.yaml
+++ b/hosts/laptop/secrets/secrets.yaml
@@ -1,5 +1,6 @@
pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
-sshconfig: ENC[AES256_GCM,data:tgwFyF8Vp8euhMhMx+QEKNadN6qKHNza8Ke0Oc+6vkZRtmE3RoFoSjCw34OBD3Mpm+t/l0d03uWlgFTklLn1hqmK0Ep6B4Tssd+YwzAFQsBUiahUynEHHeCwRGd5CAq4u7qxeTFEflUAkQqBNyPHtFUeeO+OB73lnj7uAqDE7FXffDurtoPof2JdjCoIX53zlQ7s6hp/Unl5tGFFOa0Ag7qhjY1d5J5b8X3eUPcI04gwLVYuqnqEC9XeX9gxxSr/Wb+8pZmYCdRGAHIx8QHMo160l2bByIy+iJo/vNjJpryo5+fZnKurE/7kZDl2gYgdL26CA9WQ18kBNB507rOK4Pj40hP1Nbq215KzOQi68CA/okbYU2KjawoLNdNAIrc46YLXahnxEsFo7Vn4lJQp9WZbi4uV3COQLitRg/nFXt7oWcNMYkZe691SdcqWJJSOZiOEE+Cnm7uxJpB6ZmMueILrk/d+XzMi8l55PaCKOqJI/6M3AkHDLE2/ZGHzSCJNS2ltw8FcouN+uaTOZwmB9DWloPqEXPnD6V69MDOC0nY4Q8vtjHt8t02cAU7Ehh+lLd7UXWA04/0DdcX8HAR+PMK4,iv:49aUE3Ri/55tNKfgttX/AGPWi4l3ya/vEujA6xxvQJE=,tag:HrD/6wg8yMJvINL11MLDYQ==,type:str]
+sshconfig: ENC[AES256_GCM,data:izNr2unAma0Hd4MhVQxLN/HaJPwOIe2LxyzkpdvJ6oiFPSjzDZVuhaO7rgNYDYiIv51vfdUiahtcIT0LPczvHCk0+gHBRendlhuMR+SIjdR4zyikgniiDZ4v/ktF91cVxSFo6bMBKuenPDTIm0Q2hVhcSVVv+T080wTIvjDu8DDOjfi/hyHNVSleAFRndiKJdj86YHgYEFQ94CB0tYS2XFiqOKmygel8FpeyvwxlFnk05zksNlTDmrpNO2eQgV4Ht4OoKyLJvu6eroKcrh+fu9lGjNLkEAfx8wHV30Uy2ofbIzgOPnWJQGQBsZ9/fcXfoGI+yl42ptyD3dfNguD8ym4OaMQVDPQo2Ut1Kswjx0JQcJFbDGwYjtZlZIoD38WDFtT3vUsjr/bAg2YQ5bFhrP+WEH3yg8jUQN4sMsOddBAJf0J+JGjRw7ypAWdrqASigFgWyF4Fn9gWszCtJKXHzloqrXSW2i0+fZ0n3c1fjMZpQ8wDJXhJIZNwbHBcz2clMF+ZLnCEAww4rG4KVjhqFmBtKGYoUt58tZabdyQmJUTif9Tw0TJ+Zjd3zTa6Vx3QAbHDFFhITUAEYawhfXhhOrR2zxqxvdrmKxqDezkv+jp4s9oCIk3dI4Sfej26Nh8GuxHqRbdyI2ETdty/ZINxCMnsGZ+Q9HiBOpGT+yZd4YQ0Ac2MZGoQJ/HIuN11pUjNjaaIPnKlmkyshfBXnGRUxoto+PFxXb7aKODWJyjhR8hAEVTOP40ZcYttVxzHJQ==,iv:D/GhCFZP0MyXmnKzt/apOxqiTC80mQ4B29sRul+Smh8=,tag:ACac2soMClpnqD6l05zfRQ==,type:str]
+netrc: ENC[AES256_GCM,data:Elu68lWtosD3tUae/+DTHeXXq1ivOhkN2pgrwSvUkntksT82guYWEtKgAKrIgLe1XLifYoirivGjHxP+KlP2zWaPr7+MZT4g4p+3pTBhBKUXVKiiLug/tfr9q4fU1j4=,iv:pniNFbWqhiq98XkEU9nuFa7YfchI2osQvDcECNsrvUo=,tag:5DRPTZRUzl0jfbWhbW/nmA==,type:str]
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
gitlab-key: ENC[AES256_GCM,data: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,iv:g4X2GC/9+je4qkvUT4UJl40+r/FzFY88XtYkthiwGVY=,tag:XFfEzXJEeKXB/QJt2fT4Qw==,type:str]
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
@@ -16,7 +17,7 @@ sops:
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-03-28T16:27:39Z"
- mac: ENC[AES256_GCM,data:zzfoI6D/IBVGWTmXh/iSCsYM666snoWHAKJ1nd/1zXYt49hA9N2XKqCo7a65BYJ9RFhir2FGWRZj3hzM312Ot4bajYNSUABQ0yBsiW3DmAuLK5tcZeQ4IAu+4CXaeQLlBJt/wwxP8CJyeRqxpJ5vZtHVt0uKEl2N3loUhErg7R0=,iv:Wqk6CVmb9V/KDFIz0KsIE5sd5S9If5kIphEOv49pTTY=,tag:abrQUG6Np7SHAvx0+dNnpA==,type:str]
+ lastmodified: "2026-03-28T18:27:51Z"
+ mac: ENC[AES256_GCM,data:5b4pNUYbgqfEMYJ3gxs+uirOvoa/G4WczDQbgnjVARqu4noNtEsv/pu+Z1rlGS0UVwe7gDogc9Mq5X18ulMBZEjsMHPHkzI0v8Sv6+0iSSzF7YwmKoWKfc8+a64s6X41IjHt5jl2ANEFCMgy0a3KXY1Px/NpwBe8Q3eEzt+6lsU=,iv:tFJJNDSwlZ0h580vhKj7duHiyVvwQLMKFV1w1RJ9VM4=,tag:fF7gafhsyTt+7k1s7Yo3CA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.2
From 087f71d2d5a5c6c11d2ce357207386dd6c6bc18f Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:10:18 +0200
Subject: [PATCH 13/22] update readme
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
.github/assets/README_template.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/assets/README_template.md b/.github/assets/README_template.md
index fe63346..f2f226f 100644
--- a/.github/assets/README_template.md
+++ b/.github/assets/README_template.md
@@ -1,5 +1,5 @@
-
+
@@ -122,3 +122,11 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
- [LICENSE](LICENSE): MIT License
+
+---
+
+
Date: Mon, 30 Mar 2026 15:11:28 +0000
Subject: [PATCH 14/22] Update README.md (auto)
---
README.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 171420d..170f583 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[//]: # (This file is autogenerated)
-
+
@@ -132,3 +132,11 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
- [LICENSE](LICENSE): MIT License
+
+---
+
+
Date: Mon, 30 Mar 2026 18:05:22 +0200
Subject: [PATCH 15/22] update secrets
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/laptop/secrets/secrets.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hosts/laptop/secrets/secrets.yaml b/hosts/laptop/secrets/secrets.yaml
index a4f8f90..2a9ddd4 100644
--- a/hosts/laptop/secrets/secrets.yaml
+++ b/hosts/laptop/secrets/secrets.yaml
@@ -1,6 +1,6 @@
pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
-sshconfig: ENC[AES256_GCM,data:izNr2unAma0Hd4MhVQxLN/HaJPwOIe2LxyzkpdvJ6oiFPSjzDZVuhaO7rgNYDYiIv51vfdUiahtcIT0LPczvHCk0+gHBRendlhuMR+SIjdR4zyikgniiDZ4v/ktF91cVxSFo6bMBKuenPDTIm0Q2hVhcSVVv+T080wTIvjDu8DDOjfi/hyHNVSleAFRndiKJdj86YHgYEFQ94CB0tYS2XFiqOKmygel8FpeyvwxlFnk05zksNlTDmrpNO2eQgV4Ht4OoKyLJvu6eroKcrh+fu9lGjNLkEAfx8wHV30Uy2ofbIzgOPnWJQGQBsZ9/fcXfoGI+yl42ptyD3dfNguD8ym4OaMQVDPQo2Ut1Kswjx0JQcJFbDGwYjtZlZIoD38WDFtT3vUsjr/bAg2YQ5bFhrP+WEH3yg8jUQN4sMsOddBAJf0J+JGjRw7ypAWdrqASigFgWyF4Fn9gWszCtJKXHzloqrXSW2i0+fZ0n3c1fjMZpQ8wDJXhJIZNwbHBcz2clMF+ZLnCEAww4rG4KVjhqFmBtKGYoUt58tZabdyQmJUTif9Tw0TJ+Zjd3zTa6Vx3QAbHDFFhITUAEYawhfXhhOrR2zxqxvdrmKxqDezkv+jp4s9oCIk3dI4Sfej26Nh8GuxHqRbdyI2ETdty/ZINxCMnsGZ+Q9HiBOpGT+yZd4YQ0Ac2MZGoQJ/HIuN11pUjNjaaIPnKlmkyshfBXnGRUxoto+PFxXb7aKODWJyjhR8hAEVTOP40ZcYttVxzHJQ==,iv:D/GhCFZP0MyXmnKzt/apOxqiTC80mQ4B29sRul+Smh8=,tag:ACac2soMClpnqD6l05zfRQ==,type:str]
-netrc: ENC[AES256_GCM,data:Elu68lWtosD3tUae/+DTHeXXq1ivOhkN2pgrwSvUkntksT82guYWEtKgAKrIgLe1XLifYoirivGjHxP+KlP2zWaPr7+MZT4g4p+3pTBhBKUXVKiiLug/tfr9q4fU1j4=,iv:pniNFbWqhiq98XkEU9nuFa7YfchI2osQvDcECNsrvUo=,tag:5DRPTZRUzl0jfbWhbW/nmA==,type:str]
+sshconfig: ENC[AES256_GCM,data:+r4RpeGsAGjgwsWMgwQmZnSxwoPLGDQG0hgasm1/xGMA655Q6tLGDOvTD4ypZ6d5TI67cWENJHr1pORzHVdZYB/uS/S7Ejp3VaVEZDRuLtKuq+2mDnp87HH8caE3jmijWSJis+1GM8lgxdyX8sDMz6b/zu76SrZlusf+kMFwQA7svxlA1iHP/wBAN8CFu2XOaGrjXT/Ydwd9GNAXA3VHLf6r9yEzcT1y944/eKGAQdlDFIVEe/bhv5Qxul1AH8TJT/ERMuYdS/OpbqnRLyZHHkREr8y1TllTWdMnGz2sRB7QnZ99ULpyR/h2Qc4XdCiC+qYn0yinXsnPO+NW7ulFn+5lNoyekDveI5pmsv021rnOtJU1SnlEm9xx3dafVdmLpFy6Y8xeJFUeF+nbU3Oc6IHMKHQZoL1ucCsF9qNO38bnyTwVX+wO9g16fcNzR2EfjDCGHj7O8YxdAVzPWvbExKk+2iamkzXrI/P/BdAvy/+QagstPoMz4TxZvw1ir7gd5emk13+t9Cy2vrutbxbouXOAuXKA2021WP7V+aDrwsY1jSGO6oiBFYBwe3wCZ2rPM3+oHxrnyzohhxGRgwN0td//,iv:Wln9pc4ptH7aN2VnBRgO12fKDZiITkIjOJseUW1MZPQ=,tag:BNrMyiDsbu72A9ljdQd3Wg==,type:str]
+netrc: ENC[AES256_GCM,data:cTaDDI8b9QbUI3zKzraF2R6v1/x+6h8KEQJbqIgdfKnpvIvg816eFhcMqn4rart4Adtayt0GQOYheR0Q9DfR+TtbL0ne/drdlAABOQxc6PUJdLo+O5kx4f5QJbJ4,iv:aZ+nt9qcmIRWyOhq3HfIU3qYHFnf8EjXOp0c0vQ2fQc=,tag:H6ncweCaKMDxq9VHt51qlw==,type:str]
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
gitlab-key: ENC[AES256_GCM,data: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,iv:g4X2GC/9+je4qkvUT4UJl40+r/FzFY88XtYkthiwGVY=,tag:XFfEzXJEeKXB/QJt2fT4Qw==,type:str]
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
@@ -17,7 +17,7 @@ sops:
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-03-28T18:27:51Z"
- mac: ENC[AES256_GCM,data:5b4pNUYbgqfEMYJ3gxs+uirOvoa/G4WczDQbgnjVARqu4noNtEsv/pu+Z1rlGS0UVwe7gDogc9Mq5X18ulMBZEjsMHPHkzI0v8Sv6+0iSSzF7YwmKoWKfc8+a64s6X41IjHt5jl2ANEFCMgy0a3KXY1Px/NpwBe8Q3eEzt+6lsU=,iv:tFJJNDSwlZ0h580vhKj7duHiyVvwQLMKFV1w1RJ9VM4=,tag:fF7gafhsyTt+7k1s7Yo3CA==,type:str]
+ lastmodified: "2026-03-30T15:43:41Z"
+ mac: ENC[AES256_GCM,data:fAn9R6YyyWD/WjA38Me0YLdzSzcuclAr4EkKM4De8Hd7sVrhl7FFI+Smoy3QagwljuUwjc9g8U5K6DYQB+Syu0re8ODCQmpzUKyQHsnN7OHHQk5dhrentC4GhTaEXjb+VGnPVGVjlLBo4ulw5faqu5A7iLHwViT0MjpGfq5egqA=,iv:1rP6wrHzjZvZGei4UljSR//6kL/1qzLskAUVCMA+HqI=,tag:QuhLq3ncHRxKyvHPDnH7VA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.2
From d9b4102bed72329cdd12000f8bddaa30c75e511a Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:05:44 +0200
Subject: [PATCH 16/22] rename
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
.github/assets/{large.png => banner.png} | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/assets/{large.png => banner.png} (100%)
diff --git a/.github/assets/large.png b/.github/assets/banner.png
similarity index 100%
rename from .github/assets/large.png
rename to .github/assets/banner.png
From d029d6f20561e448a4121b1c75da8c6d63d38d4e Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:30:14 +0200
Subject: [PATCH 17/22] init gitea instance
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/server/configuration.nix | 1 +
server-modules/gitea.nix | 68 ++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 server-modules/gitea.nix
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index a8302bc..911d61c 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -26,6 +26,7 @@
../../server-modules/fail2ban.nix
../../server-modules/default-creds.nix
../../server-modules/umami.nix
+ ../../server-modules/gitea.nix
# You should let those lines as is
./hardware-configuration.nix
diff --git a/server-modules/gitea.nix b/server-modules/gitea.nix
new file mode 100644
index 0000000..0443371
--- /dev/null
+++ b/server-modules/gitea.nix
@@ -0,0 +1,68 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}: let
+ catppuccin-gitea = pkgs.fetchzip {
+ url = "https://github.com/catppuccin/gitea/releases/download/v1.0.2/catppuccin-gitea.tar.gz";
+ sha256 = "sha256-rZHLORwLUfIFcB6K9yhrzr+UwdPNQVSadsw6rg8Q7gs=";
+ stripRoot = false;
+ };
+in {
+ services = {
+ postgresql = {
+ enable = true;
+ ensureDatabases = [config.services.gitea.user]; # "gitea" par défaut
+ ensureUsers = [
+ {
+ name = config.services.gitea.database.user;
+ ensureDBOwnership = true;
+ }
+ ];
+ };
+
+ gitea = {
+ enable = true;
+ database = {
+ type = "postgres";
+ };
+ settings = {
+ server = {
+ HTTP_ADDR = "127.0.0.1";
+ HTTP_PORT = 3002;
+ ROOT_URL = "https://git.hadi.icu/";
+ DOMAIN = "git.hadi.icu";
+ LANDING_PAGE = "/anotherhadi";
+ };
+ service = {
+ REGISTER_MANUAL_CONFIRM = true;
+ DISABLE_REGISTRATION = true;
+ DEFAULT_KEEP_EMAIL_PRIVATE = true;
+ SHOW_REGISTRATION_BUTTON = false;
+ };
+ ui = {
+ DEFAULT_THEME = "catppuccin-mocha-mauve";
+ THEMES = "catppuccin-latte-mauve,catppuccin-frappe-mauve,catppuccin-macchiato-mauve,catppuccin-mocha-mauve";
+ };
+ explore = {
+ DISABLE_USERS_PAGE = true;
+ DISABLE_ORGANIZATIONS_PAGE = true;
+ };
+ repository = {
+ DISABLE_STARS = true;
+ };
+ mailer = {ENABLED = false;};
+ api = {ENABLE_SWAGGER = false;};
+ other = {SHOW_FOOTER_VERSION = false;};
+ };
+ };
+
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."git.hadi.icu" = "http://localhost:3002";
+ };
+
+ systemd.services.gitea.preStart = lib.mkAfter ''
+ mkdir -p ${config.services.gitea.stateDir}/custom/public/assets
+ ln -sfn ${catppuccin-gitea} ${config.services.gitea.stateDir}/custom/public/assets/css
+ '';
+}
From a6b2f66ac84fc558d36c577b76e4e5dd63b39790 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 30 Mar 2026 18:30:34 +0200
Subject: [PATCH 18/22] init swappy config
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
home/system/caelestia-shell/default.nix | 1 +
home/system/caelestia-shell/swappy.nix | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 home/system/caelestia-shell/swappy.nix
diff --git a/home/system/caelestia-shell/default.nix b/home/system/caelestia-shell/default.nix
index d9dc8ee..9fbb9ae 100644
--- a/home/system/caelestia-shell/default.nix
+++ b/home/system/caelestia-shell/default.nix
@@ -11,6 +11,7 @@
./launcher.nix
./appearance.nix
./scheme.nix
+ ./swappy.nix
];
programs.caelestia = {
diff --git a/home/system/caelestia-shell/swappy.nix b/home/system/caelestia-shell/swappy.nix
new file mode 100644
index 0000000..8a25049
--- /dev/null
+++ b/home/system/caelestia-shell/swappy.nix
@@ -0,0 +1,11 @@
+{
+ xdg.configFile."swappy/config".text = ''
+ [Default]
+ save_dir=~/Pictures/Screenshots
+ save_filename_format=screenshot-%Y%m%d-%H%M%S.png
+ show_panel=false
+ line_size=5
+ text_size=20
+ text_font=sans-serif
+ '';
+}
From 5d9ab362a3fc1580c60c1b15480f808f93503221 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 30 Mar 2026 20:00:00 +0200
Subject: [PATCH 19/22] update blog config
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
flake.lock | 12 +++++-----
server-modules/blog.nix | 50 ++++++++++++++++++++++++++++-------------
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
index 2482b9f..350396a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -125,11 +125,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1774471448,
- "narHash": "sha256-fK0DhC17S0DJVnvnwoPXQ1UGwmOzcma2zhwncBP5UYw=",
+ "lastModified": 1774893414,
+ "narHash": "sha256-2n0foeNENf4O3ZHmsppYtecrVWwjU80A6Dohjy1BKLA=",
"owner": "anotherhadi",
"repo": "blog",
- "rev": "7362feb3f58ac6f65e99315acc0101e0303862ba",
+ "rev": "cd93b16618678bbebade1ed6898f3844bf61d25d",
"type": "github"
},
"original": {
@@ -308,11 +308,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1774468489,
- "narHash": "sha256-VQfXEaN08eR5rVjwF1Wk5arNhoebZQst2ommdIIAHF4=",
+ "lastModified": 1774887895,
+ "narHash": "sha256-cULnvYcj/LzUtV8Q6HyYHgKevQBZjAF4FF5YaV68fkc=",
"owner": "anotherhadi",
"repo": "default-creds",
- "rev": "1c9d554b74e5acdd43cd83243fcd20671d707708",
+ "rev": "1b7c96da8f3a3923c1cfa36b01cd87b598bed5a5",
"type": "github"
},
"original": {
diff --git a/server-modules/blog.nix b/server-modules/blog.nix
index 12e341d..aebda98 100644
--- a/server-modules/blog.nix
+++ b/server-modules/blog.nix
@@ -4,23 +4,41 @@
...
}: {
services = {
- nginx.virtualHosts."blog.local" = {
- root = "${inputs.blog.packages.${pkgs.system}.default}/share/blog";
- listen = [
- {
- addr = "127.0.0.1";
- port = 8758;
- }
- ];
- locations."/" = {
- tryFiles = "$uri $uri/ /index.html";
+ nginx.virtualHosts = {
+ "blog.local" = {
+ root = "${inputs.blog.packages.${pkgs.system}.default}/share/blog";
+ listen = [
+ {
+ addr = "127.0.0.1";
+ port = 8758;
+ }
+ ];
+ locations."/" = {
+ tryFiles = "$uri $uri/ /index.html";
+ };
+ extraConfig = ''
+ port_in_redirect off;
+ absolute_redirect off;
+ add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.hadi.icu; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.hadi.icu; connect-src 'self' https://umami.hadi.icu;" always;
+ '';
+ };
+
+ "www.blog.local" = {
+ listen = [
+ {
+ addr = "127.0.0.1";
+ port = 8189;
+ }
+ ];
+ extraConfig = ''
+ return 301 https://hadi.icu$request_uri;
+ '';
};
- extraConfig = ''
- port_in_redirect off;
- absolute_redirect off;
- '';
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."hadi.icu" = "http://127.0.0.1:8758";
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."www.hadi.icu" = "http://127.0.0.1:8758";
+
+ cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
+ "hadi.icu" = "http://127.0.0.1:8758";
+ "www.hadi.icu" = "http://127.0.0.1:8189";
+ };
};
}
From d7b72277f73c5692738a6479a64e177ec087d512 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:45:03 +0200
Subject: [PATCH 20/22] change gitlab user
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
.github/assets/README_template.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/assets/README_template.md b/.github/assets/README_template.md
index f2f226f..1d56e44 100644
--- a/.github/assets/README_template.md
+++ b/.github/assets/README_template.md
@@ -127,6 +127,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
Date: Fri, 3 Apr 2026 18:45:39 +0000
Subject: [PATCH 21/22] Update README.md (auto)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 170f583..6a8c97d 100644
--- a/README.md
+++ b/README.md
@@ -137,6 +137,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
Date: Mon, 6 Apr 2026 15:13:10 +0200
Subject: [PATCH 22/22] Add variables for domain & tunnel id
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
hosts/server/variables.nix | 3 +++
server-modules/adguardhome.nix | 2 +-
server-modules/arr.nix | 16 +++++++-------
server-modules/awesome-wallpapers.nix | 3 ++-
server-modules/blog.nix | 11 +++++-----
server-modules/cloudflared.nix | 4 ++--
server-modules/cyberchef.nix | 8 +++++--
server-modules/default-creds.nix | 2 +-
server-modules/eleakxir.nix | 2 +-
server-modules/gitea.nix | 6 +++---
server-modules/glance/default.nix | 2 +-
server-modules/glance/home.nix | 8 +++----
server-modules/glance/server.nix | 30 +++++++++++++--------------
server-modules/mazanoke.nix | 8 +++++--
server-modules/mealie.nix | 2 +-
server-modules/ssh.nix | 2 +-
server-modules/stirling-pdf.nix | 2 +-
server-modules/umami.nix | 4 ++--
18 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/hosts/server/variables.nix b/hosts/server/variables.nix
index ff1e904..6f3c983 100644
--- a/hosts/server/variables.nix
+++ b/hosts/server/variables.nix
@@ -30,6 +30,9 @@
autoUpgrade = false;
autoGarbageCollector = true;
+
+ domain = "hadi.icu";
+ tunnelId = "a1dfa315-7fc3-4a65-8c02-8387932c35c3";
};
# Let this here
diff --git a/server-modules/adguardhome.nix b/server-modules/adguardhome.nix
index d5703c1..55f7145 100644
--- a/server-modules/adguardhome.nix
+++ b/server-modules/adguardhome.nix
@@ -11,5 +11,5 @@
allowedUDPPorts = [53];
};
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."adguard.hadi.icu" = "http://localhost:${toString config.services.adguardhome.port}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."adguard.${config.var.domain}" = "http://localhost:${toString config.services.adguardhome.port}";
}
diff --git a/server-modules/arr.nix b/server-modules/arr.nix
index d49a5fd..070fb70 100644
--- a/server-modules/arr.nix
+++ b/server-modules/arr.nix
@@ -51,13 +51,13 @@ in {
users.users.jellyfin.extraGroups = ["video" "render"];
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
- "media.hadi.icu" = "http://localhost:8096";
- "demandemedia.hadi.icu" = "http://localhost:5055";
- "bazarr.hadi.icu" = "http://localhost:6767";
- "prowlarr.hadi.icu" = "http://localhost:9696";
- "radarr.hadi.icu" = "http://localhost:7878";
- "sonarr.hadi.icu" = "http://localhost:8989";
- "transmission.hadi.icu" = "http://localhost:9091";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
+ "media.${config.var.domain}" = "http://localhost:8096";
+ "demandemedia.${config.var.domain}" = "http://localhost:5055";
+ "bazarr.${config.var.domain}" = "http://localhost:6767";
+ "prowlarr.${config.var.domain}" = "http://localhost:9696";
+ "radarr.${config.var.domain}" = "http://localhost:7878";
+ "sonarr.${config.var.domain}" = "http://localhost:8989";
+ "transmission.${config.var.domain}" = "http://localhost:9091";
};
}
diff --git a/server-modules/awesome-wallpapers.nix b/server-modules/awesome-wallpapers.nix
index cb84da7..3761518 100644
--- a/server-modules/awesome-wallpapers.nix
+++ b/server-modules/awesome-wallpapers.nix
@@ -1,4 +1,5 @@
{
+ config,
inputs,
pkgs,
...
@@ -20,6 +21,6 @@
absolute_redirect off;
'';
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."wallpapers.hadi.icu" = "http://127.0.0.1:8759";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress."wallpapers.${config.var.domain}" = "http://127.0.0.1:8759";
};
}
diff --git a/server-modules/blog.nix b/server-modules/blog.nix
index aebda98..f72b5e7 100644
--- a/server-modules/blog.nix
+++ b/server-modules/blog.nix
@@ -1,4 +1,5 @@
{
+ config,
inputs,
pkgs,
...
@@ -19,7 +20,7 @@
extraConfig = ''
port_in_redirect off;
absolute_redirect off;
- add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.hadi.icu; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.hadi.icu; connect-src 'self' https://umami.hadi.icu;" always;
+ add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${config.var.domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${config.var.domain}; connect-src 'self' https://umami.${config.var.domain};" always;
'';
};
@@ -31,14 +32,14 @@
}
];
extraConfig = ''
- return 301 https://hadi.icu$request_uri;
+ return 301 https://${config.var.domain}$request_uri;
'';
};
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
- "hadi.icu" = "http://127.0.0.1:8758";
- "www.hadi.icu" = "http://127.0.0.1:8189";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress = {
+ "${config.var.domain}" = "http://127.0.0.1:8758";
+ "www.${config.var.domain}" = "http://127.0.0.1:8189";
};
};
}
diff --git a/server-modules/cloudflared.nix b/server-modules/cloudflared.nix
index 8aa7947..4bccfdb 100644
--- a/server-modules/cloudflared.nix
+++ b/server-modules/cloudflared.nix
@@ -14,7 +14,7 @@
# This will create a credentials file & give you the tunnel ID to use below.
services.cloudflared = {
enable = true;
- tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
+ tunnels."${config.var.tunnelId}" = {
credentialsFile = config.sops.secrets."cloudflared-token".path;
default = "http_status:404";
};
@@ -24,7 +24,7 @@
cloudflared
];
- systemd.services."cloudflared-tunnel-a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
+ systemd.services."cloudflared-tunnel-${config.var.tunnelId}" = {
wantedBy = ["multi-user.target"];
after = ["network-online.target"];
wants = ["network-online.target"];
diff --git a/server-modules/cyberchef.nix b/server-modules/cyberchef.nix
index b71c371..a474e75 100644
--- a/server-modules/cyberchef.nix
+++ b/server-modules/cyberchef.nix
@@ -1,5 +1,9 @@
# Cyberchef is a web app for analyzing and decoding data.
-{pkgs, ...}: {
+{
+ config,
+ pkgs,
+ ...
+}: {
services = {
nginx.virtualHosts."cyberchef.local" = {
root = "${pkgs.cyberchef}/share/cyberchef";
@@ -10,6 +14,6 @@
}
];
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."cyberchef.hadi.icu" = "http://localhost:8754";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress."cyberchef.${config.var.domain}" = "http://localhost:8754";
};
}
diff --git a/server-modules/default-creds.nix b/server-modules/default-creds.nix
index 1708f98..1b84acf 100644
--- a/server-modules/default-creds.nix
+++ b/server-modules/default-creds.nix
@@ -4,5 +4,5 @@
port = 8087;
};
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."default-creds.hadi.icu" = "http://localhost:${toString config.services.default-creds.port}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."default-creds.${config.var.domain}" = "http://localhost:${toString config.services.default-creds.port}";
}
diff --git a/server-modules/eleakxir.nix b/server-modules/eleakxir.nix
index 7f28886..01d4a8d 100644
--- a/server-modules/eleakxir.nix
+++ b/server-modules/eleakxir.nix
@@ -22,5 +22,5 @@
inputs.eleakxir.packages.${pkgs.stdenv.hostPlatform.system}.leak-utils
];
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."eleakxir-back.hadi.icu" = "http://localhost:${toString config.services.eleakxir.port}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."eleakxir-back.${config.var.domain}" = "http://localhost:${toString config.services.eleakxir.port}";
}
diff --git a/server-modules/gitea.nix b/server-modules/gitea.nix
index 0443371..1c2f934 100644
--- a/server-modules/gitea.nix
+++ b/server-modules/gitea.nix
@@ -31,8 +31,8 @@ in {
server = {
HTTP_ADDR = "127.0.0.1";
HTTP_PORT = 3002;
- ROOT_URL = "https://git.hadi.icu/";
- DOMAIN = "git.hadi.icu";
+ ROOT_URL = "https://git.${config.var.domain}/";
+ DOMAIN = "git.${config.var.domain}";
LANDING_PAGE = "/anotherhadi";
};
service = {
@@ -58,7 +58,7 @@ in {
};
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."git.hadi.icu" = "http://localhost:3002";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress."git.${config.var.domain}" = "http://localhost:3002";
};
systemd.services.gitea.preStart = lib.mkAfter ''
diff --git a/server-modules/glance/default.nix b/server-modules/glance/default.nix
index 9a9144c..e48894f 100644
--- a/server-modules/glance/default.nix
+++ b/server-modules/glance/default.nix
@@ -14,7 +14,7 @@
server.port = 5678;
};
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."home.hadi.icu" = "http://localhost:8755";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress."home.${config.var.domain}" = "http://localhost:8755";
nginx.virtualHosts."glance.local" = {
listen = [
diff --git a/server-modules/glance/home.nix b/server-modules/glance/home.nix
index 3c77d94..469cb46 100644
--- a/server-modules/glance/home.nix
+++ b/server-modules/glance/home.nix
@@ -97,11 +97,11 @@
}
{
title = "Mazanoke (image downgrading)";
- url = "https://mazanoke.hadi.icu";
+ url = "https://mazanoke.${config.var.domain}";
}
{
title = "Stirling PDF";
- url = "https://pdf.hadi.icu";
+ url = "https://pdf.${config.var.domain}";
}
{
title = "Vert (file converter)";
@@ -200,11 +200,11 @@
links = [
{
title = "Nix 4 Cyber";
- url = "https://n4c.hadi.icu";
+ url = "https://n4c.${config.var.domain}";
}
{
title = "Cyberchef";
- url = "https://cyberchef.hadi.icu";
+ url = "https://cyberchef.${config.var.domain}";
}
{
title = "TryHackMe";
diff --git a/server-modules/glance/server.nix b/server-modules/glance/server.nix
index 06d977a..5df1e5a 100644
--- a/server-modules/glance/server.nix
+++ b/server-modules/glance/server.nix
@@ -26,42 +26,42 @@
sites = [
{
title = "Adguard";
- url = "https://adguard.hadi.icu";
+ url = "https://adguard.${config.var.domain}";
icon = "si:adguard";
}
{
title = "Mealie";
- url = "https://mealie.hadi.icu";
+ url = "https://mealie.${config.var.domain}";
icon = "si:mealie";
}
{
title = "Linkding";
- url = "https://linkding.hadi.icu";
+ url = "https://linkding.${config.var.domain}";
icon = "sh:linkding";
}
{
title = "Mazanoke";
- url = "https://mazanoke.hadi.icu";
+ url = "https://mazanoke.${config.var.domain}";
icon = "sh:mazanoke";
}
{
title = "Stirling PDF";
- url = "https://pdf.hadi.icu";
+ url = "https://pdf.${config.var.domain}";
icon = "sh:stirling-pdf";
}
{
title = "Default-creds";
- url = "https://default-creds.hadi.icu";
+ url = "https://default-creds.${config.var.domain}";
icon = "si:passbolt";
}
{
title = "Blog";
- url = "https://hadi.icu";
+ url = "https://${config.var.domain}";
icon = "si:blogger";
}
{
title = "Cyberchef";
- url = "https://cyberchef.hadi.icu";
+ url = "https://cyberchef.${config.var.domain}";
icon = "si:codechef";
}
];
@@ -73,37 +73,37 @@
sites = [
{
title = "Jellyfin";
- url = "https://media.hadi.icu";
+ url = "https://media.${config.var.domain}";
icon = "si:jellyfin";
}
{
title = "Jellyseerr";
- url = "https://demandemedia.hadi.icu";
+ url = "https://demandemedia.${config.var.domain}";
icon = "si:odysee";
}
{
title = "Radarr";
- url = "https://radarr.hadi.icu";
+ url = "https://radarr.${config.var.domain}";
icon = "si:radarr";
}
{
title = "Sonarr";
- url = "https://sonarr.hadi.icu";
+ url = "https://sonarr.${config.var.domain}";
icon = "si:sonarr";
}
{
title = "Bazarr";
- url = "https://bazarr.hadi.icu";
+ url = "https://bazarr.${config.var.domain}";
icon = "si:subtitleedit";
}
{
title = "Prowlarr";
- url = "https://prowlarr.hadi.icu";
+ url = "https://prowlarr.${config.var.domain}";
icon = "si:podcastindex";
}
{
title = "Transmission";
- url = "https://transmission.hadi.icu";
+ url = "https://transmission.${config.var.domain}";
icon = "si:transmission";
}
];
diff --git a/server-modules/mazanoke.nix b/server-modules/mazanoke.nix
index 4aff26b..5b21a2d 100644
--- a/server-modules/mazanoke.nix
+++ b/server-modules/mazanoke.nix
@@ -1,5 +1,9 @@
# Mazanoke is a self-hosted image downgrader
-{pkgs, ...}: let
+{
+ config,
+ pkgs,
+ ...
+}: let
version = "1.1.5";
mazanoke-pkg = pkgs.stdenv.mkDerivation {
inherit version;
@@ -30,6 +34,6 @@ in {
}
];
};
- cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mazanoke.hadi.icu" = "http://localhost:8755";
+ cloudflared.tunnels."${config.var.tunnelId}".ingress."mazanoke.${config.var.domain}" = "http://localhost:8755";
};
}
diff --git a/server-modules/mealie.nix b/server-modules/mealie.nix
index a398430..b42976d 100644
--- a/server-modules/mealie.nix
+++ b/server-modules/mealie.nix
@@ -5,5 +5,5 @@
port = 8092;
};
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mealie.hadi.icu" = "http://localhost:${toString config.services.mealie.port}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."mealie.${config.var.domain}" = "http://localhost:${toString config.services.mealie.port}";
}
diff --git a/server-modules/ssh.nix b/server-modules/ssh.nix
index 361305b..73a4dfc 100644
--- a/server-modules/ssh.nix
+++ b/server-modules/ssh.nix
@@ -18,5 +18,5 @@ in {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy"
];
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."ssh.hadi.icu" = "ssh://localhost:22";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."ssh.${config.var.domain}" = "ssh://localhost:22";
}
diff --git a/server-modules/stirling-pdf.nix b/server-modules/stirling-pdf.nix
index 458854b..80cab4d 100644
--- a/server-modules/stirling-pdf.nix
+++ b/server-modules/stirling-pdf.nix
@@ -5,5 +5,5 @@
environment."SERVER_PORT" = "8083";
};
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."pdf.hadi.icu" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."pdf.${config.var.domain}" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}";
}
diff --git a/server-modules/umami.nix b/server-modules/umami.nix
index f282041..e28b198 100644
--- a/server-modules/umami.nix
+++ b/server-modules/umami.nix
@@ -13,9 +13,9 @@
DISABLE_BOT_CHECK = true;
};
};
- services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."umami.hadi.icu" = "http://localhost:${toString config.services.umami.settings.PORT}";
+ services.cloudflared.tunnels."${config.var.tunnelId}".ingress."umami.${config.var.domain}" = "http://localhost:${toString config.services.umami.settings.PORT}";
systemd.services.default-creds.environment = {
- PUBLIC_UMAMI_URL = "https://umami.hadi.icu";
+ PUBLIC_UMAMI_URL = "https://umami.${config.var.domain}";
# FIXME:
PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
UMAMI_URL = "http://localhost:8097";