diff options
author | tv <tv@krebsco.de> | 2022-12-09 01:31:56 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2022-12-09 01:34:31 +0100 |
commit | 6d64096cd99db27357bf2d038bdfdfc2d3a3aeae (patch) | |
tree | e1361555d8e32ec72ea2170852be432d347b381e /tv/2configs/xserver | |
parent | e56f5d7e61e46852ebe1b4904d6f4085091bd469 (diff) |
tv: normalize lib imports
Diffstat (limited to 'tv/2configs/xserver')
-rw-r--r-- | tv/2configs/xserver/Xmodmap.nix | 2 | ||||
-rw-r--r-- | tv/2configs/xserver/default.nix | 5 | ||||
l--------- | tv/2configs/xserver/lib | 1 | ||||
-rw-r--r-- | tv/2configs/xserver/sxiv.nix | 2 | ||||
-rw-r--r-- | tv/2configs/xserver/urxvt.nix | 2 | ||||
-rw-r--r-- | tv/2configs/xserver/xserver.conf.nix | 5 |
6 files changed, 8 insertions, 9 deletions
diff --git a/tv/2configs/xserver/Xmodmap.nix b/tv/2configs/xserver/Xmodmap.nix index 8e8e3dfdd..8e555e927 100644 --- a/tv/2configs/xserver/Xmodmap.nix +++ b/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 diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 8bedb0e81..f534b557e 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -1,6 +1,5 @@ -{ config, pkgs, ... }@args: -with import <stockholm/lib>; -let +with import ./lib; +{ config, pkgs, ... }@args: let cfg = { cacheDir = cfg.dataDir; configDir = "/var/empty"; diff --git a/tv/2configs/xserver/lib b/tv/2configs/xserver/lib new file mode 120000 index 000000000..dc598c56d --- /dev/null +++ b/tv/2configs/xserver/lib @@ -0,0 +1 @@ +../lib
\ No newline at end of file diff --git a/tv/2configs/xserver/sxiv.nix b/tv/2configs/xserver/sxiv.nix index 10e450da4..eb862f887 100644 --- a/tv/2configs/xserver/sxiv.nix +++ b/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 { diff --git a/tv/2configs/xserver/urxvt.nix b/tv/2configs/xserver/urxvt.nix index 2d504e165..3502c6356 100644 --- a/tv/2configs/xserver/urxvt.nix +++ b/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 { diff --git a/tv/2configs/xserver/xserver.conf.nix b/tv/2configs/xserver/xserver.conf.nix index 99038e5fc..3fdfebf1b 100644 --- a/tv/2configs/xserver/xserver.conf.nix +++ b/tv/2configs/xserver/xserver.conf.nix @@ -1,6 +1,5 @@ -{ config, lib, pkgs, ... }: - -with import <stockholm/lib>; +with import ./lib; +{ config, pkgs, ... }: let cfg = config.services.xserver; |