summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/xresources.nix (renamed from lass/3modules/xresources.nix)0
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/urxvt.nix2
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/xserver/default.nix2
6 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 7a3c8ba4a..9c343309a 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -44,6 +44,7 @@ let
./tinc_graphs.nix
./urlwatch.nix
./repo-sync.nix
+ ./xresources.nix
./zones.nix
];
options.krebs = api;
diff --git a/lass/3modules/xresources.nix b/krebs/3modules/xresources.nix
index 017dbff2b..017dbff2b 100644
--- a/lass/3modules/xresources.nix
+++ b/krebs/3modules/xresources.nix
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9712bafff..0ff47407a 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -41,7 +41,7 @@ in {
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
};
};
- config.services.xresources.resources.X = ''
+ config.krebs.xresources.resources.X = ''
*.font: ${config.lass.fonts.regular}
*.boldFont: ${config.lass.fonts.bold}
*.italicFont: ${config.lass.fonts.italic}
@@ -113,6 +113,6 @@ in {
};
services.urxvtd.enable = true;
- services.xresources.enable = true;
+ krebs.xresources.enable = true;
lass.screenlock.enable = true;
}
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index ee50b3381..fc4537140 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
{
services.urxvtd.enable = true;
- services.xresources.resources.urxvt = ''
+ krebs.xresources.resources.urxvt = ''
URxvt*SaveLines: 4096
URxvt*scrollBar: false
URxvt*urgentOnBell: true
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 81b52c306..fd77b2262 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -12,6 +12,5 @@ _:
./umts.nix
./usershadow.nix
./xserver
- ./xresources.nix
];
}
diff --git a/lass/3modules/xserver/default.nix b/lass/3modules/xserver/default.nix
index 92061c753..d16f89f45 100644
--- a/lass/3modules/xserver/default.nix
+++ b/lass/3modules/xserver/default.nix
@@ -76,7 +76,7 @@ let
];
};
};
- services.xresources.resources.dpi = ''
+ krebs.xresources.resources.dpi = ''
${optionalString (xcfg.dpi != null) "Xft.dpi: ${toString xcfg.dpi}"}
'';
systemd.services.urxvtd = {