uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: uku:cdc2928496c5dc4042ce56e3ee2c170239d9c4a6
Branches Tags
uku:main
...
compare: uku:a574d4bbc33de8aacd01c27f4126c15e20d43138
Branches Tags
uku:main

3 commits
cdc2928496 ... a574d4bbc3

Author SHA1 Message Date
uku
a574d4bbc3
chore: housekeeping 2025-02-19 09:12:13 +01:00
uku
c1f5f4b006
chore: use vencord from nixpkgs 2025-02-19 09:10:42 +01:00
uku
99afb428a5
flake.lock: Update 
Flake lock file updates:

• Updated input 'api-rs':
    'github:uku3lig/api-rs/2a2b0de722df8f067d30033c06cbd42fd86b6598?narHash=sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo%3D' (2025-02-15)
  → 'github:uku3lig/api-rs/69c1466b78c83fc859787e97b80b036f49b38e7b?narHash=sha256-YCPiPre4xza1h4VRZXaJgqQyvdVwkYaTTKmIWxoNuf4%3D' (2025-02-17)
• Updated input 'crane':
    'github:ipetkov/crane/bef2b45cd1273a9e621fb5292de89f4ed59ad812?narHash=sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA%3D' (2025-02-15)
  → 'github:ipetkov/crane/19de14aaeb869287647d9461cbd389187d8ecdb7?narHash=sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk%3D' (2025-02-19)
• Updated input 'home-manager':
    'github:nix-community/home-manager/c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9?narHash=sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E%2BbVJiZ0XAmncvgQ%3D' (2025-02-17)
  → 'github:nix-community/home-manager/97ac0801d187b2911e8caa45316399de12f6f199?narHash=sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw%3D' (2025-02-18)
• Updated input 'mystia':
    'github:soopyc/mystia/f71433e1b01985f3314779022610af79fb6e7a4f?narHash=sha256-ZNycX3106IamF7OBT81AJN8sPyMa6DWhTYdd06WPLbo%3D' (2025-02-17)
  → 'github:soopyc/mystia/4f14c9163958ef55ae812c640be213f56cc1325a?narHash=sha256-90SN/KY%2BkInmxPrCR%2B4sLJA8A860A0RVp/ZxliYlYIs%3D' (2025-02-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d74a2335ac9c133d6bbec9fc98d91a77f1604c1f?narHash=sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb%2BP%2BR4S8Jsw%3D' (2025-02-16)
  → 'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/4f09b473c936d41582dd744e19f34ec27592c5fd?narHash=sha256-yrK3Hjcr8F7qS/j2F%2Br7C7o010eVWWlm4T1PrbKBOxQ%3D' (2025-02-07)
  → 'github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204?narHash=sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU%3D' (2025-02-17)
• Updated input 'vscode-extensions':
    'github:nix-community/nix-vscode-extensions/b18fbfeaa9fa5773cc0fa3b03326343fdfc5403e?narHash=sha256-9uYAIjcsgRm4yRpO30a7KMYxd/bozenpe853bGXcvbc%3D' (2025-02-17)
  → 'github:nix-community/nix-vscode-extensions/fe953b35b591faf57660800fb6e8b74956eea846?narHash=sha256-4mcftoL28KCeBX%2BwyD37IdVGeY2MyXxigL8Jj2rzsus%3D' (2025-02-19)
 2025-02-19 09:05:12 +01:00
6 changed files with 25 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/common.nix
View file

@ -7,7 +7,6 @@
camasca, camasca,
home-manager, home-manager,
nixpkgs, nixpkgs,
vencord,
... ...
}: }:
let let
@ -144,7 +143,7 @@ in
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
flake.setNixPath = false; flake.setNixPath = false;
overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ]; overlays = [ (import ../exprs/overlay.nix) ];
}; };
programs = { programs = {

32
exprs/overlay.nix
View file

@ -1,4 +1,4 @@
inputs: final: prev: { final: prev: {
idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { }; idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { };
urbackup-client = prev.urbackup-client.overrideAttrs (old: { urbackup-client = prev.urbackup-client.overrideAttrs (old: {
@ -10,34 +10,4 @@ inputs: final: prev: {
"--localstatedir=/var/lib" "--localstatedir=/var/lib"
]; ];
}); });
vencord = prev.vencord.overrideAttrs (old: {
version = "${old.version}+git.${inputs.vencord.shortRev}";
src = inputs.vencord;
env = old.env // {
VENCORD_REMOTE = "Vendicated/Vencord";
VENCORD_HASH = inputs.vencord.shortRev;
ESBUILD_BINARY_PATH = prev.lib.getExe (
prev.esbuild.overrideAttrs (
final: _: {
version = "0.25.0";
src = prev.fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${final.version}";
hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
)
);
};
pnpmDeps = old.pnpmDeps.overrideAttrs (_: {
outputHash = "sha256-0afgeJkK0OQWoqF0b8pHPMsiTKox84YmwBhtNWGyVAg=";
outputHashAlgo = "sha256";
});
});
} }

59
flake.lock generated
View file

@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739661813, "lastModified": 1739824998,
"narHash": "sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo=", "narHash": "sha256-YCPiPre4xza1h4VRZXaJgqQyvdVwkYaTTKmIWxoNuf4=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "api-rs", "repo": "api-rs",
"rev": "2a2b0de722df8f067d30033c06cbd42fd86b6598", "rev": "69c1466b78c83fc859787e97b80b036f49b38e7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1739638817, "lastModified": 1739936662,
"narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=", "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812", "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739790043, "lastModified": 1739913864,
"narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=", "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9", "rev": "97ac0801d187b2911e8caa45316399de12f6f199",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739779327, "lastModified": 1739952117,
"narHash": "sha256-ZNycX3106IamF7OBT81AJN8sPyMa6DWhTYdd06WPLbo=", "narHash": "sha256-90SN/KY+kInmxPrCR+4sLJA8A860A0RVp/ZxliYlYIs=",
"owner": "soopyc", "owner": "soopyc",
"repo": "mystia", "repo": "mystia",
"rev": "f71433e1b01985f3314779022610af79fb6e7a4f", "rev": "4f14c9163958ef55ae812c640be213f56cc1325a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739736696, "lastModified": 1739866667,
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,7 +248,6 @@
"systems": "systems", "systems": "systems",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix",
"ukubot-rs": "ukubot-rs", "ukubot-rs": "ukubot-rs",
"vencord": "vencord",
"vscode-extensions": "vscode-extensions" "vscode-extensions": "vscode-extensions"
} }
}, },
@ -295,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738953846, "lastModified": 1739829690,
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "rev": "3d0579f5cc93436052d94b73925b48973a104204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,22 +330,6 @@
"type": "github" "type": "github"
} }
}, },
"vencord": {
"flake": false,
"locked": {
"lastModified": 1739756829,
"narHash": "sha256-Szweth0AVabzI336SSHKTTET+0T77TMkexuIUukg9KY=",
"owner": "Vendicated",
"repo": "Vencord",
"rev": "1f6720318354e026fe24ed3e76935ec9e42d5193",
"type": "github"
},
"original": {
"owner": "Vendicated",
"repo": "Vencord",
"type": "github"
}
},
"vscode-extensions": { "vscode-extensions": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": [],
@ -358,11 +341,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739757126, "lastModified": 1739929767,
"narHash": "sha256-9uYAIjcsgRm4yRpO30a7KMYxd/bozenpe853bGXcvbc=", "narHash": "sha256-4mcftoL28KCeBX+wyD37IdVGeY2MyXxigL8Jj2rzsus=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "b18fbfeaa9fa5773cc0fa3b03326343fdfc5403e", "rev": "fe953b35b591faf57660800fb6e8b74956eea846",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -139,11 +139,5 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
# ==== non-nix inputs ====
vencord = {
url = "github:Vendicated/Vencord";
flake = false;
};
}; };
} }

2
systems/vesuvio/mail/maddy.nix
View file

@ -9,7 +9,7 @@ in
imports = [ env.generate ]; imports = [ env.generate ];
security.acme.certs.${hostname} = { security.acme.certs.${hostname} = {
group = config.services.maddy.group; inherit (config.services.maddy) group;
extraLegoRenewFlags = [ "--reuse-key" ]; # soopyc said its more secure extraLegoRenewFlags = [ "--reuse-key" ]; # soopyc said its more secure
}; };

2
systems/vesuvio/mail/rspamd.nix
View file

@ -11,7 +11,7 @@ in
services = { services = {
redis.servers.rspamd = { redis.servers.rspamd = {
enable = true; enable = true;
user = config.services.rspamd.user; inherit (config.services.rspamd) user;
port = 0; # disable tcp port = 0; # disable tcp
}; };