diff options
-rw-r--r-- | tv/2configs/git.nix | 6 | ||||
-rw-r--r-- | tv/2configs/vim.nix | 7 | ||||
-rw-r--r-- | tv/3modules/iptables.nix | 16 |
3 files changed, 9 insertions, 20 deletions
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 48d738365..9ccb0a057 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -2,9 +2,9 @@ with import <stockholm/lib>; -let +let { - out = { + body = { krebs.git = { enable = true; cgit = { @@ -123,4 +123,4 @@ let perm = fetch; }; -in out +} diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index cc59a95a5..1ffafe9c9 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: with import <stockholm/lib>; -let - out = { +let { + body = { environment.systemPackages = [ vim ]; @@ -411,5 +411,4 @@ let catch /^Vim\%((\a\+)\)\=:E484/ endtry ''; -in -out +} diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix index 7276726ca..803ed6fbf 100644 --- a/tv/3modules/iptables.nix +++ b/tv/3modules/iptables.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: with import <stockholm/lib>; -let +let { cfg = config.tv.iptables; - out = { + body = { options.tv.iptables = api; config = lib.mkIf cfg.enable imp; }; @@ -146,14 +146,4 @@ let )} 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'); -#} +} |