Merge remote-tracking branch 'cd/master'
This commit is contained in:
makefu
commit
49c00cf74f
15
Makefile
15
Makefile
|
|
@ -1,7 +1,8 @@
|
|||
#
|
||||
# usage:
|
||||
# make system=foo
|
||||
# make systems='foo bar'
|
||||
# make infest system=foo [target=bar]
|
||||
# make [deploy] system=foo [target=bar]
|
||||
# make [deploy] systems='foo bar'
|
||||
# make eval get=tv.wu.config.time.timeZone [filter=json]
|
||||
#
|
||||
|
||||
|
|
@ -11,6 +12,7 @@
|
|||
ifdef systems
|
||||
$(systems):
|
||||
@
|
||||
unset target
|
||||
parallel \
|
||||
--line-buffer \
|
||||
-j0 \
|
||||
|
|
@ -20,7 +22,7 @@ $(systems):
|
|||
else ifdef system
|
||||
.PHONY: deploy infest
|
||||
deploy infest:;@
|
||||
export get=$$LOGNAME.${system}.config.krebs.build.scripts.$@
|
||||
export get=krebs.$@
|
||||
export filter=json
|
||||
make -s eval | sh
|
||||
|
||||
|
|
@ -39,8 +41,11 @@ endif
|
|||
--eval \
|
||||
-A "$$get" \
|
||||
'<stockholm>' \
|
||||
--argstr user-name "$$LOGNAME" \
|
||||
--argstr host-name "$$HOSTNAME" \
|
||||
--argstr current-date "$$(date -Is)" \
|
||||
--argstr current-host-name "$$HOSTNAME" \
|
||||
--argstr current-user-name "$$LOGNAME" \
|
||||
$${system+--argstr system "$$system"} \
|
||||
$${target+--argstr target "$$target"} \
|
||||
| filter
|
||||
else
|
||||
$(error unbound variable: system[s])
|
||||
|
|
|
|||
40
default.nix
40
default.nix
|
|
@ -1,36 +1,34 @@
|
|||
{ user-name, host-name }:
|
||||
{ current-date
|
||||
, current-host-name
|
||||
, current-user-name
|
||||
}:
|
||||
|
||||
let
|
||||
lib = import <nixpkgs/lib>;
|
||||
|
||||
krebs-modules-path = ./krebs/3modules;
|
||||
krebs-pkgs-path = ./krebs/5pkgs;
|
||||
user-modules-path = ./. + "/${user-name}/3modules";
|
||||
user-pkgs-path = ./. + "/${user-name}/5pkgs";
|
||||
user-modules-path = ./. + "/${current-user-name}/3modules";
|
||||
user-pkgs-path = ./. + "/${current-user-name}/5pkgs";
|
||||
|
||||
out =
|
||||
(lib.mapAttrs (k: v: mk-namespace (./. + "/${k}"))
|
||||
(lib.filterAttrs
|
||||
(k: v: !lib.hasPrefix "." k && v == "directory" &&
|
||||
builtins.pathExists (./. + "/${k}/1systems"))
|
||||
(builtins.readDir ./.)));
|
||||
lib.mapAttrs (_: builtins.getAttr "main")
|
||||
(lib.filterAttrs (_: builtins.hasAttr "main")
|
||||
(lib.mapAttrs
|
||||
(k: v:
|
||||
if lib.hasPrefix "." k || v != "directory" then
|
||||
{}
|
||||
else if builtins.pathExists (./. + "/${k}/default.nix") then
|
||||
{ main = import (./. + "/${k}"); }
|
||||
else if builtins.pathExists (./. + "/${k}/1systems") then
|
||||
{ main = mk-namespace (./. + "/${k}"); }
|
||||
else
|
||||
{})
|
||||
(builtins.readDir ./.)));
|
||||
|
||||
eval = path: import <nixpkgs/nixos/lib/eval-config.nix> {
|
||||
system = builtins.currentSystem;
|
||||
modules = [
|
||||
({ config, ... }:
|
||||
with import ./krebs/4lib { inherit lib; };
|
||||
{
|
||||
options.krebs.exec.host = mkOption {
|
||||
type = types.host;
|
||||
default = config.krebs.hosts.${host-name};
|
||||
};
|
||||
options.krebs.exec.user = mkOption {
|
||||
type = types.user;
|
||||
default = config.krebs.users.${user-name};
|
||||
};
|
||||
}
|
||||
)
|
||||
path
|
||||
krebs-modules-path
|
||||
user-modules-path
|
||||
|
|
|
|||
72
krebs/3modules/build.nix
Normal file
72
krebs/3modules/build.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with import ../4lib { inherit lib; };
|
||||
|
||||
let
|
||||
target = config.krebs.build // { user.name = "root"; };
|
||||
|
||||
out = {
|
||||
# TODO deprecate krebs.build.host
|
||||
options.krebs.build.host = mkOption {
|
||||
type = types.host;
|
||||
};
|
||||
|
||||
# TODO make krebs.build.profile shell safe
|
||||
options.krebs.build.profile = mkOption {
|
||||
type = types.str;
|
||||
default = "/nix/var/nix/profiles/system";
|
||||
};
|
||||
|
||||
# TODO make krebs.build.target.host :: host
|
||||
options.krebs.build.target = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
# TODO deprecate krebs.build.user
|
||||
options.krebs.build.user = mkOption {
|
||||
type = types.user;
|
||||
};
|
||||
|
||||
options.krebs.build.source.dir = mkOption {
|
||||
type = types.attrsOf (types.submodule ({ config, ... }: {
|
||||
options = {
|
||||
host = mkOption {
|
||||
type = types.host;
|
||||
};
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
target-path = mkOption {
|
||||
type = types.str;
|
||||
default = "/root/${config._module.args.name}";
|
||||
};
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
default = "file://${config.host.name}${config.path}";
|
||||
};
|
||||
};
|
||||
}));
|
||||
default = {};
|
||||
};
|
||||
|
||||
options.krebs.build.source.git = mkOption {
|
||||
type = with types; attrsOf (submodule ({ config, ... }: {
|
||||
options = {
|
||||
url = mkOption {
|
||||
type = types.str; # TODO must be shell safe
|
||||
};
|
||||
rev = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
target-path = mkOption {
|
||||
type = types.str;
|
||||
default = "/root/${config._module.args.name}";
|
||||
};
|
||||
};
|
||||
}));
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
in out
|
||||
|
|
@ -1,309 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with import ../../4lib { inherit lib; };
|
||||
|
||||
let
|
||||
target = config.krebs.build // { user.name = "root"; };
|
||||
|
||||
out = {
|
||||
# TODO deprecate krebs.build.host
|
||||
options.krebs.build.host = mkOption {
|
||||
type = types.host;
|
||||
};
|
||||
|
||||
# TODO make krebs.build.profile shell safe
|
||||
options.krebs.build.profile = mkOption {
|
||||
type = types.str;
|
||||
default = "/nix/var/nix/profiles/system";
|
||||
};
|
||||
|
||||
# TODO make krebs.build.target.host :: host
|
||||
options.krebs.build.target = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
# TODO deprecate krebs.build.user
|
||||
options.krebs.build.user = mkOption {
|
||||
type = types.user;
|
||||
};
|
||||
|
||||
options.krebs.build.scripts.init = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default =
|
||||
let
|
||||
inherit (config.krebs.build) host;
|
||||
in
|
||||
''
|
||||
#! /bin/sh
|
||||
set -efu
|
||||
|
||||
hostname=${host.name}
|
||||
secrets_dir=${config.krebs.build.source.dir.secrets.path}
|
||||
key_type=ed25519
|
||||
key_file=$secrets_dir/ssh.id_$key_type
|
||||
key_comment=$hostname
|
||||
|
||||
if test -e "$key_file"; then
|
||||
echo "Warning: privkey already exists: $key_file" >&2
|
||||
else
|
||||
ssh-keygen \
|
||||
-C "$key_comment" \
|
||||
-t "$key_type" \
|
||||
-f "$key_file" \
|
||||
-N ""
|
||||
rm "$key_file.pub"
|
||||
fi
|
||||
|
||||
pubkey=$(ssh-keygen -y -f "$key_file")
|
||||
|
||||
cat<<EOF
|
||||
# put following into config.krebs.hosts.$hostname:
|
||||
ssh.pubkey = $(echo $pubkey | jq -R .);
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
|
||||
options.krebs.build.scripts.deploy = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = ''
|
||||
set -efu
|
||||
(${config.krebs.build.scripts._source})
|
||||
${ssh-target ''
|
||||
${config.krebs.build.scripts._nix-env}
|
||||
${config.krebs.build.profile}/bin/switch-to-configuration switch
|
||||
''}
|
||||
echo OK
|
||||
'';
|
||||
};
|
||||
|
||||
options.krebs.build.scripts.infest = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = ''
|
||||
set -efu
|
||||
|
||||
export RSYNC_RSH; RSYNC_RSH="$(type -p ssh) \
|
||||
-o 'HostName ${target.host.infest.addr}' \
|
||||
-o 'Port ${toString target.host.infest.port}' \
|
||||
"
|
||||
ssh() {
|
||||
eval "$RSYNC_RSH \"\$@\""
|
||||
}
|
||||
|
||||
${ssh-target ''
|
||||
${readFile ./infest/prepare.sh}
|
||||
${readFile ./infest/install-nix.sh}
|
||||
''}
|
||||
|
||||
(${config.krebs.build.scripts._source})
|
||||
|
||||
${ssh-target ''
|
||||
export PATH; PATH=/root/.nix-profile/bin:$PATH
|
||||
|
||||
src=$(type -p nixos-install)
|
||||
cat_src() {
|
||||
sed < "$src" "$(
|
||||
{ sed < "$src" -n '
|
||||
/^if ! test -e "\$mountPoint\/\$NIXOS_CONFIG/,/^fi$/=
|
||||
/^nixpkgs=/=
|
||||
/^NIX_PATH=/,/^$/{/./=}
|
||||
|
||||
# Disable: Copy the NixOS/Nixpkgs sources to the target as
|
||||
# the initial contents of the NixOS channel.
|
||||
/^srcs=/,/^ln -sfn /=
|
||||
'
|
||||
} | sed 's:$:s/^/#krebs#/:'
|
||||
)"
|
||||
}
|
||||
|
||||
# Location to insert config.krebs.build.scripts._nix-env
|
||||
i=$(sed -n '/^echo "building the system configuration/=' "$src")
|
||||
|
||||
{
|
||||
cat_src | sed -n "1,$i{p}"
|
||||
cat ${doc config.krebs.build.scripts._nix-env}
|
||||
cat_src | sed -n "$i,\''${$i!p}"
|
||||
} > nixos-install
|
||||
chmod +x nixos-install
|
||||
|
||||
# Wrap inserted config.krebs.build.scripts._nix-env into chroot.
|
||||
nix_env=$(cat_src | sed -n '
|
||||
s:.*\(/nix/store/[a-z0-9]*-nix-[0-9.]\+/bin/nix-env\).*:\1:p;T;q
|
||||
')
|
||||
echo nix-env is $nix_env
|
||||
sed -i '
|
||||
s:^nix-env:chroot $mountPoint '"$nix_env"':
|
||||
' nixos-install
|
||||
|
||||
./nixos-install
|
||||
|
||||
${readFile ./infest/finalize.sh}
|
||||
''}
|
||||
'';
|
||||
};
|
||||
|
||||
options.krebs.build.scripts._nix-env = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = ''
|
||||
set -efu
|
||||
NIX_PATH=${config.krebs.build.source.NIX_PATH} \
|
||||
nix-env \
|
||||
-f '<stockholm>' \
|
||||
-Q \
|
||||
--argstr user-name ${config.krebs.exec.user.name} \
|
||||
--argstr host-name ${target.host.name} \
|
||||
--profile ${config.krebs.build.profile} \
|
||||
--set \
|
||||
-A ${lib.escapeShellArg (lib.concatStringsSep "." [
|
||||
config.krebs.build.user.name
|
||||
config.krebs.build.host.name
|
||||
"system"
|
||||
])}
|
||||
'';
|
||||
};
|
||||
|
||||
options.krebs.build.scripts._source = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = ''
|
||||
set -efu
|
||||
${
|
||||
lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList
|
||||
(name: { scripts, url, ... }: "(${scripts._source})")
|
||||
(config.krebs.build.source.dir //
|
||||
config.krebs.build.source.git))
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
options.krebs.build.source.NIX_PATH = mkOption {
|
||||
type = types.str;
|
||||
default =
|
||||
lib.concatStringsSep ":"
|
||||
(lib.mapAttrsToList (name: _: "${name}=/root/${name}")
|
||||
(config.krebs.build.source.dir //
|
||||
config.krebs.build.source.git));
|
||||
};
|
||||
|
||||
options.krebs.build.source.dir = mkOption {
|
||||
type =
|
||||
let
|
||||
exec = config.krebs.exec;
|
||||
in
|
||||
types.attrsOf (types.submodule ({ config, ... }:
|
||||
let
|
||||
url = "file://${config.host.name}${config.path}";
|
||||
|
||||
can-link = config.host.name == target.host.name;
|
||||
can-push = config.host.name == exec.host.name;
|
||||
|
||||
push-method = ''
|
||||
rsync \
|
||||
--exclude .git \
|
||||
--exclude .graveyard \
|
||||
--exclude old \
|
||||
--exclude tmp \
|
||||
--rsync-path='mkdir -p ${config.target-path} && rsync' \
|
||||
--delete-excluded \
|
||||
-vrLptgoD \
|
||||
${config.path}/ \
|
||||
${target.user.name}@${target.host.name}:${config.target-path}
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
host = mkOption {
|
||||
type = types.host;
|
||||
description = ''
|
||||
define the host where the directory is stored on.
|
||||
XXX: currently it is just used to check if rsync is working,
|
||||
becomes part of url
|
||||
'';
|
||||
};
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
scripts._source = mkOption {
|
||||
type = types.str;
|
||||
default =
|
||||
#if can-link then link-method else
|
||||
if can-push then push-method else
|
||||
throw "cannot source ${url}";
|
||||
};
|
||||
target-path = mkOption {
|
||||
type = types.str;
|
||||
default = "/root/${config._module.args.name}";
|
||||
};
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
default = "file://${config.host.name}${config.path}";
|
||||
};
|
||||
};
|
||||
}
|
||||
));
|
||||
default = {};
|
||||
};
|
||||
|
||||
options.krebs.build.source.git = mkOption {
|
||||
type =
|
||||
let
|
||||
target = config.krebs.build // { user.name = "root"; };
|
||||
in
|
||||
with types; attrsOf (submodule ({ config, ... }:
|
||||
{
|
||||
options = {
|
||||
url = mkOption {
|
||||
type = types.str; # TODO must be shell safe
|
||||
};
|
||||
rev = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
scripts._source = mkOption {
|
||||
type = types.str;
|
||||
default = ssh-target ''
|
||||
mkdir -p ${config.target-path}
|
||||
cd ${config.target-path}
|
||||
if ! test -e .git; then
|
||||
git init
|
||||
fi
|
||||
if ! cur_url=$(git config remote.origin.url 2>/dev/null); then
|
||||
git remote add origin ${config.url}
|
||||
elif test "$cur_url" != ${config.url}; then
|
||||
git remote set-url origin ${config.url}
|
||||
fi
|
||||
if test "$(git rev-parse --verify HEAD 2>/dev/null)" != ${config.rev}; then
|
||||
git fetch origin
|
||||
git checkout ${config.rev} -- .
|
||||
git checkout -q ${config.rev}
|
||||
git submodule init
|
||||
git submodule update
|
||||
fi
|
||||
git clean -dxf
|
||||
'';
|
||||
};
|
||||
target-path = mkOption {
|
||||
type = types.str;
|
||||
default = "/root/${config._module.args.name}";
|
||||
};
|
||||
};
|
||||
}
|
||||
));
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
doc = s:
|
||||
let b = "EOF${hashString "sha256" s}"; in
|
||||
''
|
||||
<<\${b}
|
||||
${s}
|
||||
${b}
|
||||
'';
|
||||
|
||||
ssh-target = script:
|
||||
"ssh root@${target.host.name} -T ${doc ''
|
||||
set -efu
|
||||
${script}
|
||||
''}";
|
||||
|
||||
in out
|
||||
|
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
out = {
|
||||
imports = [
|
||||
./build
|
||||
./build.nix
|
||||
./exim-retiolum.nix
|
||||
./exim-smarthost.nix
|
||||
./github-hosts-sync.nix
|
||||
|
|
@ -143,7 +143,7 @@ let
|
|||
dc = "lass"; #dc = "cac";
|
||||
nets = rec {
|
||||
internet = {
|
||||
addrs4 = ["162.248.8.63"];
|
||||
addrs4 = ["104.233.84.57"];
|
||||
aliases = [
|
||||
"echelon.internet"
|
||||
];
|
||||
|
|
@ -158,12 +158,42 @@ let
|
|||
];
|
||||
tinc.pubkey = ''
|
||||
-----BEGIN RSA PUBLIC KEY-----
|
||||
MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78
|
||||
DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A
|
||||
IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K
|
||||
N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t
|
||||
cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq
|
||||
UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB
|
||||
MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ
|
||||
oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX
|
||||
MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f
|
||||
4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA
|
||||
n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p
|
||||
do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB
|
||||
-----END RSA PUBLIC KEY-----
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
fastpoke = {
|
||||
dc = "lass"; #dc = "cac";
|
||||
nets = rec {
|
||||
internet = {
|
||||
addrs4 = ["193.22.164.36"];
|
||||
aliases = [
|
||||
"fastpoke.internet"
|
||||
];
|
||||
};
|
||||
retiolum = {
|
||||
via = internet;
|
||||
addrs4 = ["10.243.253.152"];
|
||||
addrs6 = ["42:422a:194f:ff3b:e196:2f82:5cf5:bc00"];
|
||||
aliases = [
|
||||
"fastpoke.retiolum"
|
||||
"cgit.fastpoke.retiolum"
|
||||
];
|
||||
tinc.pubkey = ''
|
||||
-----BEGIN RSA PUBLIC KEY-----
|
||||
MIIBCgKCAQEAs4p5xsQYx06v+OkUbc09K6voFAbkvO66QdFoM71E10XyCeLP6iuq
|
||||
DaIOFN4GrPR36pgyjqtJ+62G9uR+WsB/y14eio1p1ivDWgcpt5soOZAH5zVRRD9O
|
||||
FBDlgVNwIJ6stMHy6OenEKWsfEiZRN3XstnqAqyykzjddglth1tJntn6kbZehzNQ
|
||||
ezfIyN4XgaX2fhSu+UnAyLcV8wWnF9cMABjz7eKcSmRJgtG4ZiuDkbgiiEew7+pB
|
||||
EPqOVQ80lJvzQKgO4PmVoAjD9A+AHnmLJNPDQQi8nIVilGCT60IX+XT1rt85Zpdy
|
||||
rEaeriw/qsVJnberAhDAdQYYuM1ai2H5swIDAQAB
|
||||
-----END RSA PUBLIC KEY-----
|
||||
'';
|
||||
};
|
||||
|
|
@ -568,10 +598,9 @@ let
|
|||
mkdir = rec {
|
||||
cores = 1;
|
||||
dc = "tv"; #dc = "cac";
|
||||
infest.addr = head nets.internet.addrs4;
|
||||
nets = rec {
|
||||
internet = {
|
||||
addrs4 = ["104.233.84.173"];
|
||||
addrs4 = ["104.233.84.215"];
|
||||
aliases = [
|
||||
"mkdir.internet"
|
||||
];
|
||||
|
|
@ -655,7 +684,6 @@ let
|
|||
rmdir = rec {
|
||||
cores = 1;
|
||||
dc = "tv"; #dc = "cac";
|
||||
infest.addr = head nets.internet.addrs4;
|
||||
nets = rec {
|
||||
internet = {
|
||||
addrs4 = ["104.233.84.70"];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ with lib;
|
|||
rec {
|
||||
escape =
|
||||
let
|
||||
isSafeChar = c: match "[-./0-9_a-zA-Z]" c != null;
|
||||
isSafeChar = c: match "[-+./0-9:=A-Z_a-z]" c != null;
|
||||
in
|
||||
stringAsChars (c:
|
||||
if isSafeChar c then c
|
||||
|
|
|
|||
|
|
@ -31,10 +31,13 @@ types // rec {
|
|||
infest = {
|
||||
addr = mkOption {
|
||||
type = str;
|
||||
apply = trace "Obsolete option `krebs.hosts.${config.name}.infest.addr' is used. It was replaced by the `target' argument to `make` or `get`. See Makefile for more information.";
|
||||
};
|
||||
port = mkOption {
|
||||
type = int;
|
||||
default = 22;
|
||||
# TODO replacement: allow target with port, SSH-style: [lol]:666
|
||||
apply = trace "Obsolete option `krebs.hosts.${config.name}.infest.port' is used. It's gone without replacement.";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "get-1.1.1";
|
||||
name = "get-1.3.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = http://cgit.cd.retiolum/get;
|
||||
rev = "e64826a4f5f74cbaa895e538b97d0e523e9709f9";
|
||||
sha256 = "4d1aa07bba52f697cf7aa7ad1b02b9ff41598dfea83c578e77b8d81e3e8830d2";
|
||||
rev = "fbe8f8d12ede9762fceb15b9944b69a4ee6331eb";
|
||||
sha256 = "bcdf036f8b5d1467285d0998aeac7e48280adfb9e1278f9f424c9c8b5e6ed8fa";
|
||||
};
|
||||
|
||||
phases = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Address = 167.88.34.190
|
||||
Address = 104.167.113.104
|
||||
Subnet = 10.243.206.102
|
||||
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f762
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Address = 168.235.156.81
|
||||
Address = 104.233.84.57
|
||||
Subnet = 10.243.206.103
|
||||
Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f763
|
||||
|
||||
-----BEGIN RSA PUBLIC KEY-----
|
||||
MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78
|
||||
DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A
|
||||
IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K
|
||||
N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t
|
||||
cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq
|
||||
UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB
|
||||
MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ
|
||||
oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX
|
||||
MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f
|
||||
4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA
|
||||
n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p
|
||||
do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB
|
||||
-----END RSA PUBLIC KEY-----
|
||||
|
|
|
|||
263
krebs/default.nix
Normal file
263
krebs/default.nix
Normal file
|
|
@ -0,0 +1,263 @@
|
|||
{ current-date
|
||||
, current-host-name
|
||||
, current-user-name
|
||||
}@current: rec {
|
||||
|
||||
deploy =
|
||||
{ system ? current-host-name
|
||||
, target ? system
|
||||
}@args: let
|
||||
config = lib.get-config system;
|
||||
in ''
|
||||
#! /bin/sh
|
||||
# ${current-date} ${current-user-name}@${current-host-name}
|
||||
# krebs.deploy
|
||||
set -efu
|
||||
(${lib.populate args})
|
||||
${lib.rootssh target ''
|
||||
${lib.install args}
|
||||
${config.krebs.build.profile}/bin/switch-to-configuration switch
|
||||
''}
|
||||
echo OK
|
||||
'';
|
||||
|
||||
infest =
|
||||
{ system ? current-host-name
|
||||
, target ? system
|
||||
}@args: let
|
||||
in ''
|
||||
#! /bin/sh
|
||||
# ${current-date} ${current-user-name}@${current-host-name}
|
||||
# krebs.infest
|
||||
set -efu
|
||||
|
||||
# XXX type -p is non-standard
|
||||
#export RSYNC_RSH; RSYNC_RSH="$(type -p ssh) \
|
||||
# -o 'HostName $ {target.host.infest.addr}' \
|
||||
# -o 'Port $ {toString target.host.infest.port}' \
|
||||
#"
|
||||
#ssh() {
|
||||
# eval "$RSYNC_RSH \"\$@\""
|
||||
#}
|
||||
|
||||
${lib.rootssh target ''
|
||||
${builtins.readFile ./4lib/infest/prepare.sh}
|
||||
${builtins.readFile ./4lib/infest/install-nix.sh}
|
||||
''}
|
||||
|
||||
(${lib.populate args})
|
||||
|
||||
${lib.rootssh target ''
|
||||
export PATH; PATH=/root/.nix-profile/bin:$PATH
|
||||
|
||||
src=$(type -p nixos-install)
|
||||
cat_src() {
|
||||
sed < "$src" "$(
|
||||
{ sed < "$src" -n '
|
||||
/^if ! test -e "\$mountPoint\/\$NIXOS_CONFIG/,/^fi$/=
|
||||
/^nixpkgs=/=
|
||||
/^NIX_PATH=/,/^$/{/./=}
|
||||
|
||||
# Disable: Copy the NixOS/Nixpkgs sources to the target as
|
||||
# the initial contents of the NixOS channel.
|
||||
/^srcs=/,/^ln -sfn /=
|
||||
'
|
||||
} | sed 's:$:s/^/#krebs#/:'
|
||||
)"
|
||||
}
|
||||
|
||||
# Location to insert lib.install
|
||||
i=$(sed -n '/^echo "building the system configuration/=' "$src")
|
||||
|
||||
{
|
||||
cat_src | sed -n "1,$i{p}"
|
||||
cat ${lib.doc (lib.install args)}
|
||||
cat_src | sed -n "$i,\''${$i!p}"
|
||||
} > nixos-install
|
||||
chmod +x nixos-install
|
||||
|
||||
## Wrap inserted lib.install into chroot.
|
||||
#nix_env=$(cat_src | sed -n '
|
||||
# s:.*\(/nix/store/[a-z0-9]*-nix-[0-9.]\+/bin/nix-env\).*:\1:p;T;q
|
||||
#')
|
||||
#echo nix-env is $nix_env
|
||||
#sed -i '
|
||||
# s:^nix-env:chroot $mountPoint '"$nix_env"':
|
||||
#' nixos-install
|
||||
|
||||
./nixos-install
|
||||
|
||||
${builtins.readFile ./4lib/infest/finalize.sh}
|
||||
''}
|
||||
'';
|
||||
|
||||
init =
|
||||
{ system ? current-host-name
|
||||
}@args: let
|
||||
config = lib.get-config system;
|
||||
in ''
|
||||
#! /bin/sh
|
||||
# ${current-date} ${current-user-name}@${current-host-name}
|
||||
# krebs.init
|
||||
set -efu
|
||||
|
||||
system=${lib.shell.escape system}
|
||||
secrets_dir=${config.krebs.build.source.dir.secrets.path}
|
||||
key_type=ed25519
|
||||
key_file=$secrets_dir/ssh.id_$key_type
|
||||
key_comment=$system
|
||||
|
||||
if test -e "$key_file"; then
|
||||
echo "Warning: privkey already exists: $key_file" >&2
|
||||
else
|
||||
ssh-keygen \
|
||||
-C "$key_comment" \
|
||||
-t "$key_type" \
|
||||
-f "$key_file" \
|
||||
-N ""
|
||||
rm "$key_file.pub"
|
||||
fi
|
||||
|
||||
pubkey=$(ssh-keygen -y -f "$key_file")
|
||||
|
||||
cat<<EOF
|
||||
# put following into config.krebs.hosts.$system:
|
||||
ssh.pubkey = $(echo $pubkey | jq -R .);
|
||||
EOF
|
||||
'';
|
||||
|
||||
lib = import ./4lib { lib = import <nixpkgs/lib>; } // rec {
|
||||
|
||||
stockholm = import ../. current;
|
||||
|
||||
get-config = system:
|
||||
stockholm.${current-user-name}.${system}.config
|
||||
or (abort "unknown system: ${system}");
|
||||
|
||||
doc = s:
|
||||
let b = "EOF${builtins.hashString "sha256" s}"; in
|
||||
''
|
||||
<<\${b}
|
||||
${s}
|
||||
${b}
|
||||
'';
|
||||
|
||||
rootssh = target: script:
|
||||
"ssh root@${target} -T ${lib.doc ''
|
||||
set -efu
|
||||
${script}
|
||||
''}";
|
||||
|
||||
install =
|
||||
{ system ? current-host-name
|
||||
, target ? system
|
||||
}:
|
||||
let
|
||||
stockholm = import ../. {
|
||||
inherit current-date;
|
||||
inherit current-host-name;
|
||||
inherit current-user-name;
|
||||
};
|
||||
|
||||
config = stockholm.${current-user-name}.${system}.config
|
||||
or (abort "unknown system: ${system}");
|
||||
|
||||
nix-path =
|
||||
lib.concatStringsSep ":"
|
||||
(lib.mapAttrsToList (name: _: "${name}=/root/${name}")
|
||||
(config.krebs.build.source.dir //
|
||||
config.krebs.build.source.git));
|
||||
in ''
|
||||
set -efu
|
||||
NIX_PATH=${lib.shell.escape nix-path} \
|
||||
nix-env \
|
||||
--show-trace \
|
||||
-f '<stockholm>' \
|
||||
-Q \
|
||||
--argstr current-date ${lib.shell.escape current-date} \
|
||||
--argstr current-host-name ${lib.shell.escape current-host-name} \
|
||||
--argstr current-user-name ${lib.shell.escape current-user-name} \
|
||||
--profile ${lib.shell.escape config.krebs.build.profile} \
|
||||
--set \
|
||||
-A ${lib.escapeShellArg (lib.concatStringsSep "." [
|
||||
config.krebs.build.user.name
|
||||
config.krebs.build.host.name
|
||||
"system"
|
||||
])}
|
||||
'';
|
||||
|
||||
populate =
|
||||
{ system ? current-host-name
|
||||
, target ? system
|
||||
}@args:
|
||||
let out = ''
|
||||
#! /bin/sh
|
||||
# ${current-date} ${current-user-name}@${current-host-name}
|
||||
set -efu
|
||||
${lib.concatStringsSep "\n"
|
||||
(lib.concatMap
|
||||
(type: lib.mapAttrsToList (_: methods.${type})
|
||||
config.krebs.build.source.${type})
|
||||
["dir" "git"])}
|
||||
'';
|
||||
|
||||
stockholm = import ../. {
|
||||
inherit current-date;
|
||||
inherit current-host-name;
|
||||
inherit current-user-name;
|
||||
};
|
||||
|
||||
config = stockholm.${current-user-name}.${system}.config
|
||||
or (abort "unknown system: ${system}");
|
||||
|
||||
current-host = config.krebs.hosts.${current-host-name};
|
||||
current-user = config.krebs.users.${current-user-name};
|
||||
|
||||
target-host = config.krebs.hosts.${system};
|
||||
|
||||
methods.dir = config:
|
||||
let
|
||||
can-link = config.host.name == target-host.name;
|
||||
can-push = config.host.name == current-host.name;
|
||||
push-method = ''
|
||||
rsync \
|
||||
--exclude .git \
|
||||
--exclude .graveyard \
|
||||
--exclude old \
|
||||
--exclude tmp \
|
||||
--rsync-path='mkdir -p ${config.target-path} && rsync' \
|
||||
--delete-excluded \
|
||||
-vrLptgoD \
|
||||
${config.path}/ \
|
||||
root@${target}:${config.target-path}
|
||||
'';
|
||||
url = "file://${config.host.name}${config.path}";
|
||||
in
|
||||
#if can-link then link-method else
|
||||
if can-push then push-method else
|
||||
throw "cannot source ${url}";
|
||||
|
||||
methods.git = config:
|
||||
lib.rootssh target ''
|
||||
mkdir -p ${config.target-path}
|
||||
cd ${config.target-path}
|
||||
if ! test -e .git; then
|
||||
git init
|
||||
fi
|
||||
if ! cur_url=$(git config remote.origin.url 2>/dev/null); then
|
||||
git remote add origin ${config.url}
|
||||
elif test "$cur_url" != ${config.url}; then
|
||||
git remote set-url origin ${config.url}
|
||||
fi
|
||||
if test "$(git rev-parse --verify HEAD 2>/dev/null)" != ${config.rev}; then
|
||||
git fetch origin
|
||||
git checkout ${config.rev} -- .
|
||||
git checkout -q ${config.rev}
|
||||
git submodule init
|
||||
git submodule update
|
||||
fi
|
||||
git clean -dxf
|
||||
'';
|
||||
in out;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,14 +25,15 @@
|
|||
|
||||
krebs.build = {
|
||||
user = config.krebs.users.lass;
|
||||
target = "root@cloudkrebs";
|
||||
host = config.krebs.hosts.cloudkrebs;
|
||||
deps = {
|
||||
secrets = {
|
||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
source = {
|
||||
dir.secrets = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
};
|
||||
stockholm = {
|
||||
url = toString ../..;
|
||||
dir.stockholm = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/dev/stockholm";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,14 +28,15 @@ in {
|
|||
|
||||
krebs.build = {
|
||||
user = config.krebs.users.lass;
|
||||
target = "root@${ip}";
|
||||
host = config.krebs.hosts.echelon;
|
||||
deps = {
|
||||
secrets = {
|
||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
source = {
|
||||
dir.secrets = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
};
|
||||
stockholm = {
|
||||
url = toString ../..;
|
||||
dir.stockholm = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/dev/stockholm";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,18 +22,20 @@
|
|||
../2configs/retiolum.nix
|
||||
../2configs/wordpress.nix
|
||||
../2configs/bitlbee.nix
|
||||
../2configs/firefoxPatched.nix
|
||||
];
|
||||
|
||||
krebs.build = {
|
||||
user = config.krebs.users.lass;
|
||||
target = "root@mors";
|
||||
host = config.krebs.hosts.mors;
|
||||
deps = {
|
||||
secrets = {
|
||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
source = {
|
||||
dir.secrets = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
};
|
||||
stockholm = {
|
||||
url = toString ../..;
|
||||
dir.stockholm = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/dev/stockholm";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -172,6 +174,7 @@
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
cac
|
||||
get
|
||||
];
|
||||
|
||||
#TODO: fix this shit
|
||||
|
|
|
|||
|
|
@ -27,12 +27,14 @@ with builtins;
|
|||
user = config.krebs.users.lass;
|
||||
target = "root@uriel";
|
||||
host = config.krebs.hosts.uriel;
|
||||
deps = {
|
||||
secrets = {
|
||||
url = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
source = {
|
||||
dir.secrets = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/secrets/${config.krebs.build.host.name}";
|
||||
};
|
||||
stockholm = {
|
||||
url = toString ../..;
|
||||
dir.stockholm = {
|
||||
host = config.krebs.hosts.mors;
|
||||
path = "/home/lass/dev/stockholm";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,9 +42,11 @@ with lib;
|
|||
enable = true;
|
||||
search-domain = "retiolum";
|
||||
exim-retiolum.enable = true;
|
||||
build.deps.nixpkgs = {
|
||||
url = https://github.com/Lassulus/nixpkgs;
|
||||
rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
|
||||
build.source = {
|
||||
git.nixpkgs = {
|
||||
url = https://github.com/Lassulus/nixpkgs;
|
||||
rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in {
|
|||
imports = [
|
||||
../3modules/per-user.nix
|
||||
] ++ [
|
||||
( createFirefoxUser "ff" [ "audio" ] [ pkgs.firefox ] )
|
||||
( createFirefoxUser "ff" [ "audio" ] [ ] )
|
||||
( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
|
||||
( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
|
||||
( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
|
||||
|
|
|
|||
|
|
@ -61,4 +61,8 @@ in {
|
|||
xkbOptions = "caps:backspace";
|
||||
};
|
||||
|
||||
services.logind.extraConfig = ''
|
||||
HandleLidSwitch=ignore
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
|
|||
58
lass/2configs/firefoxPatched.nix
Normal file
58
lass/2configs/firefoxPatched.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
lpkgs = import ../5pkgs { inherit pkgs; };
|
||||
|
||||
inherit (lib)
|
||||
concatMapStrings
|
||||
;
|
||||
|
||||
plugins = with lpkgs.firefoxPlugins; [
|
||||
noscript
|
||||
ublock
|
||||
vimperator
|
||||
];
|
||||
|
||||
copyXpi = plugin:
|
||||
"cp ${plugin}/*.xpi $out/usr/lib/firefox-*/browser/extensions/";
|
||||
|
||||
preferences = pkgs.writeText "autoload.js" ''
|
||||
pref('general.config.filename', 'firefox.cfg');
|
||||
pref('general.config.obscure_value', 0);
|
||||
'';
|
||||
|
||||
config = pkgs.writeText "firefox.cfg" ''
|
||||
//
|
||||
lockPref("app.update.enabled", false);
|
||||
lockPref("extensions.update.enabled", false);
|
||||
lockPref("autoadmin.global_config_url", "");
|
||||
lockPref("extensions.checkUpdateSecurity", false);
|
||||
lockPref("services.sync.enabled", false);
|
||||
lockPref("browser.shell.checkDefaultBrowser", false);
|
||||
lockPref("layout.spellcheckDefault", 0);
|
||||
lockPref("app.update.auto", false);
|
||||
lockPref("browser.newtabpage.enabled", false);
|
||||
lockPref("noscript.firstRunRedirection", false);
|
||||
lockPref("noscript.hoverUI", false);
|
||||
lockPref("noscript.notify", false);
|
||||
defaultPref("extensions.newAddons", false);
|
||||
defaultPref("extensions.autoDisableScopes", 0);
|
||||
defaultPref("plugin.scan.plid.all", false);
|
||||
'';
|
||||
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
(pkgs.lib.overrideDerivation pkgs.firefox-bin (original : {
|
||||
installPhase = ''
|
||||
${original.installPhase}
|
||||
find $out/usr/lib
|
||||
${concatMapStrings copyXpi plugins}
|
||||
cd $out/usr/lib/firefox-*/
|
||||
mkdir -p browser/defaults/preferences
|
||||
cp ${preferences} browser/defaults/preferences/autoload.js
|
||||
cp ${config} ./firefox.cfg
|
||||
'';
|
||||
}))
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
gnupg1compat
|
||||
htop
|
||||
i3lock
|
||||
mc
|
||||
mosh
|
||||
mpv
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
connectTo = [
|
||||
"fastpoke"
|
||||
"cloudkrebs"
|
||||
"echelon"
|
||||
"pigstarter"
|
||||
"gum"
|
||||
"flap"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
texLive
|
||||
(texLiveAggregationFun { paths = [
|
||||
texLive
|
||||
texLiveExtra
|
||||
texLiveCMSuper
|
||||
texLiveModerncv
|
||||
];})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
#exports
|
||||
export EDITOR='vim'
|
||||
export MANPAGER='most'
|
||||
export PAGER='vim -'
|
||||
export PAGER='vim -R -'
|
||||
# export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
|
||||
|
||||
#beautiful colors
|
||||
|
|
@ -103,23 +103,21 @@
|
|||
|
||||
case $UID in
|
||||
0)
|
||||
username='%F{red}root%f'
|
||||
username='%F{red}root%f '
|
||||
;;
|
||||
1337)
|
||||
username=""
|
||||
;;
|
||||
*)
|
||||
username='%F{blue}%n%f'
|
||||
username='%F{blue}%n%f '
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -n "$SSH_CLIENT"; then
|
||||
PROMPT="$error$username@%F{magenta}%M%f %~ "
|
||||
else
|
||||
PROMPT="$error$username %~ "
|
||||
PROMPT="$error$username%~ "
|
||||
fi
|
||||
|
||||
|
||||
'';
|
||||
};
|
||||
users.defaultUserShell = "/run/current-system/sw/bin/zsh";
|
||||
|
|
|
|||
|
|
@ -8,4 +8,9 @@ rec {
|
|||
bitlbee-dev = callPackage ./bitlbee-dev.nix {};
|
||||
bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
|
||||
bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
|
||||
firefoxPlugins = {
|
||||
noscript = callPackage ./firefoxPlugins/noscript.nix {};
|
||||
ublock = callPackage ./firefoxPlugins/ublock.nix {};
|
||||
vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
lass/5pkgs/firefoxPlugins/noscript.nix
Normal file
28
lass/5pkgs/firefoxPlugins/noscript.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ fetchgit, stdenv, bash, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "noscript";
|
||||
id = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/avian2/noscript";
|
||||
rev = "c900a079793868bb080ab1e23522d29dc121b4c6";
|
||||
sha256 = "1y06gh5a622yrsx0h7v92qnvdi97i54ln09zc1lvk8x430z5bdly";
|
||||
};
|
||||
|
||||
buildInputs = [ zip ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace "version.sh" \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
./makexpi.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/
|
||||
cp *.xpi $out/${id}.xpi
|
||||
'';
|
||||
}
|
||||
31
lass/5pkgs/firefoxPlugins/ublock.nix
Normal file
31
lass/5pkgs/firefoxPlugins/ublock.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ fetchgit, stdenv, bash, python, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ublock";
|
||||
id = "{2b10c1c8-a11f-4bad-fe9c-1c11e82cac42}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/chrisaljoudi/uBlock";
|
||||
rev = "a70a50052a7914cbf86d46a725812b98434d8c70";
|
||||
sha256 = "1qfzy79f8x01i33x0m95k833z1jgxjwb8wvlr6fj6id1kxfvzh77";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
zip
|
||||
python
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace "tools/make-firefox.sh" \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
tools/make-firefox.sh all
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/
|
||||
cp dist/build/uBlock.firefox.xpi $out/${id}.xpi
|
||||
'';
|
||||
}
|
||||
19
lass/5pkgs/firefoxPlugins/vimperator.nix
Normal file
19
lass/5pkgs/firefoxPlugins/vimperator.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ fetchgit, stdenv, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vimperator";
|
||||
id = "vimperator@mozdev.org";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vimperator/vimperator-labs.git";
|
||||
rev = "ba7d8e72516fdc22246748c8183d7bc90f6fb073";
|
||||
sha256 = "0drz67qm5hxxzw699rswlpjkg4p2lfipx119pk1nyixrqblcsvq2";
|
||||
};
|
||||
|
||||
buildInputs = [ zip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/
|
||||
cp downloads/vimperator*.xpi $out/${id}.xpi
|
||||
'';
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ with lib;
|
|||
krebs.build.source = {
|
||||
git.nixpkgs = {
|
||||
url = https://github.com/NixOS/nixpkgs;
|
||||
rev = "bd84ebaa1e0359f41350e053ed24592b169b5714";
|
||||
rev = "e916273209560b302ab231606babf5ce1c481f08";
|
||||
};
|
||||
dir.secrets = {
|
||||
host = config.krebs.hosts.wu;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user