chore: update
This commit is contained in:
parent
e4010b7cc1
commit
fad3acb9b8
GPG key ID:
3786770EDBC2B481
4 changed files with 79 additions and 194 deletions
|
|
@ -9,5 +9,8 @@
|
|||
./users.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = [pkgs.git];
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
wezterm.terminfo
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,25 +22,25 @@ in {
|
|||
faerber-bot = {
|
||||
image = "ghcr.io/nekowinston/faerber/faerber-discord-bot:latest";
|
||||
environmentFiles = [config.age.secrets."containers/faerber.env".path];
|
||||
extraOptions = ["-l=io.containers.autoupdate=registry"];
|
||||
extraOptions = ["--pull=newer"];
|
||||
};
|
||||
|
||||
pepperjack = {
|
||||
image = "ghcr.io/phasecorex/red-discordbot:latest";
|
||||
image = "ghcr.io/phasecorex/red-discordbot:core-audio";
|
||||
environment = {
|
||||
TOKEN = "~";
|
||||
PREFIX = "~";
|
||||
OWNER = "505490445468696576";
|
||||
};
|
||||
environmentFiles = [config.age.secrets."containers/pepperjack.env".path];
|
||||
volumes = ["/srv/data-pepperjack:/data"];
|
||||
extraOptions = ["-l=io.containers.autoupdate=registry"];
|
||||
extraOptions = ["--pull=newer"];
|
||||
};
|
||||
|
||||
website = {
|
||||
image = "ghcr.io/nekowinston/winston.sh/winston-sh:latest";
|
||||
login = ghcrLogin;
|
||||
ports = ["127.0.0.1:${websitePort}:3000"];
|
||||
extraOptions = ["-l=io.containers.autoupdate=registry"];
|
||||
extraOptions = ["--pull=newer"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
207
flake.lock
207
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1690228878,
|
||||
"narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
|
||||
"lastModified": 1696775529,
|
||||
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
|
||||
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -41,11 +41,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1690933134,
|
||||
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
|
||||
"lastModified": 1696343447,
|
||||
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
|
||||
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -72,24 +72,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -113,7 +95,9 @@
|
|||
},
|
||||
"nixinate": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1688141737,
|
||||
|
|
@ -148,11 +132,11 @@
|
|||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1690881714,
|
||||
"narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
|
||||
"lastModified": 1696019113,
|
||||
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9e1960bc196baf6881340d53dccb203a951745a2",
|
||||
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -163,29 +147,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1685801374,
|
||||
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1693003285,
|
||||
"narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
|
||||
"lastModified": 1697456312,
|
||||
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
|
||||
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -197,75 +165,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1653060744,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
"lastModified": 1697226376,
|
||||
"narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1692986144,
|
||||
"narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1689261696,
|
||||
"narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1683475240,
|
||||
"narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1686513595,
|
||||
"narHash": "sha256-H3JNqj7TEiMx5rd8lRiONvgFZvmf3kmwHI2umDdqgFY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bb8b5735d6f7e06b9ddd27de115b0600c1ffbdb4",
|
||||
"rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -280,15 +184,19 @@
|
|||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1692274144,
|
||||
"narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
|
||||
"lastModified": 1696846637,
|
||||
"narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
|
||||
"rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -302,48 +210,25 @@
|
|||
"agenix": "agenix",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixinate": "nixinate",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"sanctureplicum-nur": "sanctureplicum-nur",
|
||||
"valheim-server": "valheim-server"
|
||||
}
|
||||
},
|
||||
"sanctureplicum-nur": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686890354,
|
||||
"narHash": "sha256-a8Yxu4ApSk6fhfRoHvnWhUJuOG/A7BVASczKtdXMzf0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "72e258ac341e9e91314a2738b7577273354a386b",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://gitea.pid1.sh/sanctureplicum/nur.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://gitea.pid1.sh/sanctureplicum/nur.git"
|
||||
}
|
||||
},
|
||||
"steam-fetcher": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"valheim-server",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"valheim-server",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686720327,
|
||||
"narHash": "sha256-tXr09buKDKv81pnmcIwJ7eq2MaaU+4qfYrp6Mvb8buw=",
|
||||
"lastModified": 1694424148,
|
||||
"narHash": "sha256-1PV7sxioWWD/yLxnkLVOL6zvlTOBl98kUv4ol4p0ozo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "steam-fetcher",
|
||||
"rev": "30964171f7c1711dc6edbe98f0839a40477a6f54",
|
||||
"rev": "2033f99c7aee506f5af18026a3cab1c93bd0439f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -367,37 +252,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"valheim-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"steam-fetcher": "steam-fetcher"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693000988,
|
||||
"narHash": "sha256-bqnMapFXWuLr9akMfPh9X8GMhGbto+yTBUNLAl2vCWc=",
|
||||
"owner": "aidalgol",
|
||||
"lastModified": 1697639081,
|
||||
"narHash": "sha256-zP8zSFmbfEsyjMuGoh0RxQpfUkzshL7nUUyUDhgngG4=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "valheim-server-flake",
|
||||
"rev": "b07aa6a0533d4dc1490de3546706663a5677673f",
|
||||
"rev": "c1e8751c7b15f49a5b5edde70b38c425adfb6ad6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aidalgol",
|
||||
"owner": "nekowinston",
|
||||
"repo": "valheim-server-flake",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
51
flake.nix
51
flake.nix
|
|
@ -8,11 +8,18 @@
|
|||
agenix.url = "github:ryantm/agenix";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
nixinate.url = "github:matthewcroughan/nixinate";
|
||||
nixinate.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# attic.url = "github:zhaofengli/attic";
|
||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
sanctureplicum-nur.url = "git+https://gitea.pid1.sh/sanctureplicum/nur.git";
|
||||
valheim-server.url = "github:aidalgol/valheim-server-flake";
|
||||
pre-commit-hooks = {
|
||||
url = "github:cachix/pre-commit-hooks.nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
inputs.nixpkgs-stable.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
valheim-server = {
|
||||
url = "github:nekowinston/valheim-server-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
|
|
@ -20,24 +27,27 @@
|
|||
"https://cache.nixos.org"
|
||||
"https://cache.garnix.io"
|
||||
"https://pre-commit-hooks.cachix.org"
|
||||
"https://sanctureplicum.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
|
||||
"sanctureplicum.cachix.org-1:VztHStNqXs5pFZ0eNVoIfoqCaeKdNKRqkbNb8lYrqQ8="
|
||||
];
|
||||
};
|
||||
|
||||
outputs = {flake-parts, ...} @ inputs: let
|
||||
overlays = final: prev: rec {
|
||||
atuin = unstable.atuin;
|
||||
gitea-nyx = inputs.sanctureplicum-nur.packages.${prev.system}.gitea-nyx;
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (prev) system;
|
||||
};
|
||||
};
|
||||
outputs = {
|
||||
flake-parts,
|
||||
self,
|
||||
...
|
||||
} @ inputs: let
|
||||
overlays = [
|
||||
(final: prev: rec {
|
||||
atuin = unstable.atuin;
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (prev) system;
|
||||
};
|
||||
})
|
||||
];
|
||||
in
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
flake = {
|
||||
|
|
@ -47,11 +57,12 @@
|
|||
{
|
||||
_module.args.nixinate = {
|
||||
host = "main-node";
|
||||
buildOn = "local";
|
||||
buildOn = "remote";
|
||||
hermetic = false;
|
||||
};
|
||||
nixpkgs = {
|
||||
config.allowUnfree = true;
|
||||
overlays = [overlays];
|
||||
inherit overlays;
|
||||
};
|
||||
}
|
||||
./hosts/main-node
|
||||
|
|
@ -65,12 +76,12 @@
|
|||
};
|
||||
|
||||
perSystem = {
|
||||
inputs',
|
||||
pkgs,
|
||||
system,
|
||||
self',
|
||||
...
|
||||
}: {
|
||||
apps = (inputs.nixinate.nixinate.${system} inputs.self).nixinate;
|
||||
apps = (inputs.nixinate.nixinate.${system} self).nixinate;
|
||||
|
||||
checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
|
|
@ -81,8 +92,8 @@
|
|||
};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = [inputs.agenix.packages.${system}.agenix];
|
||||
inherit (inputs.self.checks.${system}.pre-commit-check) shellHook;
|
||||
buildInputs = [inputs'.agenix.packages.agenix];
|
||||
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||
};
|
||||
|
||||
formatter = pkgs.alejandra;
|
||||
|
|
|
|||
Loading…
Reference in a new issue