summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-06 08:30:54 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-06 08:30:54 +0100
commite435d8fe627646e485adaae36d08fc115c22fa20 (patch)
treec86bcf0b408ec62dc42396ffd2fd1ac3af3b5dd8
parente019e80eac1b03a5c177ef5d358b720bdbc774ac (diff)
downloadnixos-e435d8fe627646e485adaae36d08fc115c22fa20.tar
nixos-e435d8fe627646e485adaae36d08fc115c22fa20.tar.gz
nixos-e435d8fe627646e485adaae36d08fc115c22fa20.tar.bz2
nixos-e435d8fe627646e485adaae36d08fc115c22fa20.tar.xz
nixos-e435d8fe627646e485adaae36d08fc115c22fa20.zip
gkleen@sif: ...
-rw-r--r--accounts/gkleen@sif/default.nix13
-rw-r--r--accounts/gkleen@sif/dunst-settings.nix2
-rw-r--r--accounts/gkleen@sif/taffybar/src/taffybar.hs4
3 files changed, 15 insertions, 4 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e94c0e8c..64e1e6c0 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -226,7 +226,11 @@ in {
226 226
227 gtk = { 227 gtk = {
228 enable = true; 228 enable = true;
229 font.name = "DejaVu Sans 6"; 229 font = {
230 package = pkgs.fira;
231 name = "Fira Sans";
232 size = 6;
233 };
230 theme = { 234 theme = {
231 package = pkgs.equilux-theme; 235 package = pkgs.equilux-theme;
232 name = "Equilux-compact"; 236 name = "Equilux-compact";
@@ -254,6 +258,13 @@ in {
254 ${pkgs.xorg.xset}/bin/xset s 590 10 258 ${pkgs.xorg.xset}/bin/xset s 590 10
255 ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key' 259 ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key'
256 ''; 260 '';
261
262 pointerCursor = {
263 package = pkgs.vanilla-dmz;
264 defaultCursor = "left_ptr";
265 name = "Vanilla-DMZ-AA";
266 size = 32;
267 };
257 }; 268 };
258 269
259 xresources.properties = import ./xresources.nix; 270 xresources.properties = import ./xresources.nix;
diff --git a/accounts/gkleen@sif/dunst-settings.nix b/accounts/gkleen@sif/dunst-settings.nix
index 113f0ce8..0cf47fc8 100644
--- a/accounts/gkleen@sif/dunst-settings.nix
+++ b/accounts/gkleen@sif/dunst-settings.nix
@@ -1,7 +1,7 @@
1{ pkgs, ... }: 1{ pkgs, ... }:
2{ 2{
3 global = { 3 global = {
4 font = "Monospace 6"; 4 font = "Fira Sans 6";
5 markup = "full"; 5 markup = "full";
6 format = "<i>%s</i> %p\\n%b"; 6 format = "<i>%s</i> %p\\n%b";
7 alignment = "left"; 7 alignment = "left";
diff --git a/accounts/gkleen@sif/taffybar/src/taffybar.hs b/accounts/gkleen@sif/taffybar/src/taffybar.hs
index dd713ea7..c683f035 100644
--- a/accounts/gkleen@sif/taffybar/src/taffybar.hs
+++ b/accounts/gkleen@sif/taffybar/src/taffybar.hs
@@ -58,8 +58,8 @@ exampleTaffybarConfig =
58 { getMenuLabel = truncatedGetMenuLabel 80 58 { getMenuLabel = truncatedGetMenuLabel 80
59 , getActiveLabel = truncatedGetActiveLabel 80 59 , getActiveLabel = truncatedGetActiveLabel 80
60 } 60 }
61 worktime = commandRunnerNew 150 "worktime" [] "worktime" 61 worktime = commandRunnerNew 15 "worktime" [] "worktime"
62 worktimeToday = commandRunnerNew 150 "worktime" ["today"] "worktime today" 62 worktimeToday = commandRunnerNew 15 "worktime" ["today"] "worktime today"
63 -- See https://github.com/taffybar/gtk-sni-tray#statusnotifierwatcher 63 -- See https://github.com/taffybar/gtk-sni-tray#statusnotifierwatcher
64 -- for a better way to set up the sni tray 64 -- for a better way to set up the sni tray
65 -- tray = sniTrayThatStartsWatcherEvenThoughThisIsABadWayToDoIt 65 -- tray = sniTrayThatStartsWatcherEvenThoughThisIsABadWayToDoIt