Compare commits

..

4 commits

7 changed files with 70 additions and 6 deletions

40
flake.lock generated
View file

@ -16,6 +16,27 @@
"type": "github" "type": "github"
} }
}, },
"comin": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1769758502,
"narHash": "sha256-jFT7y3qJdngk4yfS4FM3TC+MBhob/wEVkb/vEh3eF40=",
"owner": "nlewo",
"repo": "comin",
"rev": "69ee06dc03cdd50e72a71634d7840af01afc6114",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "comin",
"type": "github"
}
},
"crowdsec": { "crowdsec": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -39,7 +60,7 @@
}, },
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -103,6 +124,22 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1765121682,
"narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
@ -312,6 +349,7 @@
"root": { "root": {
"inputs": { "inputs": {
"betterfox": "betterfox", "betterfox": "betterfox",
"comin": "comin",
"crowdsec": "crowdsec", "crowdsec": "crowdsec",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",

View file

@ -25,6 +25,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
comin = {
url = "github:nlewo/comin";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -75,12 +75,13 @@
}; };
environment.systemPackages = [ environment.systemPackages = [
(lib.hiPrio pkgs.uutils-coreutils-noprefix)
pkgs.git pkgs.git
pkgs.just pkgs.just
pkgs.nh pkgs.nh
pkgs.dust pkgs.dust
(lib.hiPrio pkgs.uutils-coreutils-noprefix)
pkgs.comma pkgs.comma
pkgs.btop
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -34,7 +34,7 @@
enable = true; enable = true;
onlyCleanRoots = true; onlyCleanRoots = true;
}; };
comin.enable = true;
sshd.enable = true; sshd.enable = true;
dns.enable = true; dns.enable = true;
}; };

View file

@ -38,10 +38,9 @@
enable = true; enable = true;
onlyCleanRoots = true; onlyCleanRoots = true;
}; };
comin.enable = true;
sshd.enable = true; sshd.enable = true;
dns.enable = true; dns.enable = true;
syncthing = { syncthing = {
enable = true; enable = true;
isServer = true; isServer = true;

View file

@ -37,7 +37,7 @@
enable = true; enable = true;
onlyCleanRoots = true; onlyCleanRoots = true;
}; };
comin.enable = true;
sshd.enable = true; sshd.enable = true;
caddy.virtualHosts."dav.${sproutedDomain}" = { caddy.virtualHosts."dav.${sproutedDomain}" = {

View file

@ -0,0 +1,21 @@
{
config,
inputs,
lib,
...
}:
{
imports = [ inputs.comin.nixosModules.comin ];
options.custom.services.comin.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.services.comin.enable {
services.comin = {
enable = true;
remotes = lib.singleton {
name = "origin";
url = "https://github.com/SebastianStork/nixos-config.git";
};
};
};
}