updated template form project
This commit is contained in:
parent
c58269b749
commit
d51b9fefa4
7 changed files with 116 additions and 25 deletions
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"rust-analyzer.linkedProjects": [
|
|
||||||
"./helloworld/Cargo.toml",
|
|
||||||
]
|
|
||||||
}
|
|
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -3,5 +3,5 @@
|
||||||
version = 3
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "helloworld"
|
name = "ewwtilities"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
[workspace]
|
[workspace]
|
||||||
members = ["helloworld"]
|
members = ["ewwtilities"]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "helloworld"
|
name = "ewwtilities"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
96
flake.lock
Normal file
96
flake.lock
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699099776,
|
||||||
|
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681358109,
|
||||||
|
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"rust-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699323235,
|
||||||
|
"narHash": "sha256-ZFRItRv0dDSzsfpqSjj9qWM/SA1kRrOk6R04qhBZuxM=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "8a9d6f544c08ee898c7f3761cc9587be7565db5e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
34
flake.nix
34
flake.nix
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
TODO
|
TODO
|
||||||
1. Find and replace "helloworld" with your package name for **ALL FILES IN REPOSITORY**
|
1. Find and replace "ewwtilities" with your package name for **ALL FILES IN REPOSITORY**
|
||||||
2. Add a flake description that describes the workspace on line 27
|
2. Add a flake description that describes the workspace on line 27
|
||||||
3. Add a package description on line 70
|
3. Add a package description on line 70
|
||||||
4. (optional) uncomment `nativeBuildInputs` and `buildInputs` on lines 43 and 44 if you need openssl
|
4. (optional) uncomment `nativeBuildInputs` and `buildInputs` on lines 43 and 44 if you need openssl
|
||||||
|
@ -13,8 +13,8 @@ TODO
|
||||||
Some utility commands:
|
Some utility commands:
|
||||||
- `nix flake update --commit-lock-file`
|
- `nix flake update --commit-lock-file`
|
||||||
- `nix flake lock update-input <input>`
|
- `nix flake lock update-input <input>`
|
||||||
- `nix build .#helloworld` or `nix build .`
|
- `nix build .#ewwtilities` or `nix build .`
|
||||||
- `nix run .#helloworld` or `nix run .`
|
- `nix run .#ewwtilities` or `nix run .`
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -53,14 +53,14 @@ Some utility commands:
|
||||||
cargo-edit
|
cargo-edit
|
||||||
bacon
|
bacon
|
||||||
];
|
];
|
||||||
inputsFrom = with self.packages.${system}; [ helloworld ];
|
inputsFrom = with self.packages.${system}; [ ewwtilities ];
|
||||||
};
|
};
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
default = self.packages.${system}.helloworld;
|
default = self.packages.${system}.ewwtilities;
|
||||||
helloworld = pkgs.rustPlatform.buildRustPackage (rustSettings // {
|
ewwtilities = pkgs.rustPlatform.buildRustPackage (rustSettings // {
|
||||||
pname = "helloworld";
|
pname = "ewwtilities";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
buildAndTestSubdir = "helloworld";
|
buildAndTestSubdir = "ewwtilities";
|
||||||
cargoHash = "sha256-+TaGIiKf+Pz2bTABeG8aCZz0/ZTCKl5398+qbas4Nvo=";
|
cargoHash = "sha256-+TaGIiKf+Pz2bTABeG8aCZz0/ZTCKl5398+qbas4Nvo=";
|
||||||
meta = meta // {
|
meta = meta // {
|
||||||
description = "";
|
description = "";
|
||||||
|
@ -71,14 +71,14 @@ Some utility commands:
|
||||||
nixosModules.default = { config, ... }: let
|
nixosModules.default = { config, ... }: let
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
in {
|
in {
|
||||||
options.services.helloworld = {
|
options.services.ewwtilities = {
|
||||||
enable = lib.mkEnableOption (lib.mdDoc "helloworld service");
|
enable = lib.mkEnableOption (lib.mdDoc "ewwtilities service");
|
||||||
package = lib.mkOption {
|
package = lib.mkOption {
|
||||||
type = lib.types.package;
|
type = lib.types.package;
|
||||||
default = self.packages.${system}.helloworld;
|
default = self.packages.${system}.ewwtilities;
|
||||||
defaultText = "pkgs.helloworld";
|
defaultText = "pkgs.ewwtilities";
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
The helloworld package that should be used.
|
The ewwtilities package that should be used.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
port = lib.mkOption {
|
port = lib.mkOption {
|
||||||
|
@ -89,16 +89,16 @@ Some utility commands:
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config.systemd.services.helloworld = let
|
config.systemd.services.ewwtilities = let
|
||||||
cfg = config.services.helloworld;
|
cfg = config.services.ewwtilities;
|
||||||
pkg = self.packages.${system}.helloworld;
|
pkg = self.packages.${system}.ewwtilities;
|
||||||
in lib.mkIf cfg.enable {
|
in lib.mkIf cfg.enable {
|
||||||
description = pkg.meta.description;
|
description = pkg.meta.description;
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "network.target" ];
|
wantedBy = [ "network.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${cfg.package}/bin/helloworld --port ${builtins.toString cfg.port}
|
${cfg.package}/bin/ewwtilities --port ${builtins.toString cfg.port}
|
||||||
'';
|
'';
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
|
|
Loading…
Reference in a new issue