tv: normalize lib imports

tv/1systems/alnus/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/hw/x220.nix>

tv/1systems/alnus/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/au/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/bu/config.nix

@@ -1,7 +1,5 @@
-{ config, pkgs, ... }: let
+with import ./lib;
-  lib = import ../../../lib;
+{ config, pkgs, ... }: {
-in {
-
   imports = [
     ./disks.nix
     <stockholm/tv>

tv/1systems/bu/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/mu/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/br.nix>

tv/1systems/mu/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/nomic/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.nomic;
 
   imports = [

tv/1systems/nomic/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/querel/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/retiolum.nix>

tv/1systems/querel/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/wu/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ../lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.wu;
 
   imports = [

tv/1systems/wu/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/xu/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.xu;
 
   imports = [

tv/1systems/xu/lib

@@ -0,0 +1 @@
+../lib

tv/1systems/zu/config.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.zu;
 
   imports = [

tv/2configs/backup.nix

@@ -1,6 +1,5 @@
-{ config, lib, ... }:
+with import ./lib;
-with import <stockholm/lib>;
+{ config, pkgs, ... }: {
-{
   krebs.backup.plans = {
   } // mapAttrs (_: recursiveUpdate {
     snapshots = {

tv/2configs/bash/default.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   programs.bash = {
     interactiveShellInit = /* sh */ ''
       HISTCONTROL='erasedups:ignorespace'

tv/2configs/bash/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/binary-cache/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with import <stockholm/lib>;
+{ config, lib, pkgs, ... }: with import ./lib;
 {
   environment.etc."binary-cache.pubkey".text =
     config.krebs.build.host.binary-cache.pubkey;

tv/2configs/binary-cache/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/br.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
 
   imports = [

tv/2configs/default.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   boot.tmpOnTmpfs = true;
 
   krebs.enable = true;

tv/2configs/exim-retiolum.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   environment.systemPackages = [
     pkgs.eximlog
   ];

tv/2configs/exim-smarthost.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   environment.systemPackages = [
     pkgs.eximlog
   ];

tv/2configs/gitconfig.nix

@@ -1,8 +1,5 @@
-{ config, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   environment.etc.gitconfig.text = ''
     [alias]
       patch = !${pkgs.git}/bin/git --no-pager diff --no-color

tv/2configs/gitrepos.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: let {
-with import <stockholm/lib>;
-
-let {
 
   body = {
 

tv/2configs/htop.nix

@@ -1,8 +1,5 @@
-{ pkgs, ... }:
+with import ./lib;
-
+{ pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   nixpkgs.config.packageOverrides = super: {
     htop = pkgs.symlinkJoin {
       name = "htop";

tv/2configs/hw/AO753.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   imports = [
     ../smartd.nix
 

tv/2configs/hw/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/hw/w110er.nix

@@ -1,6 +1,5 @@
-{ pkgs, ... }: let
+with import ./lib;
-  lib = import <stockholm/lib>;
+{ pkgs, ... }: {
-in {
   imports = [
     ../smartd.nix
     {

tv/2configs/hw/x220.nix

@@ -1,7 +1,5 @@
-{ config, pkgs, ... }: let
+with import ./lib;
-  lib = import <stockholm/lib>;
+{ config, pkgs, ... }: {
-in
-{
   imports = [
     ../smartd.nix
     {

tv/2configs/imgur.nix

@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   services.nginx.virtualHosts."ni.r" = {
     locations."/image" = {
       extraConfig = /* nginx */ ''

tv/2configs/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/nginx/default.nix

@@ -1,8 +1,5 @@
-{ config, lib, ... }:
+with import ./lib;
-
+{ config, ... }: {
-with import <stockholm/lib>;
-
-{
   services.nginx = {
     enableReload = true;
 

tv/2configs/nginx/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/nginx/public_html.nix

@@ -1,8 +1,5 @@
-{ config, lib, ... }:
+with import ./lib;
-
+{ config, ... }: {
-with import <stockholm/lib>;
-
-{
   services.nginx = {
     enable = true;
     virtualHosts.default = {

tv/2configs/pki/default.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
 
   certFile = config.environment.etc."ssl/certs/ca-certificates.crt".source;

tv/2configs/pki/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/ppp.nix

@@ -1,5 +1,5 @@
+with import ./lib;
 { config, pkgs, ... }: let
-  lib = import <stockholm/lib>;
   cfg = {
     pin = "@${toString <secrets/o2.pin>}";
     ttys.ppp = "/dev/ttyACM0";

tv/2configs/pulse.nix

@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: let
-with import <stockholm/lib>;
-let
   pkg = pkgs.pulseaudio;
   runDir = "/run/pulse";
 

tv/2configs/repo-sync/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/repo-sync/wiki.nix

@@ -1,6 +1,5 @@
-{ config, pkgs, ... }: let
+with import ./lib;
-  lib = import <stockholm/lib>;
+{ config, pkgs, ... }: {
-in {
   krebs.repo-sync.enable = true;
   krebs.repo-sync.repos.wiki.branches.hotdog = {
     origin.url = "http://cgit.hotdog.r/wiki";

tv/2configs/retiolum.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   krebs.tinc.retiolum = {
     enable = true;
     connectTo = filter (ne config.krebs.build.host.name) [

tv/2configs/ssh.nix

@@ -1,8 +1,5 @@
-{ config, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   # Override NixOS's "Allow DSA keys for now."
   environment.etc."ssh/ssh_config".text = mkForce ''
     AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}

tv/2configs/sshd.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, ... }: let
   cfg.host = config.krebs.build.host;
 in {

tv/2configs/urlwatch.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   exec = filename: args: url: {
     inherit url;

tv/2configs/vim.nix

@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: let {
-with import <stockholm/lib>;
-let {
   body = {
     environment.systemPackages = [
       vim-wrapper

tv/2configs/xdg.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: {
-with import <stockholm/lib>;
-
-{
   environment.variables.XDG_RUNTIME_DIR = "/run/xdg/$LOGNAME";
 
   systemd.tmpfiles.rules = let

tv/2configs/xp-332.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
 
   environment.etc."utsushi.conf".text = ''

tv/2configs/xserver/Xmodmap.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ./lib;
 
 pkgs.writeText "Xmodmap" ''
   !keycode 66 = Caps_Lock

tv/2configs/xserver/default.nix

@@ -1,6 +1,5 @@
-{ config, pkgs, ... }@args:
+with import ./lib;
-with import <stockholm/lib>;
+{ config, pkgs, ... }@args: let
-let
   cfg = {
     cacheDir = cfg.dataDir;
     configDir = "/var/empty";

tv/2configs/xserver/lib

@@ -0,0 +1 @@
+../lib

tv/2configs/xserver/sxiv.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg.user = config.krebs.build.user;
 in {

tv/2configs/xserver/urxvt.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg.user = config.krebs.build.user;
 in {

tv/2configs/xserver/xserver.conf.nix

@@ -1,6 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }:
-with import <stockholm/lib>;
 
 let
   cfg = config.services.xserver;

tv/3modules/Xresources.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg = {
     enable = config.services.xserver.enable && config.tv.Xresources != {};

tv/3modules/charybdis/config.nix

@@ -1,4 +1,4 @@
-{ config, ... }: with import <stockholm/lib>; let
+{ config, ... }: with import ./lib; let
   cfg = config.tv.charybdis;
 in toFile "charybdis.conf" ''
   /* doc/example.conf - brief example configuration file

tv/3modules/charybdis/default.nix

@@ -1,4 +1,5 @@
-{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
+with import ./lib;
+{ config, pkgs, ... }@args: let
   cfg = config.tv.charybdis;
 in {
   options.tv.charybdis = {

tv/3modules/charybdis/lib

@@ -0,0 +1 @@
+../lib

tv/3modules/dnsmasq.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, ... }: let
   cfg = config.tv.dnsmasq;
 in {

tv/3modules/ejabberd/default.nix

@@ -1,5 +1,5 @@
-{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
+with import ./lib;
-
+{ config, pkgs, ... }: let
   cfg = config.tv.ejabberd;
 
   gen-dhparam = pkgs.writeDash "gen-dhparam" ''

tv/3modules/ejabberd/lib

@@ -0,0 +1 @@
+../lib

tv/3modules/focus.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 {
   options.tv.focus.enable = mkEnableOption "tv.focus";
 }

tv/3modules/hosts.nix

@@ -1,8 +1,5 @@
-{ config, ... }:
+with import ./lib;
-
+{ config, ... }: {
-with import <stockholm/lib>;
-
-{
   options.tv.hosts = mkOption {
     type = types.attrsOf types.host;
     default =

tv/3modules/hw.nix

@@ -1,5 +1,5 @@
+with import ./lib;
 let
-  lib = import <stockholm/lib>;
   local.types.screen = lib.types.submodule {
     options.width = lib.mkOption {
       type = lib.types.uint;

tv/3modules/im.nix

@@ -1,6 +1,6 @@
+with import ./lib;
 { config, pkgs, ... }: let
   im = config.tv.im;
-  lib = import <stockholm/lib>;
 in {
   options = {
     tv.im.client.enable = lib.mkEnableOption "tv.im.client" // {

tv/3modules/iptables.nix

@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
+with import ./lib;
-
+{ config, pkgs, ... }: let {
-with import <stockholm/lib>;
-let {
   cfg = config.tv.iptables;
 
   body = {

tv/3modules/lib

@@ -0,0 +1 @@
+../lib

tv/3modules/org.freedesktop.machine1.host-shell.nix

@@ -1,4 +1,5 @@
-{ config, ... }: let lib = import ../../lib; in {
+with import ./lib;
+{ config, ... }: {
   options.org.freedesktop.machine1.host-shell.access = lib.mkOption {
     default = {};
     type =

tv/3modules/slock.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg = config.tv.slock;
 in {

tv/3modules/x0vncserver.nix

@@ -1,8 +1,6 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
-
   cfg = config.tv.x0vncserver;
-
 in {
   options.tv.x0vncserver = {
     display = mkOption {

tv/5pkgs/default.nix

@@ -1,4 +1,4 @@
-with import ../../lib;
+with import ./lib;
 let
   pushBack = x: xs:
     if elem x xs then

tv/5pkgs/haskell/default.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 let
   overrides = self: super:
     mapNixDir (path: self.callPackage path {}) [

tv/5pkgs/haskell/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/override/default.nix

@@ -1,4 +1,4 @@
-with import ../../../lib;
+with import ./lib;
 self: super:
 
 mapNixDir (path: import path self super) ./.

tv/5pkgs/override/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/rpi/default.nix

@@ -1,6 +1,4 @@
-let
+with import ./lib;
-  lib = import <stockholm/lib>;
-in
 
 self: super:
 

tv/5pkgs/rpi/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/simple/bash-fzf-history.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs
 
 , edit-key ? "ctrl-e"

tv/5pkgs/simple/default.nix

@@ -1,4 +1,4 @@
-with import ../../../lib;
+with import ./lib;
 
 self: super:
 

tv/5pkgs/simple/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/simple/pinentry-urxvt/default.nix

@@ -1,8 +1,7 @@
+with import ./lib;
 { pkgs, ... }@args:
 
 let
-  lib = import <stockholm/lib>;
-
   # config cannot be declared in the input attribute set because that would
   # cause callPackage to inject the wrong config.  Instead, get it from ...
   # via args.

tv/5pkgs/simple/pinentry-urxvt/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/simple/q/default.nix

@@ -1,5 +1,5 @@
-{ pkgs, ... }:
+with import ./lib;
-with import <stockholm/lib>;
+{ pkgs }:
 let
   q-cal = let
 

tv/5pkgs/simple/q/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/vim/default.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 
 self: super: {
   tv = super.tv // {

tv/5pkgs/vim/hack.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
 pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let

tv/5pkgs/vim/lib

@@ -0,0 +1 @@
+../lib

tv/5pkgs/vim/nix.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
 pkgs.tv.vim.makePlugin (pkgs.write "vim-syntax-nix-nested" {

tv/5pkgs/vim/vim.nix

@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
 pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let

tv/lib

@@ -0,0 +1 @@
+../lib