From 69bbe8c4c6252baa74931e6ad28f788654776691 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:15:19 -0500
Subject: Trying to fix font sizing problems

---
 lib/linux.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'lib/linux.nix')

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;
-- 
cgit v1.2.3


From 03577d4d81ccc954da1960e22aa7f75109f862b6 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:16:16 -0500
Subject: Disable redshift

Set it at the system level instead
---
 lib/linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/linux.nix')

diff --git a/lib/linux.nix b/lib/linux.nix
index fe135d3..5ded700 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -309,7 +309,7 @@ in
     };
 
     redshift = {
-      enable = true;
+      enable = false;
       latitude = "40.80";
       longitude = "-81.52";
       temperature = {
-- 
cgit v1.2.3


From 9a6262c9f4e173034b83233fc08aacae0e675b73 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:16:54 -0500
Subject: Add xsel

---
 lib/linux.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/linux.nix')

diff --git a/lib/linux.nix b/lib/linux.nix
index 5ded700..a90b7fb 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -94,6 +94,7 @@ in
       xdotool
       xlayoutdisplay
       xorg.xmodmap
+      xsel
       xterm
       yank
       youtube-dl
-- 
cgit v1.2.3


From 15dcb4f3eee0d52c6f8f0d62e01a32007631e489 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:48:07 -0500
Subject: Fix size issue on laptop by setting dpi

The other changes served to set fontSize centrally, and adjust it for urxvt
which doesn't behave for some reason.
---
 lib/linux.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/linux.nix')

diff --git a/lib/linux.nix b/lib/linux.nix
index a90b7fb..fd0f887 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -1,10 +1,8 @@
 { pkgs, lib, ... }:
 
 let
-  fontSize = 12;
-  homedir = builtins.getEnv "HOME";
+  inherit (import ./const.nix) fontSize homedir gpgid;
   hostname = lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
-  gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
   base16-scheme = "atelier-sulphurpool";
   base16-scheme-filename = lib.strings.concatStrings (lib.strings.splitString "-" base16-scheme);
   theme = lib.removeSuffix "\n" (builtins.readFile "${homedir}/.local/share/xtheme");
-- 
cgit v1.2.3


From 92521e0c88bf49eb5e1bd6c59c2d9eea32bac1be Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 15 Nov 2022 09:54:24 -0500
Subject: moved ledger stuff to ~/fund

Change-Id: If0996e11fa8b6a17fb42f9ce264f14187b22122c
---
 lib/linux.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib/linux.nix')

diff --git a/lib/linux.nix b/lib/linux.nix
index fd0f887..7da8c2f 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -98,9 +98,6 @@ in
       youtube-dl
       yubioath-desktop
       zathura
-
-      # languages i regularly use
-      (haskellPackages.ghcWithPackages (a: with a; [hledger rainbow])) # for hledger scripting
     ];
   };
   fonts.fontconfig.enable = true;
-- 
cgit v1.2.3