summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/common.nix6
-rw-r--r--lib/linux.nix15
-rw-r--r--machines/helium.nix9
3 files changed, 24 insertions, 6 deletions
diff --git a/lib/common.nix b/lib/common.nix
index 4ea80a7..b5f31dc 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -1,11 +1,11 @@
{ pkgs, lib, ... }:
let
+ fontSize = 12;
locale = "en_US.UTF-8";
gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
homedir = builtins.getEnv "HOME";
-in
-{
+in {
nixpkgs.overlays = [ (import ../overlay.nix) ];
home = {
stateVersion = "18.09";
@@ -228,7 +228,7 @@ in
urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in {
enable = true;
fonts = [
- (font 6)
+ (font fontSize)
"xft:Noto Emoji"
];
keybindings = {
diff --git a/lib/linux.nix b/lib/linux.nix
index f5bad73..fe135d3 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -1,6 +1,7 @@
{ pkgs, lib, ... }:
let
+ fontSize = 12;
homedir = builtins.getEnv "HOME";
hostname = lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
@@ -105,11 +106,19 @@ in
};
fonts.fontconfig.enable = true;
+ gtk.enable = false; # this fails because of some missing service file
+ gtk.font.name = "Fira Sans";
+ gtk.font.size = fontSize;
+ gtk.font.package = pkgs.fira;
+ gtk.theme.name = "Breeze";
+ gtk.iconTheme.name = "hicolor";
+ gtk.cursorTheme.name = "breeze_cursors";
+
xresources = {
properties = {
- "XTerm*font" = "-*-FiraMono-medium-r-normal--10-*-*-*-*-*-iso10646-1";
+ "XTerm*font" = "-*-FiraMono-medium-r-normal--${toString fontSize}-*-*-*-*-*-iso10646-1";
"XTerm*faceName" = "FireMono";
- "XTerm*faceSize" = "10";
+ "XTerm*faceSize" = toString fontSize;
"XTerm*termName" = "xterm-256color";
"XTerm*metaSendsEscape" = true;
"XTerm*utf8" = true;
@@ -142,7 +151,7 @@ in
config = {
"bar/top" = {
background = colors."${theme}".background;
- font-0 = "FiraSans:size=16";
+ font-0 = "FiraSans:size=${toString fontSize}";
font-1 = "Font Awesome 5:pixelsize=11;1";
font-2 = "MaterialIcons:size=10:antialias=false;2";
foreground = colors."${theme}".foreground;
diff --git a/machines/helium.nix b/machines/helium.nix
index f60b0c8..8b6a42c 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -7,6 +7,8 @@ let
in {
imports = [ ./users.nix ];
+ console.font = "${pkgs.fira-mono}/share/fonts/opentype/FiraMono-Regular.otf";
+
security.sudo.wheelNeedsPassword = true;
security.pam.yubico.enable = true;
security.pam.yubico.debug = false;
@@ -46,6 +48,11 @@ in {
fira fira-code fira-code-symbols
];
+ environment.variables = {
+ GDK_SCALE = "2";
+ GDK_DPI_SCALE = "0.5";
+ };
+
environment.systemPackages = with pkgs; [
yubioath-desktop
yubico-pam
@@ -60,6 +67,7 @@ in {
};
};
+ hardware.video.hidpi.enable = true;
hardware.enableAllFirmware = true;
hardware.bluetooth.enable = true;
hardware.bluetooth.package = pkgs.bluezFull;
@@ -104,6 +112,7 @@ in {
xserver.layout = "us";
xserver.libinput.enable = true;
xserver.xkbOptions = "caps:ctrl_modifier";
+ xserver.dpi = 331;
xserver.displayManager.sddm.enable = true;
xserver.windowManager.xmonad.enable = true;