Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv: use body instead of out

Browse Source
This commit is contained in:
tv 2017-01-05 21:03:23 +01:00
parent 62372f917e
commit ef757f6e37
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tv/2configs/git.nix
View File

@ -2,9 +2,9 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let {
out = { body = {
krebs.git = { krebs.git = {
enable = true; enable = true;
cgit = { cgit = {
@ -123,4 +123,4 @@ let
perm = fetch; perm = fetch;
}; };
in out }

7
tv/2configs/vim.nix
View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import <stockholm/lib>; with import <stockholm/lib>;
let let {
out = { body = {
environment.systemPackages = [ environment.systemPackages = [
vim vim
]; ];
@ -411,5 +411,4 @@ let
catch /^Vim\%((\a\+)\)\=:E484/ catch /^Vim\%((\a\+)\)\=:E484/
endtry endtry
''; '';
in }
out

16
tv/3modules/iptables.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import <stockholm/lib>; with import <stockholm/lib>;
let let {
cfg = config.tv.iptables; cfg = config.tv.iptables;
out = { body = {
options.tv.iptables = api; options.tv.iptables = api;
config = lib.mkIf cfg.enable imp; config = lib.mkIf cfg.enable imp;
}; };
@ -146,14 +146,4 @@ let
)} )}
COMMIT COMMIT
''; '';
in out }
#let
# cfg = config.tv.iptables;
# arg' = arg // { inherit cfg; };
#in
#
#{
# options.tv.iptables = import ./options.nix arg';
# config = lib.mkIf cfg.enable (import ./config.nix arg');
#}