summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/2configs/xserver/Xresources.nix116
-rw-r--r--tv/2configs/xserver/default.nix5
-rw-r--r--tv/3modules/Xresources.nix39
-rw-r--r--tv/3modules/default.nix1
4 files changed, 103 insertions, 58 deletions
diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix
index d032efc7d..679b77dcc 100644
--- a/tv/2configs/xserver/Xresources.nix
+++ b/tv/2configs/xserver/Xresources.nix
@@ -1,58 +1,60 @@
-{ config, lib, pkgs, ... }:
-
with import <stockholm/lib>;
-
-pkgs.writeText "Xresources" /* xdefaults */ ''
- URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
- URxvt*eightBitInput: false
- URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
- URxvt*boldFont: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
- URxvt*scrollBar: false
- URxvt*background: #050505
- URxvt*foreground: #d0d7d0
- URxvt*cursorColor: #f042b0
- URxvt*cursorColor2: #f0b000
- URxvt*cursorBlink: off
- URxvt*jumpScroll: true
- URxvt*allowSendEvents: false
- URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48
- URxvt*cutNewline: False
- URxvt*cutToBeginningOfLine: False
-
- URxvt*color0: #232342
- URxvt*color3: #c07000
- URxvt*color4: #4040c0
- URxvt*color7: #c0c0c0
- URxvt*color8: #707070
- URxvt*color9: #ff6060
- URxvt*color10: #70ff70
- URxvt*color11: #ffff70
- URxvt*color12: #7070ff
- URxvt*color13: #ff50ff
- URxvt*color14: #70ffff
- URxvt*color15: #ffffff
-
- URxvt*iso14755: False
-
- URxvt*urgentOnBell: True
- URxvt*visualBell: True
-
- ! ref https://github.com/muennich/urxvt-perls
- URxvt*perl-ext: default,url-select
- URxvt*keysym.M-u: perl:url-select:select_next
- URxvt*url-select.launcher: /etc/per-user/${config.krebs.build.user.name}/bin/ff -new-tab
- URxvt*url-select.underline: true
- URxvt*colorUL: #4682B4
- URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
- URxvt*saveLines: 10000
-
- root-urxvt*background: #230000
- root-urxvt*foreground: #e0c0c0
- root-urxvt*BorderColor: #400000
- root-urxvt*color0: #800000
-
- fzmenu-urxvt*background: rgb:42/23/42
- fzmenu-urxvt*externalBorder: 1
- fzmenu-urxvt*geometry: 70x9
- fzmenu-urxvt*internalBorder: 1
-''
+{ config, pkgs, ... }: {
+
+ tv.Xresources = {
+ "URxvt*cutchars" = ''"\\`\"'&()*,;<=>?@[]^{|}‘’"'';
+ "URxvt*eightBitInput" = "false";
+ "URxvt*font" = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
+ "URxvt*boldFont" = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
+ "URxvt*scrollBar" = "false";
+ "URxvt*background" = "#050505";
+ "URxvt*foreground" = "#d0d7d0";
+ "URxvt*cursorColor" = "#f042b0";
+ "URxvt*cursorColor2" = "#f0b000";
+ "URxvt*cursorBlink" = "off";
+ "URxvt*jumpScroll" = "true";
+ "URxvt*allowSendEvents" = "false";
+ "URxvt*charClass" = "33:48,37:48,45-47:48,64:48,38:48,61:48,63:48";
+ "URxvt*cutNewline" = "False";
+ "URxvt*cutToBeginningOfLine" = "False";
+
+ "URxvt*color0" = "#232342";
+ "URxvt*color3" = "#c07000";
+ "URxvt*color4" = "#4040c0";
+ "URxvt*color7" = "#c0c0c0";
+ "URxvt*color8" = "#707070";
+ "URxvt*color9" = "#ff6060";
+ "URxvt*color10" = "#70ff70";
+ "URxvt*color11" = "#ffff70";
+ "URxvt*color12" = "#7070ff";
+ "URxvt*color13" = "#ff50ff";
+ "URxvt*color14" = "#70ffff";
+ "URxvt*color15" = "#ffffff";
+
+ "URxvt*iso14755" = "False";
+
+ "URxvt*urgentOnBell" = "True";
+ "URxvt*visualBell" = "True";
+
+ # ref https://github.com/muennich/urxvt-perls
+ "URxvt*perl-ext" = "default,url-select";
+ "URxvt*keysym.M-u" = "perl:url-select:select_next";
+ "URxvt*url-select.launcher" =
+ "/etc/per-user/${config.krebs.build.user.name}/bin/ff -new-tab";
+ "URxvt*url-select.underline" = "true";
+ "URxvt*colorUL" = "#4682B4";
+ "URxvt.perl-lib" = "${pkgs.urxvt_perls}/lib/urxvt/perl";
+ "URxvt*saveLines" = "10000";
+
+ "root-urxvt*background" = "#230000";
+ "root-urxvt*foreground" = "#e0c0c0";
+ "root-urxvt*BorderColor" = "#400000";
+ "root-urxvt*color0" = "#800000";
+
+ "fzmenu-urxvt*background" = "rgb:42/23/42";
+ "fzmenu-urxvt*externalBorder" = "1";
+ "fzmenu-urxvt*geometry" = "70x9";
+ "fzmenu-urxvt*internalBorder" = "1";
+ };
+
+}
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 051e12ef0..e2160258c 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -9,6 +9,10 @@ let
};
in {
+ imports = [
+ ./Xresources.nix
+ ];
+
environment.systemPackages = [
pkgs.ff
pkgs.font-size
@@ -73,7 +77,6 @@ in {
${pkgs.xorg.xhost}/bin/xhost -LOCAL:
} &
${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
- ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
wait
'';
diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix
new file mode 100644
index 000000000..983b8bc2e
--- /dev/null
+++ b/tv/3modules/Xresources.nix
@@ -0,0 +1,39 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: let
+ cfg = {
+ enable = config.tv.Xresources != {};
+ user = config.krebs.build.user;
+ };
+in {
+ options.tv.Xresources = mkOption {
+ default = {};
+ type = types.attrsOf types.str;
+ };
+ config = {
+ nixpkgs.overlays = singleton (self: super: {
+ tv = super.tv or {} // {
+ Xresources =
+ self.writeText "Xresources"
+ (concatStrings (mapAttrsToList (name: value: /* xdefaults */ ''
+ ${name}: ${value}
+ '') config.tv.Xresources));
+ };
+ });
+ systemd.services.${if cfg.enable then "Xresources" else null} = {
+ wantedBy = [ "graphical.target" ];
+ after = [ "xserver.service" ];
+ requires = [ "xserver.service" ];
+ environment = {
+ DISPLAY = ":${toString config.services.xserver.display}";
+ };
+ serviceConfig = {
+ ExecStart = "${pkgs.xorg.xrdb}/bin/xrdb ${pkgs.tv.Xresources}";
+ RemainAfterExit = true;
+ SyslogIdentifier = "Xresources";
+ Type = "oneshot";
+ User = cfg.user.name;
+ WorkingDirectory = cfg.user.home;
+ };
+ };
+ };
+}
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 67fb3f650..edaf50f03 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -7,5 +7,6 @@
./iptables.nix
./slock.nix
./x0vncserver.nix
+ ./Xresources.nix
];
}