winston/infra
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: clean up flake inputs

Browse source
This commit is contained in:
winston 2024-09-16 16:56:18 +02:00
parent 3908e7b52c
commit 183b98a728
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 40 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/services/atuin.nix
View file

@ -1,6 +1,11 @@
{config, ...}: { {
config,
pkgs,
...
}: {
services.atuin = { services.atuin = {
enable = true; enable = true;
package = pkgs.unstable.atuin;
openRegistration = false; openRegistration = false;
maxHistoryLength = 1024 * 16; maxHistoryLength = 1024 * 16;
port = 43473; port = 43473;

67
flake.lock
View file

@ -174,26 +174,6 @@
"type": "github" "type": "github"
} }
}, },
"nixinate": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1708891350,
"narHash": "sha256-VOQrKK7Df/IVuNki+NshVuGkTa/Tw0GigPjWcZff6kk=",
"owner": "matthewcroughan",
"repo": "nixinate",
"rev": "452f33c60df5b72ad0858f5f2cf224bdf1f17746",
"type": "github"
},
"original": {
"owner": "matthewcroughan",
"repo": "nixinate",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725001927, "lastModified": 1725001927,
@ -258,11 +238,11 @@
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixinate": "nixinate",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"satisfactory-server": "satisfactory-server", "satisfactory-server": "satisfactory-server",
"steam-fetcher": "steam-fetcher",
"valheim-server": "valheim-server" "valheim-server": "valheim-server"
} }
}, },
@ -271,44 +251,27 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"steam-fetcher": "steam-fetcher" "steam-fetcher": [
"steam-fetcher"
]
}, },
"locked": { "locked": {
"lastModified": 1726069190, "lastModified": 1726272490,
"narHash": "sha256-UYnjgHSIjxdbRBxpVwvQ5IX5TVfRmgVZsGvwvRHeuPc=", "narHash": "sha256-gpbldF84vR73LevX+PuYFRDXuoQBiR8mRDtuSfqvAU4=",
"path": "/home/winston/satisfactory-flake", "owner": "nekowinston",
"type": "path" "repo": "satisfactory-server-flake",
"rev": "1b2cb3e067fad90576926df4f3d94ccc206e3225",
"type": "github"
}, },
"original": { "original": {
"path": "/home/winston/satisfactory-flake", "owner": "nekowinston",
"type": "path" "repo": "satisfactory-server-flake",
"type": "github"
} }
}, },
"steam-fetcher": { "steam-fetcher": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"satisfactory-server",
"nixpkgs"
]
},
"locked": {
"lastModified": 1714795926,
"narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
"owner": "nix-community",
"repo": "steam-fetcher",
"rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "steam-fetcher",
"type": "github"
}
},
"steam-fetcher_2": {
"inputs": {
"nixpkgs": [
"valheim-server",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -361,7 +324,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"steam-fetcher": "steam-fetcher_2" "steam-fetcher": [
"steam-fetcher"
]
}, },
"locked": { "locked": {
"lastModified": 1724824251, "lastModified": 1724824251,

36
flake.nix
View file

@ -1,24 +1,23 @@
{ {
outputs = { outputs = {
flake-parts, flake-parts,
self, nixpkgs,
nixpkgs-unstable,
... ...
} @ inputs: let } @ inputs: let
overlays = [ overlays = [
(final: _: rec { (final: _: {
atuin = unstable.atuin; unstable = nixpkgs-unstable.legacyPackages.${final.system};
prometheus-fail2ban-exporter = final.callPackage ./pkgs/prometheus-fail2ban-exporter {}; prometheus-fail2ban-exporter = final.callPackage ./pkgs/prometheus-fail2ban-exporter {};
unstable = inputs.nixpkgs-unstable.legacyPackages.${final.system};
}) })
]; ];
in in
flake-parts.lib.mkFlake {inherit inputs;} { flake-parts.lib.mkFlake {inherit inputs;} {
flake = { flake = {
nixosConfigurations.main-node = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations.main-node = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ {
_module.args.nixinate.host = "main-node";
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
inherit overlays; inherit overlays;
@ -30,8 +29,8 @@
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
inputs.attic.nixosModules.atticd inputs.attic.nixosModules.atticd
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.valheim-server.nixosModules.default
inputs.satisfactory-server.nixosModules.default inputs.satisfactory-server.nixosModules.default
inputs.valheim-server.nixosModules.default
]; ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
@ -45,12 +44,10 @@
system, system,
... ...
}: { }: {
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import nixpkgs {
inherit overlays system; inherit overlays system;
}; };
apps = (inputs.nixinate.nixinate.${system} self).nixinate;
pre-commit = { pre-commit = {
check.enable = true; check.enable = true;
settings.excludes = ["_sources/"]; settings.excludes = ["_sources/"];
@ -109,24 +106,27 @@
inputs.flake-compat.follows = ""; inputs.flake-compat.follows = "";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
nixinate = {
url = "github:matthewcroughan/nixinate";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks = { pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix"; url = "github:cachix/pre-commit-hooks.nix";
inputs.flake-compat.follows = ""; inputs.flake-compat.follows = "";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
valheim-server = {
url = "github:aidalgol/valheim-server-flake"; # game servers
steam-fetcher = {
url = "github:nix-community/steam-fetcher";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
satisfactory-server = { satisfactory-server = {
# url = "github:nekowinston/satisfactory-server-flake"; url = "github:nekowinston/satisfactory-server-flake";
url = "path:/home/winston/satisfactory-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.steam-fetcher.follows = "steam-fetcher";
};
valheim-server = {
url = "github:aidalgol/valheim-server-flake";
inputs.nixpkgs.follows = "nixpkgs";
inputs.steam-fetcher.follows = "steam-fetcher";
}; };
}; };