Compare commits

...

5 commits

Author SHA1 Message Date
xqtc e97924ab5e
add comin prom exporter 2024-11-02 01:01:36 +01:00
xqtc 2c10a64acf
add nixos-config repo url to comin config 2024-11-02 00:36:44 +01:00
xqtc fcb170ad09
add comin module import 2024-11-02 00:29:37 +01:00
xqtc ce1ca48877
add comin 2024-11-02 00:28:05 +01:00
xqtc 632bd72c88
nix flake update; add kenzo user on beleth 2024-11-02 00:14:39 +01:00
8 changed files with 82 additions and 42 deletions

View file

@ -105,11 +105,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1730088193, "lastModified": 1730451285,
"narHash": "sha256-bal4Z9FuMyOeDf9QKjq0BY/ftxas95yksZZjqz3erZo=", "narHash": "sha256-riTKP5+xXtWnNiGrnttTylrVYW9umOduK7/eoqXEmFU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "2e14b0705c0c510258864a9832832b89ca6628e9", "rev": "f6b3852c3b3e79786d33f5f5a4b4429dbe03d566",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1730302582,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730016908, "lastModified": 1730450782,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8", "rev": "8ca921e5a806b5b6171add542defe7bdac79d189",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729982130, "lastModified": 1730184279,
"narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "narHash": "sha256-6OB+WWR6gnaWiqSS28aMJypKeK7Pjc2Wm6L0MtOrTuA=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "rev": "b379bd4d872d159e5189053ce9a4adf86d56db4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,11 +558,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730068391, "lastModified": 1730368399,
"narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=", "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6906ac67a1078cf950b8527341e229eeecb5bc30", "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +590,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1729973466, "lastModified": 1730327045,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "rev": "080166c15633801df010977d9d7474b4a6c549d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1730147637, "lastModified": 1730487765,
"narHash": "sha256-oQx0w89dKGJsUba1AZdcZ9ga8xbbnlS8z7nGlcft8Co=", "narHash": "sha256-iKxB8FKCf0JbadnFOsVL+DtQxazCV6OC7XoDqftIk2k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7216383a52ea029800cd271fbb521038e94e93e", "rev": "9fb7c4404bc12c7c3221f48cc52fbff6fbb125b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -728,11 +728,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1729880355, "lastModified": 1730200266,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -789,11 +789,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730142611, "lastModified": 1730368298,
"narHash": "sha256-5FeMJgj7DRLVKLsBQiaZusvf/4sxhMEpmNC3Qm/rvnk=", "narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e7356f6be06a68e36987df6cfde3541a6817b708", "rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -812,11 +812,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730044642, "lastModified": 1730337772,
"narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "narHash": "sha256-uTxvqDohfG85+zldO5Tf1B+fuAF8ZhMouNwG5S6OAnA=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "rev": "4e0a7a95a3df3333771abc4df6a656e7baf67106",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1030,11 +1030,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730025913, "lastModified": 1730321837,
"narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,6 +7,10 @@
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
comin = {
url = "github:nlewo/comin";
inputs.nixpkgs.follows = "nixpkgs";
};
compose2nix = { compose2nix = {
url = "github:aksiksi/compose2nix"; url = "github:aksiksi/compose2nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -145,12 +145,13 @@ with inputs; {
"Nix Options" = { "Nix Options" = {
urls = [ urls = [
{ {
template = "https://search.nixos.org/options"; # template = "https://search.nixos.org/options";
template = "https://searchix.alanpearce.eu/all/search";
params = [ params = [
{ # {
name = "type"; # name = "type";
value = "options"; # value = "options";
} # }
{ {
name = "query"; name = "query";
value = "{searchTerms}"; value = "{searchTerms}";

View file

@ -0,0 +1,22 @@
{
inputs,
pkgs,
lib,
config,
...
}: {
imports = [
inputs.comin.nixosModules.comin
];
services.comin = {
enable = true;
remotes = [
{
name = "origin";
url = "https://git.sr.ht/~xqtc/nixos-config.git";
branches.main.name = "main";
}
];
};
}

View file

@ -9,6 +9,7 @@ with lib; {
./hardware-configuration.nix ./hardware-configuration.nix
./monitoring.nix ./monitoring.nix
./caddy.nix ./caddy.nix
./comin.nix
./jellyfin.nix ./jellyfin.nix
./calibre-web.nix ./calibre-web.nix
./transmission.nix ./transmission.nix

View file

@ -80,4 +80,15 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgVvtKzUxJ38TA0Xg4kUJYJY3a2MWZjbGZDYi/kiMWZ karl@Karl-Laptop" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgVvtKzUxJ38TA0Xg4kUJYJY3a2MWZjbGZDYi/kiMWZ karl@Karl-Laptop"
]; ];
}; };
users.users.kenzo = {
isNormalUser = true;
packages = with pkgs; [
git
wget
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII0QdrpIcknqHvn0os4+ANcwMEkLu7VBOClEL0+nvTZj Kenzo"
];
};
} }

View file

@ -62,6 +62,7 @@
"127.0.0.1:${toString config.services.prometheus.exporters.node.port}" "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
"127.0.0.1:${toString config.services.prometheus.exporters.nextcloud.port}" "127.0.0.1:${toString config.services.prometheus.exporters.nextcloud.port}"
"127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}" "127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}"
"127.0.0.1:${toString config.services.comin.exporter.port}"
]; ];
} }
]; ];