Merge remote-tracking branch 'lassul.us/master'
This commit is contained in:
commit
ee4ffd2fcf
2
ci.nix
2
ci.nix
@ -16,6 +16,6 @@ let
|
|||||||
ci-systems = filterAttrs (_: v: v.ci) system.config.krebs.hosts;
|
ci-systems = filterAttrs (_: v: v.ci) system.config.krebs.hosts;
|
||||||
|
|
||||||
build = host: owner:
|
build = host: owner:
|
||||||
((import (toString ./. + "/${owner}/krops.nix") { name = host; }).test {target = "${getEnv "HOME"}/stockholm-build/${host}";});
|
((import (toString ./. + "/${owner}/krops.nix") { name = host; }).test {target = "${getEnv "HOME"}/stockholm-tmp";});
|
||||||
|
|
||||||
in mapAttrs (n: h: build n h.owner.name) ci-systems
|
in mapAttrs (n: h: build n h.owner.name) ci-systems
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
;
|
;
|
||||||
|
|
||||||
source = { test }: lib.evalSource [
|
source = { test }: lib.evalSource [
|
||||||
krebs-source
|
(krebs-source { test = test; })
|
||||||
{
|
{
|
||||||
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
|
||||||
secrets = if test then {
|
secrets = if test then {
|
||||||
|
@ -362,7 +362,7 @@ let
|
|||||||
# normally we should write buildbot.tac by our own
|
# normally we should write buildbot.tac by our own
|
||||||
# ${pkgs.buildbot-classic}/bin/buildbot upgrade-master ${workdir}
|
# ${pkgs.buildbot-classic}/bin/buildbot upgrade-master ${workdir}
|
||||||
|
|
||||||
chmod 700 -R ${workdir}
|
chmod 700 ${workdir}
|
||||||
chown buildbotMaster:buildbotMaster -R ${workdir}
|
chown buildbotMaster:buildbotMaster -R ${workdir}
|
||||||
'';
|
'';
|
||||||
ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}";
|
ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}";
|
||||||
|
@ -166,7 +166,7 @@ let
|
|||||||
echo ${description} > ${workdir}/info/host
|
echo ${description} > ${workdir}/info/host
|
||||||
|
|
||||||
chown buildbotSlave:buildbotSlave -R ${workdir}
|
chown buildbotSlave:buildbotSlave -R ${workdir}
|
||||||
chmod 700 -R ${workdir}
|
chmod 700 ${workdir}
|
||||||
'';
|
'';
|
||||||
ExecStart = "${pkgs.buildbot-classic-slave}/bin/buildslave start ${workdir}";
|
ExecStart = "${pkgs.buildbot-classic-slave}/bin/buildslave start ${workdir}";
|
||||||
ExecStop = "${pkgs.buildbot-classic-slave}/bin/buildslave stop ${workdir}";
|
ExecStop = "${pkgs.buildbot-classic-slave}/bin/buildslave stop ${workdir}";
|
||||||
|
@ -26,8 +26,15 @@ let
|
|||||||
|
|
||||||
hostname = config.networking.hostName;
|
hostname = config.networking.hostName;
|
||||||
getJobs = pkgs.writeDash "get_jobs" ''
|
getJobs = pkgs.writeDash "get_jobs" ''
|
||||||
nix-build --no-out-link --quiet -Q ./ci.nix > /dev/null
|
set -efu
|
||||||
nix-instantiate --quiet -Q --eval --strict --json ./ci.nix
|
${pkgs.nix}/bin/nix-build --no-out-link --quiet -Q ./ci.nix >&2
|
||||||
|
json="$(${pkgs.nix}/bin/nix-instantiate --quiet -Q --eval --strict --json ./ci.nix)"
|
||||||
|
echo "$json" | ${pkgs.jq}/bin/jq -r 'to_entries[] | [.key, .value] | @tsv' \
|
||||||
|
| while read -r host builder; do
|
||||||
|
gcroot=${shell.escape profileRoot}/$host-builder
|
||||||
|
${pkgs.nix}/bin/nix-env -p "$gcroot" --set "$builder"
|
||||||
|
done
|
||||||
|
echo "$json"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
profileRoot = "/nix/var/nix/profiles/ci";
|
profileRoot = "/nix/var/nix/profiles/ci";
|
||||||
|
@ -38,11 +38,6 @@ let
|
|||||||
'';
|
'';
|
||||||
default = {};
|
default = {};
|
||||||
};
|
};
|
||||||
maxTime = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 0;
|
|
||||||
description = "Time to wait before download is aborted";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchWallpaperScript = pkgs.writeDash "fetchWallpaper" ''
|
fetchWallpaperScript = pkgs.writeDash "fetchWallpaper" ''
|
||||||
@ -51,8 +46,8 @@ let
|
|||||||
mkdir -p ${cfg.stateDir}
|
mkdir -p ${cfg.stateDir}
|
||||||
chmod o+rx ${cfg.stateDir}
|
chmod o+rx ${cfg.stateDir}
|
||||||
cd ${cfg.stateDir}
|
cd ${cfg.stateDir}
|
||||||
(curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || :
|
(curl -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || :
|
||||||
feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
|
feh --no-fehbg --bg-scale wallpaper
|
||||||
'';
|
'';
|
||||||
|
|
||||||
imp = {
|
imp = {
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
with import <stockholm/lib>;
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./3modules
|
./3modules
|
||||||
{
|
|
||||||
nixpkgs.config.packageOverrides =
|
|
||||||
import ../submodules/nix-writers/pkgs pkgs;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
|
|
||||||
|
nixpkgs = {
|
||||||
|
overlays = [
|
||||||
|
(import ./5pkgs)
|
||||||
|
(import ../submodules/nix-writers/pkgs)
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,15 +7,27 @@
|
|||||||
# TODO document why pkgs should be used like this
|
# TODO document why pkgs should be used like this
|
||||||
pkgs = import "${krops}/pkgs" {};
|
pkgs = import "${krops}/pkgs" {};
|
||||||
|
|
||||||
krebs-source = {
|
krebs-source = { test ? false }: rec {
|
||||||
nixpkgs.git = {
|
nixpkgs = if test then {
|
||||||
|
file = {
|
||||||
|
path = toString (pkgs.fetchFromGitHub {
|
||||||
|
owner = "nixos";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = (lib.importJSON ./nixpkgs.json).rev;
|
||||||
|
sha256 = (lib.importJSON ./nixpkgs.json).sha256;
|
||||||
|
});
|
||||||
|
useChecksum = true;
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
git = {
|
||||||
ref = (lib.importJSON ./nixpkgs.json).rev;
|
ref = (lib.importJSON ./nixpkgs.json).rev;
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
stockholm.file = toString ../.;
|
stockholm.file = toString ../.;
|
||||||
stockholm-version.pipe = toString (pkgs.writeDash "${name}-version" ''
|
stockholm-version.pipe = toString (pkgs.writeDash "${name}-version" ''
|
||||||
set -efu
|
set -efu
|
||||||
cd ${lib.escapeShellArg krebs-source.stockholm.file}
|
cd ${lib.escapeShellArg stockholm.file}
|
||||||
V=$(${pkgs.coreutils}/bin/date +%y.%m)
|
V=$(${pkgs.coreutils}/bin/date +%y.%m)
|
||||||
if test -d .git; then
|
if test -d .git; then
|
||||||
V=$V.git.$(${pkgs.git}/bin/git describe --always --dirty)
|
V=$V.git.$(${pkgs.git}/bin/git describe --always --dirty)
|
||||||
@ -28,21 +40,17 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
source ={ test }: lib.evalSource [
|
source ={ test }: lib.evalSource [
|
||||||
krebs-source
|
(krebs-source { test = test; })
|
||||||
{
|
{
|
||||||
nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix";
|
||||||
secrets =
|
secrets = if test then {
|
||||||
if test
|
|
||||||
then {
|
|
||||||
file = toString <stockholm/krebs/0tests/data/secrets>;
|
file = toString <stockholm/krebs/0tests/data/secrets>;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
pass = {
|
pass = {
|
||||||
dir = "${lib.getEnv "HOME"}/brain";
|
dir = "${lib.getEnv "HOME"}/brain";
|
||||||
name = "krebs-secrets/${name}";
|
name = "krebs-secrets/${name}";
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
;
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -20,7 +20,14 @@
|
|||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts.nix-serve = {
|
virtualHosts.nix-serve = {
|
||||||
serverAliases = [ "cache.prism.r" "cache.krebsco.de" "cache.lassul.us" ];
|
serverAliases = [ "cache.prism.r" ];
|
||||||
|
locations."/".extraConfig = ''
|
||||||
|
proxy_pass http://localhost:${toString config.services.nix-serve.port};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
virtualHosts."cache.krebsco.de" = {
|
||||||
|
serverAliases = [ "cache.lassul.us" ];
|
||||||
|
enableACME = true;
|
||||||
locations."/".extraConfig = ''
|
locations."/".extraConfig = ''
|
||||||
proxy_pass http://localhost:${toString config.services.nix-serve.port};
|
proxy_pass http://localhost:${toString config.services.nix-serve.port};
|
||||||
'';
|
'';
|
||||||
|
@ -23,6 +23,12 @@ in {
|
|||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
system.activationScripts.containerPermissions = ''
|
||||||
|
mkdir -p /var/lib/containers
|
||||||
|
chmod 711 /var/lib/containers
|
||||||
|
'';
|
||||||
|
|
||||||
containers.blue = {
|
containers.blue = {
|
||||||
config = { ... }: {
|
config = { ... }: {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
@ -74,6 +80,10 @@ in {
|
|||||||
source = "/var/lib/containers/.blue",
|
source = "/var/lib/containers/.blue",
|
||||||
host = "${host}.r",
|
host = "${host}.r",
|
||||||
targetdir = "/var/lib/containers/.blue",
|
targetdir = "/var/lib/containers/.blue",
|
||||||
|
rsync = {
|
||||||
|
owner = true,
|
||||||
|
group = true,
|
||||||
|
};
|
||||||
ssh = {
|
ssh = {
|
||||||
binary = "${pkgs.openssh}/bin/ssh";
|
binary = "${pkgs.openssh}/bin/ssh";
|
||||||
identityFile = "/var/lib/containers/blue/home/lass/.ssh/id_rsa",
|
identityFile = "/var/lib/containers/blue/home/lass/.ssh/id_rsa",
|
||||||
@ -89,14 +99,15 @@ in {
|
|||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writeDashBin "start-blue" ''
|
(pkgs.writeDashBin "start-blue" ''
|
||||||
set -ef
|
set -ef
|
||||||
if ping -c1 blue.r >/dev/null; then
|
|
||||||
echo 'blue is already running. bailing out'
|
|
||||||
exit 23
|
|
||||||
fi
|
|
||||||
if ! $(mount | ${pkgs.gnugrep}/bin/grep -qi '^encfs on /var/lib/containers/blue'); then
|
if ! $(mount | ${pkgs.gnugrep}/bin/grep -qi '^encfs on /var/lib/containers/blue'); then
|
||||||
${pkgs.encfs}/bin/encfs --public /var/lib/containers/.blue /var/lib/containers/blue
|
${pkgs.encfs}/bin/encfs --public /var/lib/containers/.blue /var/lib/containers/blue
|
||||||
fi
|
fi
|
||||||
nixos-container start blue
|
nixos-container start blue
|
||||||
|
nixos-container run blue -- nixos-rebuild -I /var/src dry-build
|
||||||
|
if ping -c1 blue.r >/dev/null; then
|
||||||
|
echo 'blue is already running. bailing out'
|
||||||
|
exit 23
|
||||||
|
fi
|
||||||
nixos-container run blue -- nixos-rebuild -I /var/src switch
|
nixos-container run blue -- nixos-rebuild -I /var/src switch
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
@ -92,6 +92,7 @@ with import <stockholm/lib>;
|
|||||||
{ from = "ccc@lassul.us"; to = lass.mail; }
|
{ from = "ccc@lassul.us"; to = lass.mail; }
|
||||||
{ from = "neocron@lassul.us"; to = lass.mail; }
|
{ from = "neocron@lassul.us"; to = lass.mail; }
|
||||||
{ from = "osmocom@lassul.us"; to = lass.mail; }
|
{ from = "osmocom@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "lesswrong@lassul.us"; to = lass.mail; }
|
||||||
];
|
];
|
||||||
system-aliases = [
|
system-aliases = [
|
||||||
{ from = "mailer-daemon"; to = "postmaster"; }
|
{ from = "mailer-daemon"; to = "postmaster"; }
|
||||||
|
@ -7,7 +7,6 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
|
unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
|
||||||
url = "prism/realwallpaper-krebs.png";
|
url = "prism/realwallpaper-krebs.png";
|
||||||
maxTime = 10;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,6 +47,7 @@ let
|
|||||||
];
|
];
|
||||||
dezentrale = [ "to:dezentrale.space" ];
|
dezentrale = [ "to:dezentrale.space" ];
|
||||||
dhl = [ "to:dhl@lassul.us" ];
|
dhl = [ "to:dhl@lassul.us" ];
|
||||||
|
dn42 = [ "to:dn42@lists.nox.tf" ];
|
||||||
eloop = [ "to:eloop.org" ];
|
eloop = [ "to:eloop.org" ];
|
||||||
github = [ "to:github@lassul.us" ];
|
github = [ "to:github@lassul.us" ];
|
||||||
gmail = [ "to:gmail@lassul.us" "to:lassulus@gmail.com" "lassulus@googlemail.com" ];
|
gmail = [ "to:gmail@lassul.us" "to:lassulus@gmail.com" "lassulus@googlemail.com" ];
|
||||||
|
@ -60,10 +60,25 @@ in {
|
|||||||
group = "radio";
|
group = "radio";
|
||||||
musicDirectory = "/home/radio/the_playlist/music";
|
musicDirectory = "/home/radio/the_playlist/music";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
audio_output {
|
||||||
|
type "shout"
|
||||||
|
encoding "lame"
|
||||||
|
name "the_playlist_mp3"
|
||||||
|
host "localhost"
|
||||||
|
port "8000"
|
||||||
|
mount "/radio.mp3"
|
||||||
|
password "${source-password}"
|
||||||
|
bitrate "128"
|
||||||
|
|
||||||
|
format "44100:16:2"
|
||||||
|
|
||||||
|
user "source"
|
||||||
|
genre "good music"
|
||||||
|
}
|
||||||
audio_output {
|
audio_output {
|
||||||
type "shout"
|
type "shout"
|
||||||
encoding "ogg"
|
encoding "ogg"
|
||||||
name "the_playlist"
|
name "the_playlist_ogg"
|
||||||
host "localhost"
|
host "localhost"
|
||||||
port "8000"
|
port "8000"
|
||||||
mount "/radio.ogg"
|
mount "/radio.ogg"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
;
|
;
|
||||||
|
|
||||||
source = { test }: lib.evalSource [
|
source = { test }: lib.evalSource [
|
||||||
krebs-source
|
(krebs-source { test = test; })
|
||||||
{
|
{
|
||||||
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
|
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
|
||||||
secrets = if test then {
|
secrets = if test then {
|
||||||
|
@ -23,7 +23,17 @@
|
|||||||
{
|
{
|
||||||
# nixos-18.09 @ 2018-09-18
|
# nixos-18.09 @ 2018-09-18
|
||||||
# + uhub/sqlite: 5dd7610401747
|
# + uhub/sqlite: 5dd7610401747
|
||||||
nixpkgs = if test || host-src.full then {
|
nixpkgs = if test then {
|
||||||
|
file = {
|
||||||
|
path = toString (pkgs.fetchFromGitHub {
|
||||||
|
owner = "makefu";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = nixpkgs-src.rev;
|
||||||
|
sha256 = nixpkgs-src.sha256;
|
||||||
|
});
|
||||||
|
useChecksum = true;
|
||||||
|
};
|
||||||
|
} else if host-src.full then {
|
||||||
git.ref = nixpkgs-src.rev;
|
git.ref = nixpkgs-src.rev;
|
||||||
git.url = nixpkgs-src.url;
|
git.url = nixpkgs-src.url;
|
||||||
} else if host-src.arm6 then {
|
} else if host-src.arm6 then {
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 4ce5dae7bceb635e96a9f8d5658a1bd2aada4f66
|
Subproject commit 6f49342b2d5973478f1f5eb6f8d6307059e7bcf7
|
@ -25,7 +25,6 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
chromium
|
|
||||||
firefoxWrapper
|
firefoxWrapper
|
||||||
gimp
|
gimp
|
||||||
kate
|
kate
|
||||||
@ -63,8 +62,6 @@ with import <stockholm/lib>;
|
|||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
nixpkgs.config.chromium.enablePepperFlash = true;
|
|
||||||
|
|
||||||
programs.ssh.startAgent = false;
|
programs.ssh.startAgent = false;
|
||||||
|
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
@ -27,11 +27,6 @@ in {
|
|||||||
# 2014-09-24 ref https://github.com/4z3/xintmap
|
# 2014-09-24 ref https://github.com/4z3/xintmap
|
||||||
http://www.mathstat.dal.ca/~selinger/quipper/
|
http://www.mathstat.dal.ca/~selinger/quipper/
|
||||||
|
|
||||||
## other
|
|
||||||
|
|
||||||
https://nixos.org/channels/nixos-18.03/git-revision
|
|
||||||
https://nixos.org/channels/nixos-unstable/git-revision
|
|
||||||
|
|
||||||
## 2014-10-17
|
## 2014-10-17
|
||||||
## TODO update ~/src/login/default.nix
|
## TODO update ~/src/login/default.nix
|
||||||
#http://hackage.haskell.org/package/bcrypt
|
#http://hackage.haskell.org/package/bcrypt
|
||||||
|
@ -11,7 +11,7 @@ with import <stockholm/lib>;
|
|||||||
hardware.sane = {
|
hardware.sane = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraBackends = [
|
extraBackends = [
|
||||||
pkgs.utsushi
|
pkgs.utsushi-customized
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ with import <stockholm/lib>;
|
|||||||
elem (parseDrvName pkg.name).name [ "imagescan-plugin-networkscan" ];
|
elem (parseDrvName pkg.name).name [ "imagescan-plugin-networkscan" ];
|
||||||
|
|
||||||
nixpkgs.overlays = singleton (self: super: {
|
nixpkgs.overlays = singleton (self: super: {
|
||||||
utsushi = super.utsushi.override {
|
utsushi-customized = self.utsushi.override {
|
||||||
guiSupport = false;
|
guiSupport = false;
|
||||||
jpegSupport = false;
|
jpegSupport = false;
|
||||||
networkSupport = true;
|
networkSupport = true;
|
||||||
|
@ -50,4 +50,9 @@ pkgs.writeText "Xresources" /* xdefaults */ ''
|
|||||||
root-urxvt*foreground: #e0c0c0
|
root-urxvt*foreground: #e0c0c0
|
||||||
root-urxvt*BorderColor: #400000
|
root-urxvt*BorderColor: #400000
|
||||||
root-urxvt*color0: #800000
|
root-urxvt*color0: #800000
|
||||||
|
|
||||||
|
fzmenu-urxvt*background: rgb:42/23/42
|
||||||
|
fzmenu-urxvt*externalBorder: 1
|
||||||
|
fzmenu-urxvt*geometry: 70x9
|
||||||
|
fzmenu-urxvt*internalBorder: 1
|
||||||
''
|
''
|
||||||
|
@ -63,6 +63,11 @@ in {
|
|||||||
environment = {
|
environment = {
|
||||||
DISPLAY = ":${toString config.services.xserver.display}";
|
DISPLAY = ":${toString config.services.xserver.display}";
|
||||||
|
|
||||||
|
FZMENU_FZF_DEFAULT_OPTS = toString [
|
||||||
|
"--color=dark,border:126,bg+:090"
|
||||||
|
"--inline-info"
|
||||||
|
];
|
||||||
|
|
||||||
XMONAD_CACHE_DIR = cfg.cacheDir;
|
XMONAD_CACHE_DIR = cfg.cacheDir;
|
||||||
XMONAD_CONFIG_DIR = cfg.configDir;
|
XMONAD_CONFIG_DIR = cfg.configDir;
|
||||||
XMONAD_DATA_DIR = cfg.dataDir;
|
XMONAD_DATA_DIR = cfg.dataDir;
|
||||||
@ -95,8 +100,8 @@ in {
|
|||||||
"\${XMONAD_CONFIG_DIR}"
|
"\${XMONAD_CONFIG_DIR}"
|
||||||
"\${XMONAD_DATA_DIR}"
|
"\${XMONAD_DATA_DIR}"
|
||||||
]}";
|
]}";
|
||||||
ExecStart = "${pkgs.xmonad-tv}/bin/xmonad";
|
ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem}";
|
||||||
ExecStop = "${pkgs.xmonad-tv}/bin/xmonad --shutdown";
|
ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem} --shutdown $MAINPID";
|
||||||
User = cfg.user.name;
|
User = cfg.user.name;
|
||||||
WorkingDirectory = cfg.user.home;
|
WorkingDirectory = cfg.user.home;
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./charybdis
|
./charybdis
|
||||||
|
./dnsmasq.nix
|
||||||
./ejabberd
|
./ejabberd
|
||||||
./hosts.nix
|
./hosts.nix
|
||||||
./iptables.nix
|
./iptables.nix
|
||||||
|
57
tv/3modules/dnsmasq.nix
Normal file
57
tv/3modules/dnsmasq.nix
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
with import <stockholm/lib>;
|
||||||
|
{ config, ... }: let
|
||||||
|
cfg = config.tv.dnsmasq;
|
||||||
|
in {
|
||||||
|
|
||||||
|
options.tv.dnsmasq = {
|
||||||
|
enable = mkEnableOption "tv.dnsmasq";
|
||||||
|
dhcp-range = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
};
|
||||||
|
interface = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
};
|
||||||
|
address = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
};
|
||||||
|
prefixLength = mkOption {
|
||||||
|
type = types.addCheck types.int (x: x >= 0 && x <= 32);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable (mkMerge [
|
||||||
|
{
|
||||||
|
networking.dhcpcd.denyInterfaces = [ cfg.interface ];
|
||||||
|
services.dnsmasq.resolveLocalQueries = false;
|
||||||
|
networking.interfaces.${cfg.interface} = {
|
||||||
|
ipv4.addresses = singleton {
|
||||||
|
address = cfg.address;
|
||||||
|
prefixLength = cfg.prefixLength;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.dnsmasq.enable = true;
|
||||||
|
services.dnsmasq.extraConfig = ''
|
||||||
|
dhcp-range=${cfg.dhcp-range}
|
||||||
|
interface=${cfg.interface}
|
||||||
|
'';
|
||||||
|
tv.iptables.extra.filter.INPUT = [
|
||||||
|
"-i ${cfg.interface} -p tcp -m tcp --dport bootps -j ACCEPT"
|
||||||
|
"-i ${cfg.interface} -p udp -m udp --dport bootps -j ACCEPT"
|
||||||
|
"-i ${cfg.interface} -p tcp -m tcp --dport domain -j ACCEPT"
|
||||||
|
"-i ${cfg.interface} -p udp -m udp --dport domain -j ACCEPT"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
# enable forwarding
|
||||||
|
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||||
|
tv.iptables.extra.filter.FORWARD = [
|
||||||
|
"-m state --state RELATED,ESTABLISHED -j ACCEPT"
|
||||||
|
"-i ${cfg.interface} -j ACCEPT"
|
||||||
|
];
|
||||||
|
tv.iptables.extra.nat.POSTROUTING = [
|
||||||
|
"-j MASQUERADE"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
|
}
|
13
tv/5pkgs/simple/disko.nix
Normal file
13
tv/5pkgs/simple/disko.nix
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{ fetchgit }:
|
||||||
|
|
||||||
|
let
|
||||||
|
src = fetchgit {
|
||||||
|
url = https://cgit.krebsco.de/disko;
|
||||||
|
rev = "16cd458af06d3caf687eb7d80ca3df26b71fe28c";
|
||||||
|
sha256 = "16cd458af06d3caf687eb7d80ca3df26b71fe28c";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
lib = import "${src}/lib";
|
||||||
|
}
|
41
tv/5pkgs/simple/fzmenu/bin/otpmenu
Executable file
41
tv/5pkgs/simple/fzmenu/bin/otpmenu
Executable file
@ -0,0 +1,41 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
set -efu
|
||||||
|
|
||||||
|
#PATH=
|
||||||
|
|
||||||
|
case ${FZMENU_PHASE-0} in
|
||||||
|
0)
|
||||||
|
export FZMENU_PHASE=1
|
||||||
|
exec setsid -f urxvt -name fzmenu-urxvt -e dash "$0"
|
||||||
|
;;
|
||||||
|
1)
|
||||||
|
if result=$(
|
||||||
|
FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-}
|
||||||
|
if test -n "$FZF_DEFAULT_OPTS"; then
|
||||||
|
export FZF_DEFAULT_OPTS
|
||||||
|
fi
|
||||||
|
pass git ls-files '*/otp.gpg' | \
|
||||||
|
sed '
|
||||||
|
|
||||||
|
s/\/otp\.gpg$//
|
||||||
|
' |
|
||||||
|
exec fzf \
|
||||||
|
--history=/dev/null \
|
||||||
|
--no-sort \
|
||||||
|
--prompt='OTP: ' \
|
||||||
|
)
|
||||||
|
then
|
||||||
|
export FZMENU_PHASE=2
|
||||||
|
export FZMENU_RESULT="$result"
|
||||||
|
setsid -f "$0"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
2)
|
||||||
|
pass=$(pass otp code "$FZMENU_RESULT/otp")
|
||||||
|
printf %s "$pass" |
|
||||||
|
xdotool type -f -
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "$0: error: bad phase: $FZMENU_PHASE" >&2
|
||||||
|
exit -1
|
||||||
|
esac
|
41
tv/5pkgs/simple/fzmenu/bin/passmenu
Executable file
41
tv/5pkgs/simple/fzmenu/bin/passmenu
Executable file
@ -0,0 +1,41 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
set -efu
|
||||||
|
|
||||||
|
#PATH=
|
||||||
|
|
||||||
|
case ${FZMENU_PHASE-0} in
|
||||||
|
0)
|
||||||
|
export FZMENU_PHASE=1
|
||||||
|
exec setsid -f urxvt -name fzmenu-urxvt -e dash "$0"
|
||||||
|
;;
|
||||||
|
1)
|
||||||
|
if result=$(
|
||||||
|
FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-}
|
||||||
|
if test -n "$FZF_DEFAULT_OPTS"; then
|
||||||
|
export FZF_DEFAULT_OPTS
|
||||||
|
fi
|
||||||
|
pass git ls-files '*/*.gpg' | \
|
||||||
|
sed '
|
||||||
|
/\/otp\.gpg$:/d
|
||||||
|
s/\.gpg$//
|
||||||
|
' |
|
||||||
|
exec fzf \
|
||||||
|
--history=/dev/null \
|
||||||
|
--no-sort \
|
||||||
|
--prompt='pass: ' \
|
||||||
|
)
|
||||||
|
then
|
||||||
|
export FZMENU_PHASE=2
|
||||||
|
export FZMENU_RESULT="$result"
|
||||||
|
setsid -f "$0"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
2)
|
||||||
|
pass=$(pass show "$FZMENU_RESULT")
|
||||||
|
printf %s "$pass" |
|
||||||
|
xdotool type -f -
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "$0: error: bad phase: $FZMENU_PHASE" >&2
|
||||||
|
exit -1
|
||||||
|
esac
|
34
tv/5pkgs/simple/fzmenu/default.nix
Normal file
34
tv/5pkgs/simple/fzmenu/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ coreutils, dash, gnused, fzf, pass, runCommand, rxvt_unicode, stdenv, utillinux, xdotool }:
|
||||||
|
|
||||||
|
runCommand "fzmenu" {
|
||||||
|
} /* sh */ ''
|
||||||
|
mkdir $out
|
||||||
|
|
||||||
|
cp -r ${./bin} $out/bin
|
||||||
|
|
||||||
|
substituteInPlace $out/bin/otpmenu \
|
||||||
|
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
|
||||||
|
--replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
|
||||||
|
coreutils
|
||||||
|
dash
|
||||||
|
fzf
|
||||||
|
gnused
|
||||||
|
pass
|
||||||
|
rxvt_unicode
|
||||||
|
utillinux
|
||||||
|
xdotool
|
||||||
|
]}
|
||||||
|
|
||||||
|
substituteInPlace $out/bin/passmenu \
|
||||||
|
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
|
||||||
|
--replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
|
||||||
|
coreutils
|
||||||
|
dash
|
||||||
|
fzf
|
||||||
|
gnused
|
||||||
|
pass
|
||||||
|
rxvt_unicode
|
||||||
|
utillinux
|
||||||
|
xdotool
|
||||||
|
]}
|
||||||
|
''
|
@ -1,15 +0,0 @@
|
|||||||
{ dmenu, gnused, pass, writeDashBin, xdotool }:
|
|
||||||
|
|
||||||
writeDashBin "otpmenu" ''
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
x=$(
|
|
||||||
${pass}/bin/pass git ls-files '*/otp.gpg' \
|
|
||||||
| ${gnused}/bin/sed 's:/otp\.gpg$::' \
|
|
||||||
| ${dmenu}/bin/dmenu -f -p OTP
|
|
||||||
)
|
|
||||||
|
|
||||||
otp=$(${pass}/bin/pass otp code "$x/otp")
|
|
||||||
|
|
||||||
printf %s "$otp" | ${xdotool}/bin/xdotool type -f -
|
|
||||||
''
|
|
@ -1,6 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
pkgs.writeHaskellPackage "xmonad-tv" {
|
pkgs.writeHaskellPackage "xmonad-tv" {
|
||||||
executables.xmonad = {
|
executables."xmonad-${builtins.currentSystem}" = {
|
||||||
extra-depends = [
|
extra-depends = [
|
||||||
"containers"
|
"containers"
|
||||||
"extra"
|
"extra"
|
||||||
@ -19,36 +19,35 @@ pkgs.writeHaskellPackage "xmonad-tv" {
|
|||||||
|
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
|
import System.IO.Error (isDoesNotExistError, tryIOError)
|
||||||
|
import System.Exit (exitFailure)
|
||||||
|
import Control.Monad (forever)
|
||||||
|
import Control.Concurrent (threadDelay)
|
||||||
|
|
||||||
import Control.Exception
|
import Control.Exception
|
||||||
import Control.Monad.Extra (whenJustM)
|
import Control.Monad.Extra (whenJustM)
|
||||||
import Graphics.X11.ExtraTypes.XF86
|
import Graphics.X11.ExtraTypes.XF86
|
||||||
import Text.Read (readEither)
|
import Text.Read (readEither)
|
||||||
import XMonad
|
import XMonad
|
||||||
import System.IO (hPutStrLn, stderr)
|
import System.IO (hPutStrLn, stderr)
|
||||||
import System.Environment (getArgs, withArgs, getEnv, getEnvironment, lookupEnv)
|
import System.Environment (getArgs, getEnv, getEnvironment, lookupEnv)
|
||||||
import System.Posix.Process (executeFile)
|
import System.Posix.Process (executeFile)
|
||||||
|
import System.Posix.Signals (nullSignal, signalProcess)
|
||||||
|
import System.Posix.Types (ProcessID)
|
||||||
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
||||||
, removeEmptyWorkspace)
|
, removeEmptyWorkspace)
|
||||||
import XMonad.Actions.GridSelect
|
import XMonad.Actions.GridSelect
|
||||||
import XMonad.Actions.CycleWS (toggleWS)
|
import XMonad.Actions.CycleWS (toggleWS)
|
||||||
--import XMonad.Actions.CopyWindow ( copy )
|
|
||||||
import XMonad.Layout.NoBorders ( smartBorders )
|
import XMonad.Layout.NoBorders ( smartBorders )
|
||||||
import qualified XMonad.StackSet as W
|
import qualified XMonad.StackSet as W
|
||||||
import Data.Map (Map)
|
import Data.Map (Map)
|
||||||
import qualified Data.Map as Map
|
import qualified Data.Map as Map
|
||||||
-- TODO import XMonad.Layout.WorkspaceDir
|
|
||||||
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
|
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
|
||||||
-- import XMonad.Layout.Tabbed
|
import XMonad.Hooks.ManageHelpers (doCenterFloat)
|
||||||
--import XMonad.Layout.MouseResizableTile
|
|
||||||
import XMonad.Layout.Reflect (reflectVert)
|
|
||||||
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
||||||
import XMonad.Hooks.Place (placeHook, smart)
|
import XMonad.Hooks.Place (placeHook, smart)
|
||||||
import XMonad.Hooks.FloatNext (floatNextHook)
|
|
||||||
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
||||||
import XMonad.Layout.PerWorkspace (onWorkspace)
|
|
||||||
--import XMonad.Layout.BinarySpacePartition
|
|
||||||
|
|
||||||
--import XMonad.Actions.Submap
|
|
||||||
import XMonad.Stockholm.Pager
|
import XMonad.Stockholm.Pager
|
||||||
import XMonad.Stockholm.Rhombus
|
import XMonad.Stockholm.Rhombus
|
||||||
import XMonad.Stockholm.Shutdown
|
import XMonad.Stockholm.Shutdown
|
||||||
@ -65,17 +64,28 @@ myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
|
|||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = getArgs >>= \case
|
main = getArgs >>= \case
|
||||||
["--shutdown"] -> sendShutdownEvent
|
[] -> mainNoArgs
|
||||||
_ -> mainNoArgs
|
["--shutdown", pidArg] -> mainShutdown (read pidArg)
|
||||||
|
args -> hPutStrLn stderr ("bad arguments: " <> show args) >> exitFailure
|
||||||
|
|
||||||
|
mainShutdown :: ProcessID -> IO ()
|
||||||
|
mainShutdown pid = do
|
||||||
|
sendShutdownEvent
|
||||||
|
hPutStrLn stderr ("waiting for: " <> show pid)
|
||||||
|
result <- tryIOError (waitProcess pid)
|
||||||
|
if isSuccess result
|
||||||
|
then hPutStrLn stderr ("result: " <> show result <> " [AKA success^_^]")
|
||||||
|
else hPutStrLn stderr ("result: " <> show result)
|
||||||
|
where
|
||||||
|
isSuccess = either isDoesNotExistError (const False)
|
||||||
|
|
||||||
|
waitProcess :: ProcessID -> IO ()
|
||||||
|
waitProcess pid = forever (signalProcess nullSignal pid >> threadDelay 10000)
|
||||||
|
|
||||||
mainNoArgs :: IO ()
|
mainNoArgs :: IO ()
|
||||||
mainNoArgs = do
|
mainNoArgs = do
|
||||||
workspaces0 <- getWorkspaces0
|
workspaces0 <- getWorkspaces0
|
||||||
xmonad
|
xmonad
|
||||||
-- $ withUrgencyHookC dzenUrgencyHook { args = ["-bg", "magenta", "-fg", "magenta", "-h", "2"], duration = 500000 }
|
|
||||||
-- urgencyConfig { remindWhen = Every 1 }
|
|
||||||
-- $ withUrgencyHook borderUrgencyHook "magenta"
|
|
||||||
-- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never }
|
|
||||||
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
||||||
$ def
|
$ def
|
||||||
{ terminal = urxvtcPath
|
{ terminal = urxvtcPath
|
||||||
@ -83,11 +93,14 @@ mainNoArgs = do
|
|||||||
, keys = myKeys
|
, keys = myKeys
|
||||||
, workspaces = workspaces0
|
, workspaces = workspaces0
|
||||||
, layoutHook = smartBorders $ FixedColumn 1 20 80 10 ||| Full
|
, layoutHook = smartBorders $ FixedColumn 1 20 80 10 ||| Full
|
||||||
-- , handleEventHook = myHandleEventHooks <+> handleTimerEvent
|
, manageHook =
|
||||||
--, handleEventHook = handleTimerEvent
|
composeAll
|
||||||
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
[ appName =? "fzmenu-urxvt" --> doCenterFloat
|
||||||
|
, appName =? "pinentry" --> doCenterFloat
|
||||||
|
, placeHook (smart (1,0))
|
||||||
|
]
|
||||||
, startupHook =
|
, startupHook =
|
||||||
whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
|
whenJustM (io (lookupEnv "XMONAD_STARTUP_HOOK"))
|
||||||
(\path -> forkFile path [] Nothing)
|
(\path -> forkFile path [] Nothing)
|
||||||
, normalBorderColor = "#1c1c1c"
|
, normalBorderColor = "#1c1c1c"
|
||||||
, focusedBorderColor = "#f000b0"
|
, focusedBorderColor = "#f000b0"
|
||||||
@ -124,7 +137,7 @@ spawnRootTerm =
|
|||||||
|
|
||||||
spawnTermAt :: String -> X ()
|
spawnTermAt :: String -> X ()
|
||||||
spawnTermAt ws = do
|
spawnTermAt ws = do
|
||||||
env <- liftIO getEnvironment
|
env <- io getEnvironment
|
||||||
let env' = ("XMONAD_SPAWN_WORKSPACE", ws) : env
|
let env' = ("XMONAD_SPAWN_WORKSPACE", ws) : env
|
||||||
forkFile urxvtcPath [] (Just env')
|
forkFile urxvtcPath [] (Just env')
|
||||||
|
|
||||||
@ -133,8 +146,8 @@ myKeys conf = Map.fromList $
|
|||||||
[ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
|
[ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
|
||||||
, ((_4S , xK_c ), kill)
|
, ((_4S , xK_c ), kill)
|
||||||
|
|
||||||
, ((_4 , xK_o ), forkFile "${pkgs.otpmenu}/bin/otpmenu" [] Nothing)
|
, ((_4 , xK_o ), forkFile "${pkgs.fzmenu}/bin/otpmenu" [] Nothing)
|
||||||
, ((_4 , xK_p ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing)
|
, ((_4 , xK_p ), forkFile "${pkgs.fzmenu}/bin/passmenu" [] Nothing)
|
||||||
|
|
||||||
, ((_4 , xK_x ), chooseAction spawnTermAt)
|
, ((_4 , xK_x ), chooseAction spawnTermAt)
|
||||||
, ((_4C , xK_x ), spawnRootTerm)
|
, ((_4C , xK_x ), spawnRootTerm)
|
||||||
@ -255,34 +268,6 @@ wGSConfig = def
|
|||||||
, gs_navigate = navNSearch
|
, gs_navigate = navNSearch
|
||||||
}
|
}
|
||||||
|
|
||||||
-- wsGSConfig = def
|
|
||||||
-- { gs_cellheight = 20
|
|
||||||
-- , gs_cellwidth = 64
|
|
||||||
-- , gs_cellpadding = 5
|
|
||||||
-- , gs_font = myFont
|
|
||||||
-- , gs_navigate = navNSearch
|
|
||||||
-- }
|
|
||||||
|
|
||||||
-- custom navNSearch
|
|
||||||
--makeGSNav :: (KeyMask, KeySym) -> TwoD a (Maybe a)
|
|
||||||
--makeGSNav esc = nav
|
|
||||||
-- where
|
|
||||||
-- nav = makeXEventhandler $ shadowWithKeymap keyMap navNSearchDefaultHandler
|
|
||||||
-- keyMap = Map.fromList
|
|
||||||
-- [ (esc , cancel)
|
|
||||||
-- , ((0,xK_Escape) , cancel)
|
|
||||||
-- , ((0,xK_Return) , select)
|
|
||||||
-- , ((0,xK_Left) , move (-1, 0) >> nav)
|
|
||||||
-- , ((0,xK_Right) , move ( 1, 0) >> nav)
|
|
||||||
-- , ((0,xK_Down) , move ( 0, 1) >> nav)
|
|
||||||
-- , ((0,xK_Up) , move ( 0,-1) >> nav)
|
|
||||||
-- , ((0,xK_BackSpace) , transformSearchString (\s -> if (s == "") then "" else init s) >> nav)
|
|
||||||
-- ]
|
|
||||||
-- -- The navigation handler ignores unknown key symbols, therefore we const
|
|
||||||
-- navNSearchDefaultHandler (_,s,_) = do
|
|
||||||
-- transformSearchString (++ s)
|
|
||||||
-- nav
|
|
||||||
|
|
||||||
|
|
||||||
(&) :: a -> (a -> c) -> c
|
(&) :: a -> (a -> c) -> c
|
||||||
(&) = flip ($)
|
(&) = flip ($)
|
||||||
|
@ -1,9 +1,15 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../krebs
|
../krebs
|
||||||
./2configs
|
./2configs
|
||||||
./3modules
|
./3modules
|
||||||
];
|
];
|
||||||
nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
|
|
||||||
|
nixpkgs = {
|
||||||
|
overlays = [
|
||||||
|
(import ./5pkgs)
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
;
|
;
|
||||||
|
|
||||||
source = lib.evalSource [
|
source = lib.evalSource [
|
||||||
krebs-source
|
(krebs-source { test = true; })
|
||||||
{
|
{
|
||||||
nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
|
||||||
secrets.file = toString ./dummy_secrets;
|
secrets.file = toString ./dummy_secrets;
|
||||||
|
Loading…
Reference in New Issue
Block a user