From e65dac849a8658d0fb9b2943af8f5d4bf29ef4a2 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Thu, 21 Sep 2023 13:34:44 +0200
Subject: [PATCH] refactor: some formatting

---
 modules/optional/graphical/fonts.nix |  8 +++++---
 users/modules/uid.nix                | 10 ++++------
 users/myuser/graphical/kitty.nix     | 20 ++++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/optional/graphical/fonts.nix b/modules/optional/graphical/fonts.nix
index ba7b21c..fa4e969 100644
--- a/modules/optional/graphical/fonts.nix
+++ b/modules/optional/graphical/fonts.nix
@@ -31,14 +31,16 @@
         </fontconfig>
       '';
       defaultFonts = {
-        sansSerif = lib.mkBefore ["Segoe UI"];
-        monospace = ["FiraCode Nerd Font"];
         emoji = ["Segoe UI Emoji" "Noto Fonts Emoji"];
+        monospace = ["FiraCode Nerd Font"];
+        sansSerif = lib.mkBefore ["Segoe UI"];
+        serif = ["Source Serif Pro"];
       };
     };
 
     packages = with pkgs; [
-      (nerdfonts.override {fonts = ["FiraCode"];})
+      (nerdfonts.override {fonts = ["FiraCode" "FiraMono" "SourceCodePro" "JetBrainsMono"];})
+      dejavu_fonts
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
diff --git a/users/modules/uid.nix b/users/modules/uid.nix
index d3edd03..8bedf51 100644
--- a/users/modules/uid.nix
+++ b/users/modules/uid.nix
@@ -3,12 +3,10 @@
   lib,
   ...
 }: {
-  options = {
-    home.uid = lib.mkOption {
-      type = lib.types.int;
-      example = 1000;
-      description = "The user's uid.";
-    };
+  options.home.uid = lib.mkOption {
+    type = lib.types.int;
+    example = 1000;
+    description = "The user's uid.";
   };
   config = {
     assertions = [
diff --git a/users/myuser/graphical/kitty.nix b/users/myuser/graphical/kitty.nix
index b2fe5e1..3f2bf4f 100644
--- a/users/myuser/graphical/kitty.nix
+++ b/users/myuser/graphical/kitty.nix
@@ -19,21 +19,21 @@
       background = "#090a0c";
       cursor = "#cccccc";
 
-      color0 = " #090a0c";
-      color8 = " #393e48";
-      color1 = " #b2555d";
-      color9 = " #e06c75";
-      color2 = " #81a566";
+      color0 = "#090a0c";
+      color8 = "#393e48";
+      color1 = "#b2555d";
+      color9 = "#e06c75";
+      color2 = "#81a566";
       color10 = "#98c379";
-      color3 = " #ccab6e";
+      color3 = "#ccab6e";
       color11 = "#e6c17c";
-      color4 = " #5395cc";
+      color4 = "#5395cc";
       color12 = "#61afef";
-      color5 = " #9378de";
+      color5 = "#9378de";
       color13 = "#c678dd";
-      color6 = " #56b6c2";
+      color6 = "#56b6c2";
       color14 = "#56b6c2";
-      color7 = " #979eab";
+      color7 = "#979eab";
       color15 = "#abb2bf";
 
       selection_foreground = "#282c34";