Remove (unused) nix build (for now) and add direnv/lorri setup
This commit is contained in:
Valentin Brandl
parent
5caed6729a
commit
3df814c64c
@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
56
default.nix
56
default.nix
@ -1,56 +0,0 @@
|
|||||||
{ sources ? import ./nix/sources.nix
|
|
||||||
, system ? builtins.currentSystem
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
rustOverlay = import "${sources.nixpkgs-mozilla}/rust-overlay.nix";
|
|
||||||
cargo2nixOverlay = import "${sources.cargo2nix}/overlay";
|
|
||||||
|
|
||||||
pkgs = import sources.nixpkgs {
|
|
||||||
# pkgs = import <nixpkgs> {
|
|
||||||
inherit system;
|
|
||||||
overlays = [ cargo2nixOverlay rustOverlay ];
|
|
||||||
};
|
|
||||||
|
|
||||||
rustPkgs = pkgs.rustBuilder.makePackageSet' {
|
|
||||||
rustChannel = "stable";
|
|
||||||
packageFun = import ./Cargo.nix;
|
|
||||||
localPatterns =
|
|
||||||
[
|
|
||||||
''^(src|tests)(/.*)?''
|
|
||||||
''[^/]*\.(rs|toml)$''
|
|
||||||
# include other directory from the project repository
|
|
||||||
''^templates(/.*)?''
|
|
||||||
''^static(/.*)?''
|
|
||||||
''^.git.*(/.*)?''
|
|
||||||
];
|
|
||||||
# packageOverrides
|
|
||||||
};
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
inherit rustPkgs;
|
|
||||||
shell = pkgs.mkShell {
|
|
||||||
inputsFrom = pkgs.lib.mapAttrsToList (_: pkg: pkg { }) rustPkgs.noBuild.workspace;
|
|
||||||
nativeBuildInputs = with rustPkgs; [ cargo rustc ];
|
|
||||||
};
|
|
||||||
package = (rustPkgs.workspace.hoc {}).overrideAttrs (drv: {
|
|
||||||
buildInputs = drv.buildInputs or [ ] ++ [ pkgs.git ];
|
|
||||||
});
|
|
||||||
dockerImage =
|
|
||||||
pkgs.dockerTools.buildImage {
|
|
||||||
name = "vbrandl/hits-of-code";
|
|
||||||
tag = package.version;
|
|
||||||
|
|
||||||
contents =
|
|
||||||
[
|
|
||||||
package
|
|
||||||
pkgs.cacert
|
|
||||||
pkgs.gitMinimal
|
|
||||||
];
|
|
||||||
|
|
||||||
config = {
|
|
||||||
Cmd = [ "/bin/hoc" ];
|
|
||||||
WorkingDir = "/home/hoc";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
{
|
|
||||||
"cargo2nix": {
|
|
||||||
"branch": "master",
|
|
||||||
"description": "Convert a Cargo.lock to mkRustCrate statements for import in Nix",
|
|
||||||
"homepage": "",
|
|
||||||
"owner": "tenx-tech",
|
|
||||||
"repo": "cargo2nix",
|
|
||||||
"rev": "7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15",
|
|
||||||
"sha256": "1z7xwk1hbp26aydsk3y07riy0ivwqss06n1470mvdl7allfcd1w5",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/tenx-tech/cargo2nix/archive/7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15.tar.gz",
|
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
|
||||||
},
|
|
||||||
"niv": {
|
|
||||||
"branch": "master",
|
|
||||||
"description": "Easy dependency management for Nix projects",
|
|
||||||
"homepage": "https://github.com/nmattia/niv",
|
|
||||||
"owner": "nmattia",
|
|
||||||
"repo": "niv",
|
|
||||||
"rev": "98c74a80934123cb4c3bf3314567f67311eb711a",
|
|
||||||
"sha256": "1w8n54hapd4x9f1am33icvngkqns7m3hl9yair38yqq08ffwg0kn",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
|
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"branch": "nixpkgs-unstable",
|
|
||||||
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
|
|
||||||
"homepage": "https://github.com/NixOS/nixpkgs",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs-channels",
|
|
||||||
"rev": "f6bfb371cba2b5a02f200c2747c1fe2c72bd782f",
|
|
||||||
"sha256": "0y3hlbyvznrpr1d2vxj2511hkjg733wdnxfaib3fgy9i9jr8ivzn",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs-channels/archive/f6bfb371cba2b5a02f200c2747c1fe2c72bd782f.tar.gz",
|
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
|
||||||
},
|
|
||||||
"nixpkgs-mozilla": {
|
|
||||||
"branch": "master",
|
|
||||||
"description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
|
|
||||||
"homepage": null,
|
|
||||||
"owner": "mozilla",
|
|
||||||
"repo": "nixpkgs-mozilla",
|
|
||||||
"rev": "e912ed483e980dfb4666ae0ed17845c4220e5e7c",
|
|
||||||
"sha256": "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed483e980dfb4666ae0ed17845c4220e5e7c.tar.gz",
|
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
134
nix/sources.nix
134
nix/sources.nix
@ -1,134 +0,0 @@
|
|||||||
# This file has been generated by Niv.
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
#
|
|
||||||
# The fetchers. fetch_<type> fetches specs of type <type>.
|
|
||||||
#
|
|
||||||
|
|
||||||
fetch_file = pkgs: spec:
|
|
||||||
if spec.builtin or true then
|
|
||||||
builtins_fetchurl { inherit (spec) url sha256; }
|
|
||||||
else
|
|
||||||
pkgs.fetchurl { inherit (spec) url sha256; };
|
|
||||||
|
|
||||||
fetch_tarball = pkgs: spec:
|
|
||||||
if spec.builtin or true then
|
|
||||||
builtins_fetchTarball { inherit (spec) url sha256; }
|
|
||||||
else
|
|
||||||
pkgs.fetchzip { inherit (spec) url sha256; };
|
|
||||||
|
|
||||||
fetch_git = spec:
|
|
||||||
builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
|
|
||||||
|
|
||||||
fetch_builtin-tarball = spec:
|
|
||||||
builtins.trace
|
|
||||||
''
|
|
||||||
WARNING:
|
|
||||||
The niv type "builtin-tarball" will soon be deprecated. You should
|
|
||||||
instead use `builtin = true`.
|
|
||||||
|
|
||||||
$ niv modify <package> -a type=tarball -a builtin=true
|
|
||||||
''
|
|
||||||
builtins_fetchTarball { inherit (spec) url sha256; };
|
|
||||||
|
|
||||||
fetch_builtin-url = spec:
|
|
||||||
builtins.trace
|
|
||||||
''
|
|
||||||
WARNING:
|
|
||||||
The niv type "builtin-url" will soon be deprecated. You should
|
|
||||||
instead use `builtin = true`.
|
|
||||||
|
|
||||||
$ niv modify <package> -a type=file -a builtin=true
|
|
||||||
''
|
|
||||||
(builtins_fetchurl { inherit (spec) url sha256; });
|
|
||||||
|
|
||||||
#
|
|
||||||
# Various helpers
|
|
||||||
#
|
|
||||||
|
|
||||||
# The set of packages used when specs are fetched using non-builtins.
|
|
||||||
mkPkgs = sources:
|
|
||||||
let
|
|
||||||
sourcesNixpkgs =
|
|
||||||
import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
|
|
||||||
hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
|
|
||||||
hasThisAsNixpkgsPath = <nixpkgs> == ./.;
|
|
||||||
in
|
|
||||||
if builtins.hasAttr "nixpkgs" sources
|
|
||||||
then sourcesNixpkgs
|
|
||||||
else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
|
|
||||||
import <nixpkgs> {}
|
|
||||||
else
|
|
||||||
abort
|
|
||||||
''
|
|
||||||
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
|
|
||||||
add a package called "nixpkgs" to your sources.json.
|
|
||||||
'';
|
|
||||||
|
|
||||||
# The actual fetching function.
|
|
||||||
fetch = pkgs: name: spec:
|
|
||||||
|
|
||||||
if ! builtins.hasAttr "type" spec then
|
|
||||||
abort "ERROR: niv spec ${name} does not have a 'type' attribute"
|
|
||||||
else if spec.type == "file" then fetch_file pkgs spec
|
|
||||||
else if spec.type == "tarball" then fetch_tarball pkgs spec
|
|
||||||
else if spec.type == "git" then fetch_git spec
|
|
||||||
else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
|
|
||||||
else if spec.type == "builtin-url" then fetch_builtin-url spec
|
|
||||||
else
|
|
||||||
abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
|
|
||||||
|
|
||||||
# Ports of functions for older nix versions
|
|
||||||
|
|
||||||
# a Nix version of mapAttrs if the built-in doesn't exist
|
|
||||||
mapAttrs = builtins.mapAttrs or (
|
|
||||||
f: set: with builtins;
|
|
||||||
listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
|
|
||||||
);
|
|
||||||
|
|
||||||
# fetchTarball version that is compatible between all the versions of Nix
|
|
||||||
builtins_fetchTarball = { url, sha256 }@attrs:
|
|
||||||
let
|
|
||||||
inherit (builtins) lessThan nixVersion fetchTarball;
|
|
||||||
in
|
|
||||||
if lessThan nixVersion "1.12" then
|
|
||||||
fetchTarball { inherit url; }
|
|
||||||
else
|
|
||||||
fetchTarball attrs;
|
|
||||||
|
|
||||||
# fetchurl version that is compatible between all the versions of Nix
|
|
||||||
builtins_fetchurl = { url, sha256 }@attrs:
|
|
||||||
let
|
|
||||||
inherit (builtins) lessThan nixVersion fetchurl;
|
|
||||||
in
|
|
||||||
if lessThan nixVersion "1.12" then
|
|
||||||
fetchurl { inherit url; }
|
|
||||||
else
|
|
||||||
fetchurl attrs;
|
|
||||||
|
|
||||||
# Create the final "sources" from the config
|
|
||||||
mkSources = config:
|
|
||||||
mapAttrs (
|
|
||||||
name: spec:
|
|
||||||
if builtins.hasAttr "outPath" spec
|
|
||||||
then abort
|
|
||||||
"The values in sources.json should not have an 'outPath' attribute"
|
|
||||||
else
|
|
||||||
spec // { outPath = fetch config.pkgs name spec; }
|
|
||||||
) config.sources;
|
|
||||||
|
|
||||||
# The "config" used by the fetchers
|
|
||||||
mkConfig =
|
|
||||||
{ sourcesFile ? ./sources.json
|
|
||||||
, sources ? builtins.fromJSON (builtins.readFile sourcesFile)
|
|
||||||
, pkgs ? mkPkgs sources
|
|
||||||
}: rec {
|
|
||||||
# The sources, i.e. the attribute set of spec name to spec
|
|
||||||
inherit sources;
|
|
||||||
|
|
||||||
# The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
|
|
||||||
inherit pkgs;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
|
|
||||||
@ -1 +1,8 @@
|
|||||||
with import ./. { }; shell
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
openssl
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|||||||
80
vm.nix
80
vm.nix
@ -1,80 +0,0 @@
|
|||||||
# Nix configuration for a VM to run a custom configured Vim
|
|
||||||
#
|
|
||||||
# It is intended as an example of building a VM that builds Vim for testing
|
|
||||||
# and evaluation purposes. It does not represent a production or secure
|
|
||||||
# deployment.
|
|
||||||
|
|
||||||
{ sources ? import ./nix/sources.nix
|
|
||||||
, pkgs ? import sources.nixpkgs { }
|
|
||||||
, callPackage ? pkgs.callPackage
|
|
||||||
, config
|
|
||||||
, lib
|
|
||||||
, ...
|
|
||||||
}:
|
|
||||||
# config, pkgs, lib, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
hoc = pkgs.callPackage ./default.nix { };
|
|
||||||
|
|
||||||
# hoc = cargoNix.rootCrate.build;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment = {
|
|
||||||
systemPackages = with pkgs; [
|
|
||||||
(
|
|
||||||
hoc
|
|
||||||
# import ./default.nix
|
|
||||||
)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
networking.hostName = "hoc"; # Define your hostname.
|
|
||||||
|
|
||||||
system.stateVersion = "19.09"; # The version of NixOS originally installed
|
|
||||||
|
|
||||||
# Set security options:
|
|
||||||
security = {
|
|
||||||
sudo = {
|
|
||||||
enable = true; # Enable sudo
|
|
||||||
wheelNeedsPassword = false; # Allow wheel members to run sudo without a passowrd
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
services.openssh = {
|
|
||||||
enable = true; # Enable the OpenSSH daemon.
|
|
||||||
#permitRootLogin = "yes"; # Probably want to change this in production
|
|
||||||
#challengeResponseAuthentication = true; # Probably want to change this in production
|
|
||||||
#passwordAuthentication = true; # Probably want to change this in production
|
|
||||||
openFirewall = true;
|
|
||||||
hostKeys = [
|
|
||||||
{
|
|
||||||
path = "/etc/ssh/ssh_host_ed25519_key"; # Generate a key for the vm
|
|
||||||
type = "ed25519"; # Use the current best key type
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Users of the Vim VM:
|
|
||||||
users.mutableUsers = false; # Remove any users not defined in here
|
|
||||||
|
|
||||||
users.users.root = {
|
|
||||||
password = "123456"; # Probably want to change this in production
|
|
||||||
};
|
|
||||||
|
|
||||||
# Misc groups:
|
|
||||||
users.groups.nixos.gid = 1000;
|
|
||||||
|
|
||||||
# NixOS users
|
|
||||||
users.users.nixos = {
|
|
||||||
isNormalUser = true;
|
|
||||||
uid = 1000;
|
|
||||||
group = "nixos";
|
|
||||||
extraGroups = [ "wheel" ];
|
|
||||||
password = "123456"; # Probably want to change this in production
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user