Update formatting
This commit is contained in:
parent
9593ab0b67
commit
442f90023e
|
@ -4,7 +4,8 @@
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
battery-watch = pkgs.writeHaskellScript
|
battery-watch =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "battery-watch";
|
name = "battery-watch";
|
||||||
bins = [pkgs.acpi];
|
bins = [pkgs.acpi];
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
home.packages = builtins.attrValues
|
home.packages =
|
||||||
|
builtins.attrValues
|
||||||
{
|
{
|
||||||
inherit (pkgs) discord signal-desktop tdesktop element-desktop;
|
inherit (pkgs) discord signal-desktop tdesktop element-desktop;
|
||||||
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'TMUX_TMPDIR=/run/user/1000 tmux -L weechat attach'";
|
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'TMUX_TMPDIR=/run/user/1000 tmux -L weechat attach'";
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
{pkgs, ...}: let
|
{pkgs, ...}: let
|
||||||
plans = pkgs.privateValue
|
plans =
|
||||||
|
pkgs.privateValue
|
||||||
{
|
{
|
||||||
"workDay" = "pass";
|
"workDay" = "pass";
|
||||||
"weekend" = "pass";
|
"weekend" = "pass";
|
||||||
}
|
}
|
||||||
"plans";
|
"plans";
|
||||||
createPlans = pkgs.writeHaskellScript
|
createPlans =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "create-plans";
|
name = "create-plans";
|
||||||
bins = [pkgs.khal pkgs.vdirsyncer];
|
bins = [pkgs.khal pkgs.vdirsyncer];
|
||||||
|
|
|
@ -20,12 +20,14 @@
|
||||||
inherit
|
inherit
|
||||||
(pkgs)
|
(pkgs)
|
||||||
# web
|
# web
|
||||||
|
|
||||||
chromium
|
chromium
|
||||||
mumble
|
mumble
|
||||||
upower
|
upower
|
||||||
speedtest-cli
|
speedtest-cli
|
||||||
acpi
|
acpi
|
||||||
# tools & office
|
# tools & office
|
||||||
|
|
||||||
feh
|
feh
|
||||||
gimp
|
gimp
|
||||||
imagemagick
|
imagemagick
|
||||||
|
@ -38,6 +40,7 @@
|
||||||
beets
|
beets
|
||||||
zbar
|
zbar
|
||||||
# media
|
# media
|
||||||
|
|
||||||
ncpamixer
|
ncpamixer
|
||||||
pavucontrol
|
pavucontrol
|
||||||
playerctl
|
playerctl
|
||||||
|
|
|
@ -40,7 +40,8 @@
|
||||||
builtins.map filter.simpleSortList lists.sortLists
|
builtins.map filter.simpleSortList lists.sortLists
|
||||||
++ builtins.map filter.stupidList lists.stupidLists
|
++ builtins.map filter.stupidList lists.stupidLists
|
||||||
++ builtins.map filter.notifications lists.notifications;
|
++ builtins.map filter.notifications lists.notifications;
|
||||||
sortMail = pkgs.writeHaskellScript
|
sortMail =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "sort-mail-archive";
|
name = "sort-mail-archive";
|
||||||
bins = [pkgs.notmuch pkgs.coreutils pkgs.mblaze pkgs.findutils];
|
bins = [pkgs.notmuch pkgs.coreutils pkgs.mblaze pkgs.findutils];
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
mail2rss = pkgs.writeHaskellScript
|
mail2rss =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "mail2rss";
|
name = "mail2rss";
|
||||||
bins = [pkgs.notmuch pkgs.mblaze pkgs.isync pkgs.logfeed];
|
bins = [pkgs.notmuch pkgs.mblaze pkgs.isync pkgs.logfeed];
|
||||||
|
|
|
@ -34,7 +34,8 @@ in {
|
||||||
exe ([i|${modeDir}/#{mode}/activate|] :: String)
|
exe ([i|${modeDir}/#{mode}/activate|] :: String)
|
||||||
whenM (elem wallpaperCmd <$> pathBins) $ exe wallpaperCmd
|
whenM (elem wallpaperCmd <$> pathBins) $ exe wallpaperCmd
|
||||||
'';
|
'';
|
||||||
updateModes = pkgs.writeHaskellScript
|
updateModes =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "update-modes";
|
name = "update-modes";
|
||||||
bins = [activateMode pkgs.git pkgs.nix-output-monitor];
|
bins = [activateMode pkgs.git pkgs.nix-output-monitor];
|
||||||
|
@ -50,7 +51,8 @@ in {
|
||||||
nom_build nixPath (params ++ ["-o", "${modeDir}"])
|
nom_build nixPath (params ++ ["-o", "${modeDir}"])
|
||||||
activate_mode
|
activate_mode
|
||||||
'';
|
'';
|
||||||
quickUpdateMode = pkgs.writeHaskellScript
|
quickUpdateMode =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "quick-update-mode";
|
name = "quick-update-mode";
|
||||||
bins = [updateModes pkgs.git pkgs.home-manager pkgs.nix-output-monitor];
|
bins = [updateModes pkgs.git pkgs.home-manager pkgs.nix-output-monitor];
|
||||||
|
@ -65,7 +67,8 @@ in {
|
||||||
ignoreFailure (home_manager (nixPath <> ["switch", "-A", [i|${hostName}-#{mode}|]])) &!> StdOut |> nom
|
ignoreFailure (home_manager (nixPath <> ["switch", "-A", [i|${hostName}-#{mode}|]])) &!> StdOut |> nom
|
||||||
update_modes
|
update_modes
|
||||||
'';
|
'';
|
||||||
selectMode = pkgs.writeHaskellScript
|
selectMode =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "select-mode";
|
name = "select-mode";
|
||||||
bins = [
|
bins = [
|
||||||
|
|
|
@ -32,61 +32,88 @@ in {
|
||||||
inherit
|
inherit
|
||||||
(pkgs.vimPlugins)
|
(pkgs.vimPlugins)
|
||||||
# coc-tabnine (TODO: Why doesn‘t it work?)
|
# coc-tabnine (TODO: Why doesn‘t it work?)
|
||||||
|
|
||||||
# TODO: tabnine config in home-manager
|
# TODO: tabnine config in home-manager
|
||||||
|
|
||||||
# TODO: tabnine lsp: nix, rust, pandoc/latex lsp? was noch?
|
# TODO: tabnine lsp: nix, rust, pandoc/latex lsp? was noch?
|
||||||
|
|
||||||
# ===
|
# ===
|
||||||
|
|
||||||
# Basic IDE plugins
|
# Basic IDE plugins
|
||||||
|
|
||||||
coc-nvim
|
coc-nvim
|
||||||
airline
|
airline
|
||||||
# same word highlighting when not supported by language
|
# same word highlighting when not supported by language
|
||||||
|
|
||||||
coc-highlight
|
coc-highlight
|
||||||
coc-explorer
|
coc-explorer
|
||||||
# searches
|
# searches
|
||||||
|
|
||||||
coc-fzf
|
coc-fzf
|
||||||
fzf-vim
|
fzf-vim
|
||||||
# general whitespace
|
# general whitespace
|
||||||
|
|
||||||
vim-trailing-whitespace
|
vim-trailing-whitespace
|
||||||
vim-autoformat
|
vim-autoformat
|
||||||
# Git
|
# Git
|
||||||
|
|
||||||
coc-git
|
coc-git
|
||||||
# statusline, numberline and explorer infos
|
# statusline, numberline and explorer infos
|
||||||
|
|
||||||
fugitive
|
fugitive
|
||||||
# various git commands
|
# various git commands
|
||||||
|
|
||||||
# Commenting and Uncommenting
|
# Commenting and Uncommenting
|
||||||
|
|
||||||
nerdcommenter
|
nerdcommenter
|
||||||
# Theme
|
# Theme
|
||||||
|
|
||||||
papercolor-theme
|
papercolor-theme
|
||||||
vim-airline-themes
|
vim-airline-themes
|
||||||
LanguageTool-nvim
|
LanguageTool-nvim
|
||||||
vim-css-color
|
vim-css-color
|
||||||
vista-vim
|
vista-vim
|
||||||
# ===
|
# ===
|
||||||
|
|
||||||
# Languages
|
# Languages
|
||||||
|
|
||||||
# haskell syntax highlighting
|
# haskell syntax highlighting
|
||||||
|
|
||||||
haskell-vim
|
haskell-vim
|
||||||
vim-hoogle
|
vim-hoogle
|
||||||
# nix syntax highlighting
|
# nix syntax highlighting
|
||||||
|
|
||||||
vim-nix
|
vim-nix
|
||||||
vim-markdown
|
vim-markdown
|
||||||
# latex
|
# latex
|
||||||
|
|
||||||
vimtex
|
vimtex
|
||||||
coc-vimtex
|
coc-vimtex
|
||||||
# not sure if I need two
|
# not sure if I need two
|
||||||
|
|
||||||
# ledger
|
# ledger
|
||||||
|
|
||||||
vim-ledger
|
vim-ledger
|
||||||
# rust
|
# rust
|
||||||
|
|
||||||
coc-rls
|
coc-rls
|
||||||
# python
|
# python
|
||||||
|
|
||||||
coc-python
|
coc-python
|
||||||
# css
|
# css
|
||||||
|
|
||||||
coc-css
|
coc-css
|
||||||
# yaml
|
# yaml
|
||||||
|
|
||||||
coc-yaml
|
coc-yaml
|
||||||
# json
|
# json
|
||||||
|
|
||||||
coc-json
|
coc-json
|
||||||
# html
|
# html
|
||||||
|
|
||||||
coc-html
|
coc-html
|
||||||
# dhall
|
# dhall
|
||||||
|
|
||||||
dhall-vim
|
dhall-vim
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{pkgs, ...}: let
|
{pkgs, ...}: let
|
||||||
night-shutdown = pkgs.writeHaskellScript
|
night-shutdown =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "night-shutdown";
|
name = "night-shutdown";
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{pkgs, ...}: let
|
{pkgs, ...}: let
|
||||||
status-script = pkgs.writeHaskell "status-script"
|
status-script =
|
||||||
|
pkgs.writeHaskell "status-script"
|
||||||
{
|
{
|
||||||
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
||||||
ghcEnv = {
|
ghcEnv = {
|
||||||
|
|
|
@ -85,7 +85,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
xdg.configFile."vdirsyncer/config".source = mkConfig
|
xdg.configFile."vdirsyncer/config".source =
|
||||||
|
mkConfig
|
||||||
(
|
(
|
||||||
pkgs.lib.fold (a: b: a // b)
|
pkgs.lib.fold (a: b: a // b)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
}: let
|
}: let
|
||||||
modeFile = "${config.home.homeDirectory}/.mode";
|
modeFile = "${config.home.homeDirectory}/.mode";
|
||||||
wallPapers = "${config.home.homeDirectory}/media/images/wallpapers";
|
wallPapers = "${config.home.homeDirectory}/media/images/wallpapers";
|
||||||
randomWallpaper = pkgs.writeHaskellScript
|
randomWallpaper =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "random-wallpaper";
|
name = "random-wallpaper";
|
||||||
imports = ["System.Random"];
|
imports = ["System.Random"];
|
||||||
|
|
|
@ -9,7 +9,8 @@ with lib; let
|
||||||
configure = {availablePlugins, ...}: {
|
configure = {availablePlugins, ...}: {
|
||||||
plugins = builtins.attrValues (availablePlugins
|
plugins = builtins.attrValues (availablePlugins
|
||||||
// {
|
// {
|
||||||
python = availablePlugins.python.withPackages
|
python =
|
||||||
|
availablePlugins.python.withPackages
|
||||||
(_: [pkgs.weechatScripts.weechat-matrix]);
|
(_: [pkgs.weechatScripts.weechat-matrix]);
|
||||||
});
|
});
|
||||||
scripts = [pkgs.weechatScripts.weechat-matrix];
|
scripts = [pkgs.weechatScripts.weechat-matrix];
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
}: let
|
}: let
|
||||||
configPath = "/etc/nixos";
|
configPath = "/etc/nixos";
|
||||||
in {
|
in {
|
||||||
update-system = pkgs.writeHaskellScript
|
update-system =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "update-system";
|
name = "update-system";
|
||||||
bins = [nixos-rebuild pkgs.nix-output-monitor pkgs.nvd];
|
bins = [nixos-rebuild pkgs.nix-output-monitor pkgs.nvd];
|
||||||
|
|
|
@ -36,11 +36,13 @@ let
|
||||||
fetch_git = name: spec: let
|
fetch_git = name: spec: let
|
||||||
ref =
|
ref =
|
||||||
spec.ref
|
spec.ref
|
||||||
or (if spec ? branch
|
or (
|
||||||
|
if spec ? branch
|
||||||
then "refs/heads/${spec.branch}"
|
then "refs/heads/${spec.branch}"
|
||||||
else if spec ? tag
|
else if spec ? tag
|
||||||
then "refs/tags/${spec.tag}"
|
then "refs/tags/${spec.tag}"
|
||||||
else abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!");
|
else abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
|
||||||
|
);
|
||||||
in
|
in
|
||||||
builtins.fetchGit {
|
builtins.fetchGit {
|
||||||
url = spec.repo;
|
url = spec.repo;
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
adminCreds = pkgs.privateValue
|
adminCreds =
|
||||||
|
pkgs.privateValue
|
||||||
{
|
{
|
||||||
adminpass = "";
|
adminpass = "";
|
||||||
dbpass = "";
|
dbpass = "";
|
||||||
|
|
|
@ -64,7 +64,8 @@ in {
|
||||||
systemd.services =
|
systemd.services =
|
||||||
{
|
{
|
||||||
pg_backup = {
|
pg_backup = {
|
||||||
script = lib.concatMapStringsSep "\n"
|
script =
|
||||||
|
lib.concatMapStringsSep "\n"
|
||||||
(name: "${config.services.postgresql.package}/bin/pg_dump ${name} > /var/lib/db-backup-dumps/${name}")
|
(name: "${config.services.postgresql.package}/bin/pg_dump ${name} > /var/lib/db-backup-dumps/${name}")
|
||||||
config.services.postgresql.ensureDatabases;
|
config.services.postgresql.ensureDatabases;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|
|
@ -29,7 +29,8 @@ in {
|
||||||
};
|
};
|
||||||
rspamd.locals = {
|
rspamd.locals = {
|
||||||
"multimap.conf".text = let
|
"multimap.conf".text = let
|
||||||
allow-ip = builtins.toFile "allow-ip.map" ''
|
allow-ip =
|
||||||
|
builtins.toFile "allow-ip.map" ''
|
||||||
'';
|
'';
|
||||||
allow-host = builtins.toFile "allow-host.map" ''
|
allow-host = builtins.toFile "allow-host.map" ''
|
||||||
gmx.de
|
gmx.de
|
||||||
|
|
|
@ -19,7 +19,8 @@
|
||||||
resolvconf.dnsExtensionMechanism = false; # this breaks dnssec but is necessary for certain bad-behaved hotspots
|
resolvconf.dnsExtensionMechanism = false; # this breaks dnssec but is necessary for certain bad-behaved hotspots
|
||||||
firewall.allowPing = true;
|
firewall.allowPing = true;
|
||||||
useDHCP = false; # enabled per interface
|
useDHCP = false; # enabled per interface
|
||||||
hosts = lib.zipAttrs
|
hosts =
|
||||||
|
lib.zipAttrs
|
||||||
(
|
(
|
||||||
lib.mapAttrsToList
|
lib.mapAttrsToList
|
||||||
(host: ip:
|
(host: ip:
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
IgnoreBody = false;
|
IgnoreBody = false;
|
||||||
SkipMarkdown = false;
|
SkipMarkdown = false;
|
||||||
};
|
};
|
||||||
email2matrix-config = pkgs.writeText "email2matrix-config.json"
|
email2matrix-config =
|
||||||
|
pkgs.writeText "email2matrix-config.json"
|
||||||
(builtins.toJSON {
|
(builtins.toJSON {
|
||||||
Smtp = {
|
Smtp = {
|
||||||
ListenInterface = "[::1]:2525";
|
ListenInterface = "[::1]:2525";
|
||||||
|
|
|
@ -20,12 +20,16 @@
|
||||||
inherit
|
inherit
|
||||||
(pkgs)
|
(pkgs)
|
||||||
# For all my terminal needs.
|
# For all my terminal needs.
|
||||||
|
|
||||||
nerdfonts
|
nerdfonts
|
||||||
# nice text font
|
# nice text font
|
||||||
|
|
||||||
libertinus
|
libertinus
|
||||||
# icons in my app
|
# icons in my app
|
||||||
|
|
||||||
material-icons
|
material-icons
|
||||||
# sans font, very good for displays
|
# sans font, very good for displays
|
||||||
|
|
||||||
b612
|
b612
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
gitoliteCfg = config.services.gitolite;
|
gitoliteCfg = config.services.gitolite;
|
||||||
post-update = pkgs.writeHaskellScript
|
post-update =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "post-update";
|
name = "post-update";
|
||||||
bins = [pkgs.git pkgs.laminar];
|
bins = [pkgs.git pkgs.laminar];
|
||||||
|
|
|
@ -52,7 +52,8 @@
|
||||||
options = {inherit empty heat active force_active only_lights;};
|
options = {inherit empty heat active force_active only_lights;};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
fenster = map (name: "binary_sensor.${name}")
|
fenster =
|
||||||
|
map (name: "binary_sensor.${name}")
|
||||||
[
|
[
|
||||||
"kuechenfenster"
|
"kuechenfenster"
|
||||||
"wohnzimmerfenster"
|
"wohnzimmerfenster"
|
||||||
|
@ -439,7 +440,8 @@ in {
|
||||||
];
|
];
|
||||||
action = [
|
action = [
|
||||||
{
|
{
|
||||||
service = jinja.if'
|
service =
|
||||||
|
jinja.if'
|
||||||
(jinja.or
|
(jinja.or
|
||||||
(jinja.isStates (util.modeSelectEntity modes.wohnzimmer) ["force_active" "only_lights"])
|
(jinja.isStates (util.modeSelectEntity modes.wohnzimmer) ["force_active" "only_lights"])
|
||||||
(jinja.and
|
(jinja.and
|
||||||
|
@ -459,7 +461,8 @@ in {
|
||||||
];
|
];
|
||||||
action = [
|
action = [
|
||||||
{
|
{
|
||||||
service = jinja.if'
|
service =
|
||||||
|
jinja.if'
|
||||||
(jinja.or
|
(jinja.or
|
||||||
(jinja.isStates (util.modeSelectEntity modes.schlafzimmer) ["force_active" "only_lights"])
|
(jinja.isStates (util.modeSelectEntity modes.schlafzimmer) ["force_active" "only_lights"])
|
||||||
(jinja.and
|
(jinja.and
|
||||||
|
@ -527,7 +530,8 @@ in {
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
alias = "Warnung bei niedrigem Akkustand";
|
alias = "Warnung bei niedrigem Akkustand";
|
||||||
trigger = map
|
trigger =
|
||||||
|
map
|
||||||
(limit: {
|
(limit: {
|
||||||
platform = "numeric_state";
|
platform = "numeric_state";
|
||||||
below = toString limit;
|
below = toString limit;
|
||||||
|
@ -562,7 +566,8 @@ in {
|
||||||
++ (map
|
++ (map
|
||||||
(minutes: {
|
(minutes: {
|
||||||
alias = "Warnung bei ${minutes} Minuten offenem Fenster oder offener Tür";
|
alias = "Warnung bei ${minutes} Minuten offenem Fenster oder offener Tür";
|
||||||
trigger = map
|
trigger =
|
||||||
|
map
|
||||||
(name:
|
(name:
|
||||||
triggers.stateTrigger name
|
triggers.stateTrigger name
|
||||||
// {
|
// {
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
nix_build $ ["--show-trace", "-o", [i|/var/cache/gc-links/${name}-config-#{hostname}|]] ++ flags ++ ${drv}
|
nix_build $ ["--show-trace", "-o", [i|/var/cache/gc-links/${name}-config-#{hostname}|]] ++ flags ++ ${drv}
|
||||||
say [i|Build of ${name} config for #{hostname} was successful.|]
|
say [i|Build of ${name} config for #{hostname} was successful.|]
|
||||||
'';
|
'';
|
||||||
test-system-config = pkgs.writeHaskellScript
|
test-system-config =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "test-system-config";
|
name = "test-system-config";
|
||||||
inherit bins;
|
inherit bins;
|
||||||
|
@ -31,7 +32,8 @@
|
||||||
buildSystemParams ++ paths ++ ["-I", [i|nixos-config=#{configDir}/nixos/machines/#{hostname}/configuration.nix|]]''
|
buildSystemParams ++ paths ++ ["-I", [i|nixos-config=#{configDir}/nixos/machines/#{hostname}/configuration.nix|]]''
|
||||||
);
|
);
|
||||||
|
|
||||||
test-home-config = pkgs.writeHaskellScript
|
test-home-config =
|
||||||
|
pkgs.writeHaskellScript
|
||||||
{
|
{
|
||||||
name = "test-home-config";
|
name = "test-home-config";
|
||||||
inherit bins;
|
inherit bins;
|
||||||
|
@ -82,7 +84,8 @@ in {
|
||||||
services.laminar.cfgFiles.jobs =
|
services.laminar.cfgFiles.jobs =
|
||||||
{
|
{
|
||||||
"test-config.run" = let
|
"test-config.run" = let
|
||||||
test-config = pkgs.writeHaskell "test-config"
|
test-config =
|
||||||
|
pkgs.writeHaskell "test-config"
|
||||||
{
|
{
|
||||||
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
||||||
ghcEnv = {
|
ghcEnv = {
|
||||||
|
@ -99,7 +102,8 @@ in {
|
||||||
FLAGS="" PATH=${standardPath}:$PATH ${test-config}
|
FLAGS="" PATH=${standardPath}:$PATH ${test-config}
|
||||||
'';
|
'';
|
||||||
"bump-config.run" = let
|
"bump-config.run" = let
|
||||||
bump-config = pkgs.writeHaskell "bump-config"
|
bump-config =
|
||||||
|
pkgs.writeHaskell "bump-config"
|
||||||
{
|
{
|
||||||
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
|
||||||
ghcEnv.PATH = "${standardPath}:$PATH";
|
ghcEnv.PATH = "${standardPath}:$PATH";
|
||||||
|
@ -117,7 +121,8 @@ in {
|
||||||
allowedCommands = [deployCommand];
|
allowedCommands = [deployCommand];
|
||||||
in [
|
in [
|
||||||
{
|
{
|
||||||
commands = map
|
commands =
|
||||||
|
map
|
||||||
(
|
(
|
||||||
command: {
|
command: {
|
||||||
inherit command;
|
inherit command;
|
||||||
|
|
|
@ -33,7 +33,8 @@ in {
|
||||||
hyperkitty.enable = false;
|
hyperkitty.enable = false;
|
||||||
settings = {
|
settings = {
|
||||||
mailman.default_language = "de";
|
mailman.default_language = "de";
|
||||||
"paths.fhs".template_dir = lib.mkForce
|
"paths.fhs".template_dir =
|
||||||
|
lib.mkForce
|
||||||
(
|
(
|
||||||
pkgs.setToDirectories {
|
pkgs.setToDirectories {
|
||||||
site.de = {
|
site.de = {
|
||||||
|
|
|
@ -17,7 +17,8 @@ in {
|
||||||
};
|
};
|
||||||
synapse-cleanup = {
|
synapse-cleanup = {
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = pkgs.writeHaskell "synapse-cleanup"
|
ExecStart =
|
||||||
|
pkgs.writeHaskell "synapse-cleanup"
|
||||||
{
|
{
|
||||||
libraries =
|
libraries =
|
||||||
builtins.attrValues pkgs.myHaskellScriptPackages
|
builtins.attrValues pkgs.myHaskellScriptPackages
|
||||||
|
@ -80,7 +81,8 @@ in {
|
||||||
matrix-synapse = {
|
matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = let
|
settings = let
|
||||||
server-secrets = pkgs.privateValue
|
server-secrets =
|
||||||
|
pkgs.privateValue
|
||||||
{
|
{
|
||||||
registration_shared_secret = "";
|
registration_shared_secret = "";
|
||||||
macaroon_secret_key = "";
|
macaroon_secret_key = "";
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
pass-clip = self.callPackage
|
pass-clip =
|
||||||
|
self.callPackage
|
||||||
({
|
({
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
|
|
@ -6,10 +6,13 @@ let
|
||||||
explicitUsePrivate = builtins.getEnv var == "true";
|
explicitUsePrivate = builtins.getEnv var == "true";
|
||||||
explicitNotUsePrivate = builtins.getEnv var == "false";
|
explicitNotUsePrivate = builtins.getEnv var == "false";
|
||||||
usePrivate = !explicitNotUsePrivate && (explicitUsePrivate || privateExists);
|
usePrivate = !explicitNotUsePrivate && (explicitUsePrivate || privateExists);
|
||||||
withSecrets = builtins.trace
|
withSecrets =
|
||||||
(if usePrivate
|
builtins.trace
|
||||||
|
(
|
||||||
|
if usePrivate
|
||||||
then assert privateExists; "Building _with_ secrets!"
|
then assert privateExists; "Building _with_ secrets!"
|
||||||
else "Building _without_ secrets!")
|
else "Building _without_ secrets!"
|
||||||
|
)
|
||||||
usePrivate;
|
usePrivate;
|
||||||
in {
|
in {
|
||||||
inherit withSecrets;
|
inherit withSecrets;
|
||||||
|
|
Loading…
Reference in a new issue