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 | c82942bb7b872765d109d5cc5fccec5f945f1200 (patch) | |
tree | c3fc33486d8743a7e7d6000db4c9242d0bb2370f /tv/2configs/xserver | |
parent | de73040c985a595111cc3500d70a8c60f9f960e3 (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 8e8e3df..8e555e9 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 8bedb0e..f534b55 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 0000000..dc598c5 --- /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 10e450d..eb862f8 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 2d504e1..3502c63 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 99038e5..3fdfebf 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; |