From 519c79c49a10547bb6f14e6ca956108dbe2b85e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Wed, 9 Mar 2022 22:26:40 +0000
Subject: [PATCH] more consistent font usage

---
 nixos/i3/dunst.nix |  5 ++-
 nixos/i3/i3.nix    | 88 +++++++++++++++++++++++++++++-----------------
 nixos/i3/rofi.nix  |  2 +-
 3 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/nixos/i3/dunst.nix b/nixos/i3/dunst.nix
index ef3180bd..fd675000 100644
--- a/nixos/i3/dunst.nix
+++ b/nixos/i3/dunst.nix
@@ -1,10 +1,9 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, ... }: {
   services.dunst = {
     enable = true;
     settings = {
       global = {
-        font = "Fira Code Nerd Font 10";
+        font = "Berkeley Mono 10";
         sort = "yes";
         indicate_hidden = "yes";
         word_wrap = "yes";
diff --git a/nixos/i3/i3.nix b/nixos/i3/i3.nix
index 15da7d6d..2ab9f65f 100644
--- a/nixos/i3/i3.nix
+++ b/nixos/i3/i3.nix
@@ -1,22 +1,38 @@
 { config, pkgs, ... }:
-let
-  mod = "Mod4";
-in
-{
-  home.packages = with pkgs; [
-    font-awesome-ttf
-    intel-gpu-tools
-  ];
+let mod = "Mod4";
+in {
+  home.packages = with pkgs; [ font-awesome-ttf intel-gpu-tools ];
 
   xsession.windowManager.i3 = {
     enable = true;
     config = {
       startup = [
-        { command = "exec hsetroot -solid '#002b36'"; always = true; notification = false; }
-        { command = "exec setxkbmap -layout pl"; always = true; notification = false; }
-        { command = "exec $HOME/dev/dotfiles/nixos/i3/battery-popup.sh"; always = false; notification = false; }
-        { command = "exec xdg-mime default org.gnome.Evince.desktop application/pdf"; always = false; notification = false; }
-        { command = "exec ${pkgs.autorandr}/bin/autorandr -c"; always = false; notification = false; }
+        {
+          command = "exec hsetroot -solid '#002b36'";
+          always = true;
+          notification = false;
+        }
+        {
+          command = "exec setxkbmap -layout pl";
+          always = true;
+          notification = false;
+        }
+        {
+          command = "exec $HOME/dev/dotfiles/nixos/i3/battery-popup.sh";
+          always = false;
+          notification = false;
+        }
+        {
+          command =
+            "exec xdg-mime default org.gnome.Evince.desktop application/pdf";
+          always = false;
+          notification = false;
+        }
+        {
+          command = "exec ${pkgs.autorandr}/bin/autorandr -c";
+          always = false;
+          notification = false;
+        }
       ];
 
       window = {
@@ -26,19 +42,17 @@ in
       };
 
       workspaceLayout = "tabbed";
-      bars = [
-        {
-          position = "top";
-          colors.background = "#001e26";
-          colors.statusline = "#708183";
-          fonts = {
-            names = [ "Fira Code Nerd Font" ];
-            size = 10.0;
-          };
+      bars = [{
+        position = "top";
+        colors.background = "#001e26";
+        colors.statusline = "#708183";
+        fonts = {
+          names = [ "Berkeley Mono" ];
+          size = 10.0;
+        };
 
-          trayOutput = "primary";
-        }
-      ];
+        trayOutput = "primary";
+      }];
 
       modifier = mod;
       keybindings = {
@@ -49,17 +63,25 @@ in
         "${mod}+Shift+l" = "exec physlock -d";
         "${mod}+Return" = "exec i3-sensible-terminal";
 
-        "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%";
-        "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  -5%";
-        "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@  toggle";
-        "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@  toggle";
+        "XF86AudioRaiseVolume" =
+          "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%";
+        "XF86AudioLowerVolume" =
+          "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  -5%";
+        "XF86AudioMute" =
+          "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@  toggle";
+        "XF86AudioMicMute" =
+          "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@  toggle";
 
-        "XF86MonBrightnessUp" = "exec light -s sysfs/backlight/intel_backlight -A 5";
-        "XF86MonBrightnessDown" = "exec light -s sysfs/backlight/intel_backlight -U 5";
+        "XF86MonBrightnessUp" =
+          "exec light -s sysfs/backlight/intel_backlight -A 5";
+        "XF86MonBrightnessDown" =
+          "exec light -s sysfs/backlight/intel_backlight -U 5";
 
-        "Print" = "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i";
+        "Print" =
+          "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i";
 
-        "${mod}+r" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
+        "${mod}+r" =
+          "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
         "${mod}+c" = "exec ${pkgs.clipmenu}/bin/clipmenu";
         "${mod}+q" = "kill";
         "${mod}+f" = "fullscreen toggle";
diff --git a/nixos/i3/rofi.nix b/nixos/i3/rofi.nix
index 88802839..f14a97e0 100644
--- a/nixos/i3/rofi.nix
+++ b/nixos/i3/rofi.nix
@@ -3,7 +3,7 @@
 {
   programs.rofi = {
     enable = true;
-    font = "Fira Code Nerd Font 16";
+    font = "Berkeley Mono 16";
     theme = "solarized";
   };
 }