Merge branch 'main' of git.sr.ht:~xqtc/nixos-config

This commit is contained in:
xqtc161 2024-05-17 22:50:11 +02:00
commit 24a574f3bc
3 changed files with 84 additions and 22 deletions

View file

@ -49,11 +49,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1715077665, "lastModified": 1715659401,
"narHash": "sha256-m7t26gM7ckv65oqgHNNMN7+d2OAXBi6tvWinb1vZ0UI=", "narHash": "sha256-pqeXE2v8b3Hvvr4BP5Qco3j/KCG2MUOdNcfZk4KcVvQ=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "536d68d47657d50afe486fe559ab83018cfcca1c", "rev": "78de0ad8fdb664b581614be18ce1cadf2674014b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -129,6 +129,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1629284811, "lastModified": 1629284811,
@ -245,11 +260,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715486357,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714679908, "lastModified": 1715486357,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +336,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715010655, "lastModified": 1715148395,
"narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +368,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1715108851, "lastModified": 1715674092,
"narHash": "sha256-NJj8+Qqqtka2xH2fQ1LFVKE3PBAR6GLRVRVsK58A8+4=", "narHash": "sha256-ufaMMDTnSb/jtiPSwy5zeGPl/pvCrp//Ee3fkD/u784=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "403d5963cc5ca2de87bc891dd9090c9995dc7a97", "rev": "ea9b756c5a6e0f8ef6cc89c62b3e3a79ac1af236",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +416,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1715534503,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,19 +451,21 @@
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1715093176, "lastModified": 1715582453,
"narHash": "sha256-zb0hnSNnniskSB/B9r3+zjQyJTwLT84Vm4WMz/v2ErI=", "narHash": "sha256-pW8a12PHt/PUphG8Tn0nb+mfbTS7JS4YbThGPepCcb0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b731bedfb9a75f9d25da4d8e97a95f03eb863274", "rev": "4530a35bad28a0e8b21905b0817a225e6387811c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,6 +610,27 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -14,6 +14,7 @@ with lib; {
./transmission.nix ./transmission.nix
./lanrarari.nix ./lanrarari.nix
./uptime.nix ./uptime.nix
./git.nix
../../gc.nix ../../gc.nix
../../../common ../../../common
]; ];
@ -39,15 +40,22 @@ with lib; {
root * /var/www/demos/ root * /var/www/demos/
file_server browse file_server browse
} }
git.heroin.trade {
reverse_proxy http://localhost:3002
}
jellyfin.heroin.trade { jellyfin.heroin.trade {
reverse_proxy http://127.0.0.1:8096 reverse_proxy http://127.0.0.1:8096
} }
calibre.heroin.trade { calibre.heroin.trade {
reverse_proxy http://localhost:3000 reverse_proxy http://localhost:3000
} }
grafana.heroin.trade { grafana.heroin.trade {
reverse_proxy http://127.0.0.1:2342 reverse_proxy http://127.0.0.1:2342
} }
uptime.heroin.trade { uptime.heroin.trade {
reverse_proxy 127.0.0.1:3001 reverse_proxy 127.0.0.1:3001
} }

View file

@ -0,0 +1,16 @@
{lib, inputs, ...}:
{
services.forgejo = {
enable = true;
settings.server = {
HTTP_PORT = 3002;
ROOT_URL = "https://git.heroin.trade";
};
settings = {
service = {
DISABLE_REGISTRATION = true;
REQUIRE_SIGNIN_VIEW = true;
};
};
};
}