From 8be24b9a61db914d76c4d3df0df37b01f8d48aff Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Tue, 5 Nov 2024 11:38:53 +0100
Subject: [PATCH 01/18] Going to try this font again for a bit

---
 modules/font.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/font.nix b/modules/font.nix
index b06190b..d28c92e 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -56,9 +56,9 @@ in {
             "Noto Color Emoji"
           ];
           monospace = [
+            "Iosevka"
             "Fira Code"
             "JetBrains Mono"
-            "Iosevka"
             "IPAGothic"
             "Baekmuk Dotum"
             "Noto Color Emoji"

From e072bf4c45df1230d7ed573e1605568af84bc4fd Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sun, 1 Dec 2024 09:27:11 +0100
Subject: [PATCH 02/18] Removal of old stuff

---
 modules/audio.nix    | 1 -
 modules/graphics.nix | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/audio.nix b/modules/audio.nix
index 376af77..1a43980 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -6,7 +6,6 @@ in {
     enable = mkEnableOption "Enable all the audio daemons";
   };
   config = mkIf cfg.enable {
-    sound.enable = true;
     hardware.pulseaudio.enable = false;
     services.pipewire = {
       enable = true;
diff --git a/modules/graphics.nix b/modules/graphics.nix
index 1c5c6e9..0d350bc 100644
--- a/modules/graphics.nix
+++ b/modules/graphics.nix
@@ -13,7 +13,6 @@ in {
     hardware = {
       opengl = {
         enable = true;
-        driSupport = true;
         driSupport32Bit = true;
       };
       nvidia = mkIf cfg.nvidia.enable {

From c4551b3839592ea1990ce6319ee0a2c49804692e Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Mon, 2 Dec 2024 09:57:30 +0100
Subject: [PATCH 03/18] Attempt at XMonad dev environment

---
 modules/xconfig.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/xconfig.nix b/modules/xconfig.nix
index ea080b4..fcf880c 100644
--- a/modules/xconfig.nix
+++ b/modules/xconfig.nix
@@ -73,7 +73,10 @@ in {
       autoRepeatInterval = 16;
       windowManager = {
         windowmaker.enable = true;
-        xmonad.enable = true;
+        xmonad = {
+          enable = true;
+          extraPackages = h: with h; [ xmonad-contrib ];
+        };
       };
       displayManager.lightdm = {
         enable = cfg.lightdm.enable;

From d2429fa721072f60db877d17486afcc7050b22cf Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Mon, 16 Dec 2024 16:00:17 +0100
Subject: [PATCH 04/18] New input method syntax

---
 modules/fcitx5.nix   | 17 ++++++++---------
 modules/graphics.nix |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/fcitx5.nix b/modules/fcitx5.nix
index bb1c4c0..519ade4 100644
--- a/modules/fcitx5.nix
+++ b/modules/fcitx5.nix
@@ -6,15 +6,14 @@ in {
     enable = mkEnableOption "Enables fcitx5 input method engine and mozc en anthy methods";
   };
   config = mkIf cfg.enable {
-    i18n = {
-      inputMethod = {
-        enabled = "fcitx5";
-        fcitx5 = {
-          addons = with pkgs; [
-            fcitx5-mozc
-            fcitx5-anthy
-          ];
-        };
+    i18n.inputMethod = {
+      enable = true;
+      type = "fcitx5";
+      fcitx5 = {
+        settings.addons = with pkgs; [
+          fcitx5-mozc
+          fcitx5-anthy
+        ];
       };
     };
   };
diff --git a/modules/graphics.nix b/modules/graphics.nix
index 0d350bc..2e93111 100644
--- a/modules/graphics.nix
+++ b/modules/graphics.nix
@@ -11,9 +11,9 @@ in {
   };
   config = {
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport32Bit = true;
+        enable32Bit = true;
       };
       nvidia = mkIf cfg.nvidia.enable {
         package = config.boot.kernelPackages.nvidiaPackages.stable;

From 571ac94c17483efb6f6ef586d92934df1b7e5a1f Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Mon, 16 Dec 2024 16:15:09 +0100
Subject: [PATCH 05/18] New input method syntax pt.2

---
 modules/fcitx5.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/fcitx5.nix b/modules/fcitx5.nix
index 519ade4..c57cfe5 100644
--- a/modules/fcitx5.nix
+++ b/modules/fcitx5.nix
@@ -9,12 +9,10 @@ in {
     i18n.inputMethod = {
       enable = true;
       type = "fcitx5";
-      fcitx5 = {
-        settings.addons = with pkgs; [
-          fcitx5-mozc
-          fcitx5-anthy
-        ];
-      };
+      fcitx5.addons = with pkgs; [
+        fcitx5-mozc
+        fcitx5-anthy
+      ];
     };
   };
 }

From 62eb3ca58b92f978cfd487b92dcef754d0134dac Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Tue, 17 Dec 2024 13:08:37 +0100
Subject: [PATCH 06/18] Back to wider font

---
 modules/font.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/font.nix b/modules/font.nix
index d28c92e..885efbf 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -56,8 +56,8 @@ in {
             "Noto Color Emoji"
           ];
           monospace = [
-            "Iosevka"
             "Fira Code"
+            "Iosevka"
             "JetBrains Mono"
             "IPAGothic"
             "Baekmuk Dotum"

From c5b56395137ba8bbf55dfeea299b7d130849f216 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Fri, 3 Jan 2025 12:00:18 +0100
Subject: [PATCH 07/18] 'work-sans' font

---
 modules/font.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/font.nix b/modules/font.nix
index 885efbf..d1e7c5d 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -33,6 +33,7 @@ in {
         ubuntu_font_family
         uiua386
         vollkorn
+        work-sans
       ];
       fontconfig = {
         enable = true;

From 4d13ff9fd6cfad02da6f98e6c136507d67ead6aa Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 8 Feb 2025 13:32:07 +0100
Subject: [PATCH 08/18] GPG module

---
 flake.nix            |  1 +
 modules/programs.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 modules/programs.nix

diff --git a/flake.nix b/flake.nix
index 1a77024..e02c761 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,7 @@
           ./modules/prometheus.nix
           ./modules/kernel.nix
           ./modules/fcitx5.nix
+          ./modules/programs.nix
         ];
 
       };
diff --git a/modules/programs.nix b/modules/programs.nix
new file mode 100644
index 0000000..66d4ab6
--- /dev/null
+++ b/modules/programs.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.voidconf.programs;
+in
+{
+  options.voidconf.programs = {
+    gnupg = {
+      enable = mkEnableOption "Enables basic GnuPG configuration";
+      pinentryPackage = mkOption {
+        default = pkgs.pinentry-qt;
+      };
+    };
+  };
+  config = {
+
+    # gpg
+    gnupg.agent = mkIf cfg.gnupg.enable {
+      enable = true;
+      pinentryPackage = pkgs.pinentry-qt;
+    };
+
+  };
+}

From 2e0b4f41fc674365eac32d727d6daa6ff0562f3d Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 8 Feb 2025 13:38:13 +0100
Subject: [PATCH 09/18] typo

---
 modules/programs.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/programs.nix b/modules/programs.nix
index 66d4ab6..a17c7e7 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -18,12 +18,14 @@ in
     };
   };
   config = {
+    programs = {
+
+      # gpg
+      gnupg.agent = mkIf cfg.gnupg.enable {
+        enable = true;
+        pinentryPackage = pkgs.pinentry-qt;
+      };
 
-    # gpg
-    gnupg.agent = mkIf cfg.gnupg.enable {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-qt;
     };
-
   };
 }

From 16f9ecf09392b3ae761b47f8949b5304a20e6152 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Mon, 24 Feb 2025 22:27:29 +0100
Subject: [PATCH 10/18] Bluetooth module

---
 flake.nix             |  1 +
 modules/audio.nix     |  6 ++++--
 modules/bluetooth.nix | 26 ++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 modules/bluetooth.nix

diff --git a/flake.nix b/flake.nix
index e02c761..da68564 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,7 @@
           ./modules/kernel.nix
           ./modules/fcitx5.nix
           ./modules/programs.nix
+          ./modules/bluetooth.nix
         ];
 
       };
diff --git a/modules/audio.nix b/modules/audio.nix
index 1a43980..2d190c1 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -1,7 +1,9 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.audio;
-in {
+let
+  cfg = config.voidconf.audio;
+in
+{
   options.voidconf.audio = {
     enable = mkEnableOption "Enable all the audio daemons";
   };
diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
new file mode 100644
index 0000000..22c4edc
--- /dev/null
+++ b/modules/bluetooth.nix
@@ -0,0 +1,26 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.voiconf.bluetooth;
+in
+{
+  options.voidconf.bluetooth = {
+    enable = mkEnableOption "Enables bluetooth tools";
+  };
+  config = mkIf cfg.enable {
+    hardware.bleutooth = {
+      enable = true;
+    };
+    services.blueman = {
+      enable = true;
+    };
+    environment.systemPackages = with pkgs; [
+      bluez
+    ];
+  };
+}

From e38e37dd3df845d0bcf5cbf0803b0d42cee1eba8 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Wed, 26 Feb 2025 11:35:02 +0100
Subject: [PATCH 11/18] typo

---
 modules/bluetooth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
index 22c4edc..b58c25b 100644
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@@ -6,7 +6,7 @@
 }:
 with lib;
 let
-  cfg = config.voiconf.bluetooth;
+  cfg = config.voidconf.bluetooth;
 in
 {
   options.voidconf.bluetooth = {

From 579fc14a494bce976489b6efd0cb73c7fdfcf7ff Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Wed, 26 Feb 2025 11:36:29 +0100
Subject: [PATCH 12/18] Ditto

---
 modules/bluetooth.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
index b58c25b..8e940f0 100644
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@@ -13,9 +13,11 @@ in
     enable = mkEnableOption "Enables bluetooth tools";
   };
   config = mkIf cfg.enable {
-    hardware.bleutooth = {
+
+    hardware.bluetooth = {
       enable = true;
     };
+
     services.blueman = {
       enable = true;
     };

From ae65065d5c7815080f152477dc472d54450ce92d Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 5 Apr 2025 00:31:32 +0200
Subject: [PATCH 13/18] New font

---
 modules/font.nix | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/font.nix b/modules/font.nix
index d1e7c5d..753fcdf 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -1,7 +1,14 @@
-{ pkgs, config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 with lib;
-let cfg = config.voidconf.fontConfig;
-in {
+let
+  cfg = config.voidconf.fontConfig;
+in
+{
   options.voidconf.fontConfig = {
     enable = mkEnableOption "Enable opinionated font configuration";
     joyPixels = mkEnableOption "Enables the JoyPixels font";
@@ -10,7 +17,12 @@ in {
     fonts = {
       fontDir.enable = true;
       packages = with pkgs; [
-        (nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; })
+        (nerdfonts.override {
+          fonts = [
+            "FiraCode"
+            "Iosevka"
+          ];
+        })
         baekmuk-ttf
         blackout
         bqn386
@@ -29,6 +41,7 @@ in {
         noto-fonts-emoji
         noto-fonts-cjk-sans
         noto-fonts-cjk-serif
+        orbitron
         prociono
         ubuntu_font_family
         uiua386
@@ -64,7 +77,10 @@ in {
             "Baekmuk Dotum"
             "Noto Color Emoji"
           ];
-          emoji = [ "Noto Color Emoji" (mkIf cfg.joyPixels "JoyPixels") ];
+          emoji = [
+            "Noto Color Emoji"
+            (mkIf cfg.joyPixels "JoyPixels")
+          ];
         };
 
         localConf = ''

From 3ca8c5e218a05df15e07adf05904bf67642e6f5a Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Fri, 18 Apr 2025 09:37:57 +0200
Subject: [PATCH 14/18] Formatting

---
 modules/fcitx5.nix       |  13 +++--
 modules/graphics.nix     |  10 ++--
 modules/kernel.nix       |   6 ++-
 modules/nix-settings.nix |  11 ++--
 modules/prometheus.nix   |  11 ++--
 modules/services.nix     | 108 +++++++++++++++++++++------------------
 modules/vim.nix          |  77 +++++++++++++++-------------
 modules/xconfig.nix      |  20 +++++---
 modules/zsh.nix          |   8 +--
 9 files changed, 156 insertions(+), 108 deletions(-)

diff --git a/modules/fcitx5.nix b/modules/fcitx5.nix
index c57cfe5..f62f1bf 100644
--- a/modules/fcitx5.nix
+++ b/modules/fcitx5.nix
@@ -1,7 +1,14 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
-let cfg = config.voidconf.fcitx5;
-in {
+let
+  cfg = config.voidconf.fcitx5;
+in
+{
   options.voidconf.fcitx5 = {
     enable = mkEnableOption "Enables fcitx5 input method engine and mozc en anthy methods";
   };
diff --git a/modules/graphics.nix b/modules/graphics.nix
index 2e93111..27e3e9c 100644
--- a/modules/graphics.nix
+++ b/modules/graphics.nix
@@ -1,8 +1,10 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.graphics;
-in {
-  options.voidconf.graphics ={
+let
+  cfg = config.voidconf.graphics;
+in
+{
+  options.voidconf.graphics = {
     defaultSettings.enable = mkEnableOption "Enables some basic graphical settings";
     nvidia = {
       enable = mkEnableOption "Enables Nvidia settings";
@@ -25,6 +27,6 @@ in {
         nvidiaSettings = cfg.nvidia.proprietaryDrivers;
       };
     };
-    services.xserver.videoDrivers = mkIf cfg.nvidia.proprietaryDrivers ["nvidia"];
+    services.xserver.videoDrivers = mkIf cfg.nvidia.proprietaryDrivers [ "nvidia" ];
   };
 }
diff --git a/modules/kernel.nix b/modules/kernel.nix
index dbd81b5..24c97ec 100644
--- a/modules/kernel.nix
+++ b/modules/kernel.nix
@@ -1,7 +1,9 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.kernelTweaks;
-in {
+let
+  cfg = config.voidconf.kernelTweaks;
+in
+{
   options.voidconf.kernelTweaks = {
     enable = mkEnableOption "Enables kernel tweaks";
   };
diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix
index e58f5c7..3e8f3a9 100644
--- a/modules/nix-settings.nix
+++ b/modules/nix-settings.nix
@@ -1,7 +1,9 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.nixSettings;
-in {
+let
+  cfg = config.voidconf.nixSettings;
+in
+{
   options.voidconf.nixSettings = {
     gc = {
       automatic = mkOption {
@@ -36,7 +38,10 @@ in {
         automatic = cfg.gc.automatic;
         dates = cfg.gc.dates;
       };
-      settings.experimental-features = [ "flakes" "nix-command" ];
+      settings.experimental-features = [
+        "flakes"
+        "nix-command"
+      ];
     };
   };
 }
diff --git a/modules/prometheus.nix b/modules/prometheus.nix
index d748a4f..00e000b 100644
--- a/modules/prometheus.nix
+++ b/modules/prometheus.nix
@@ -1,7 +1,9 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.prometheus;
-in {
+let
+  cfg = config.voidconf.prometheus;
+in
+{
   options.voidconf.prometheus = {
     enable = mkEnableOption "Enable prometheus node";
   };
@@ -10,7 +12,10 @@ in {
       exporters = {
         node = {
           enable = true;
-          enabledCollectors = [ "systemd" "cpu" ];
+          enabledCollectors = [
+            "systemd"
+            "cpu"
+          ];
           port = 9002;
         };
       };
diff --git a/modules/services.nix b/modules/services.nix
index 7d65185..8be763f 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -1,7 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
-let cfg = config.voidconf.services;
-in {
+let
+  cfg = config.voidconf.services;
+in
+{
   options.voidconf.services = {
 
     flatpak = {
@@ -26,7 +33,7 @@ in {
   };
   config = {
 
-# flatpak
+    # flatpak
 
     xdg.portal = mkIf cfg.flatpak.enable {
       enable = true;
@@ -35,66 +42,69 @@ in {
       config.common.default = "*";
     };
 
-# ssh
+    # ssh agent
 
-      programs.ssh = mkIf cfg.ssh.enable {
-        startAgent = true;
-      };
+    programs.ssh = mkIf cfg.ssh.enable {
+      startAgent = true;
+    };
 
-      services = {
+    services = {
 
-# flatpak
+      # flatpak
 
-        flatpak.enable = cfg.flatpak.enable;
+      flatpak.enable = cfg.flatpak.enable;
 
-# yggdrasil
+      # yggdrasil
 
-        yggdrasil = mkIf cfg.yggdrasil.enable {
-          enable = true;
-          persistentKeys = cfg.yggdrasil.persistentKeys;
-          settings = {
-            Peers = [
-              "tls://109.107.173.235:9111"
-              "tls://94.103.82.150:8080"
-              "tcp://vpn.itrus.su:7991"
-              "tls://45.147.198.155:6010"
-              "tcp://ygg-nl.incognet.io:8883"
-              "tls://ygg-nl.incognet.io:8884"
-              "tls://23.137.249.65:443"
-              "tls://aaoth.xyz:25565"
-              "tcp://aaoth.xyz:7777"
-              "tls://23.137.251.45:5222"
-              "tls://x-ams-0.sergeysedoy97.ru:65535"
-              "tls://s-ams-0.sergeysedoy97.ru:65535"
-              "tls://89.22.237.91:65535"
-              "tls://[2a0d:8480:1:f9::]:65535"
-              "tls://x-ams-1.sergeysedoy97.ru:65535"
-              "tls://s-ams-1.sergeysedoy97.ru:65535"
-              "tls://79.137.194.94:65535"
-            ];
-          };
-        };
-        openssh = mkIf cfg.ssh.enable {
-          enable = true;
-          settings = {
-            PasswordAuthentication = cfg.ssh.passwordLogin;
-          };
+      yggdrasil = mkIf cfg.yggdrasil.enable {
+        enable = true;
+        persistentKeys = cfg.yggdrasil.persistentKeys;
+        settings = {
+          Peers = [
+            "tls://109.107.173.235:9111"
+            "tls://94.103.82.150:8080"
+            "tcp://vpn.itrus.su:7991"
+            "tls://45.147.198.155:6010"
+            "tcp://ygg-nl.incognet.io:8883"
+            "tls://ygg-nl.incognet.io:8884"
+            "tls://23.137.249.65:443"
+            "tls://aaoth.xyz:25565"
+            "tcp://aaoth.xyz:7777"
+            "tls://23.137.251.45:5222"
+            "tls://x-ams-0.sergeysedoy97.ru:65535"
+            "tls://s-ams-0.sergeysedoy97.ru:65535"
+            "tls://89.22.237.91:65535"
+            "tls://[2a0d:8480:1:f9::]:65535"
+            "tls://x-ams-1.sergeysedoy97.ru:65535"
+            "tls://s-ams-1.sergeysedoy97.ru:65535"
+            "tls://79.137.194.94:65535"
+          ];
         };
       };
 
-# i2p container
+      # ssh daemon
+
+      openssh = mkIf cfg.ssh.enable {
+        enable = true;
+        settings = {
+          PasswordAuthentication = cfg.ssh.passwordLogin;
+        };
+      };
+    };
+
+    # i2p container
 
     containers.i2pd-container = mkIf cfg.i2p.enable {
       autoStart = cfg.i2p.autoStart;
       config = {
         system.stateVersion = "23.11"; # Did you read the comment?
 
-          networking.firewall.allowedTCPPorts = [
-            7656
-            7070
-            4447
-            4444
-          ];
+        networking.firewall.allowedTCPPorts = [
+          7656
+          7070
+          4447
+          4444
+        ];
 
         services.i2pd = {
           enable = true;
diff --git a/modules/vim.nix b/modules/vim.nix
index b01de61..8095ade 100644
--- a/modules/vim.nix
+++ b/modules/vim.nix
@@ -1,7 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
-let cfg = config.voidconf.vim;
-in {
+let
+  cfg = config.voidconf.vim;
+in
+{
   options.voidconf.vim = {
     enable = mkEnableOption "Enables opinionated vim configuration";
     enableNvim = mkEnableOption "Enables neovim and alias";
@@ -9,7 +16,7 @@ in {
       type = types.bool;
       default = true;
       description = ''
-      Set 'vim' as $EDITOR
+        Set 'vim' as $EDITOR
       '';
     };
   };
@@ -26,37 +33,37 @@ in {
 
         (mkIf cfg.enableNvim (neovim.override { vimAlias = true; }))
 
-        ((vim_configurable.override {  }).customize {
-         name = "vim";
-         vimrcConfig = {
-           packages.myplugs = with pkgs.vimPlugins; {
-             start = [ vim-nix ];
-             opt = [];
-           };
-           customRC = ''
-           syntax on
-           set nocompatible
-           set ignorecase
-           set hlsearch
-           set incsearch
-           set autoindent
-           set smartindent
-           set wildmenu
-           set expandtab
-           set shiftwidth=4
-           set tabstop=4
-           set number
-           set relativenumber
-           set mouse=
-           set listchars=tab:│\ ,trail:·
-           set list
-           set scrolloff=3
-           set notimeout
-           set backspace=2
-           au FileType nix setlocal shiftwidth=2 tabstop=2 expandtab
-           au FileType haskell,tex setlocal shiftwidth=4 tabstop=4 expandtab
-           '';
-         };
+        ((vim_configurable.override { }).customize {
+          name = "vim";
+          vimrcConfig = {
+            packages.myplugs = with pkgs.vimPlugins; {
+              start = [ vim-nix ];
+              opt = [ ];
+            };
+            customRC = ''
+              syntax on
+              set nocompatible
+              set ignorecase
+              set hlsearch
+              set incsearch
+              set autoindent
+              set smartindent
+              set wildmenu
+              set expandtab
+              set shiftwidth=4
+              set tabstop=4
+              set number
+              set relativenumber
+              set mouse=
+              set listchars=tab:│\ ,trail:·
+              set list
+              set scrolloff=3
+              set notimeout
+              set backspace=2
+              au FileType nix setlocal shiftwidth=2 tabstop=2 expandtab
+              au FileType haskell,tex setlocal shiftwidth=4 tabstop=4 expandtab
+            '';
+          };
         })
       ];
     };
diff --git a/modules/xconfig.nix b/modules/xconfig.nix
index fcf880c..2ddcfba 100644
--- a/modules/xconfig.nix
+++ b/modules/xconfig.nix
@@ -1,7 +1,9 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.voidconf.xconfig;
-in {
+let
+  cfg = config.voidconf.xconfig;
+in
+{
   options.voidconf.xconfig = {
 
     enable = mkEnableOption "Enables opinionated xorg config";
@@ -12,7 +14,10 @@ in {
       enableProperConfig = mkEnableOption "Enable the touchpad settings";
 
       accelProfile = mkOption {
-        type = types.enum [ "flat" "adaptive" ];
+        type = types.enum [
+          "flat"
+          "adaptive"
+        ];
         default = "adaptive";
         example = "flat";
         description = ''
@@ -23,11 +28,14 @@ in {
     };
 
     mouse.accelProfile = mkOption {
-      type = types.enum [ "flat" "adaptive" ];
+      type = types.enum [
+        "flat"
+        "adaptive"
+      ];
       default = "flat";
       example = "adaptive";
       description = ''
-      Use addaptive on trackball and touchpad; and flat on any normal mouse.
+        Use addaptive on trackball and touchpad; and flat on any normal mouse.
       '';
     };
 
@@ -36,7 +44,7 @@ in {
       default = ./images/city.png;
       type = types.path;
       description = ''
-      Display manager background.
+        Display manager background.
       '';
     };
 
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 4706e8f..f30097e 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -1,7 +1,9 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.voidconf.zsh;
-in {
+let
+  cfg = config.voidconf.zsh;
+in
+{
   options.voidconf.zsh = {
     enable = mkEnableOption "Enables opinionated zsh configuration";
     skim.enable = mkEnableOption "Enables skim support for shell history";
@@ -10,7 +12,7 @@ in {
       default = "fg=magenta,bg=black,bold,underline";
       description = ''
         Colors for zsh autosuggestions. Check the documentation for more info.
-        '';
+      '';
     };
   };
   config = mkIf cfg.enable {

From f977076587dda95c07f31315b9ea8ce14cbafa6d Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <martysluijtman@acknowledge.nl>
Date: Thu, 24 Apr 2025 13:22:40 +0200
Subject: [PATCH 15/18] The Neue Black

---
 modules/font.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/font.nix b/modules/font.nix
index 753fcdf..d1c0225 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -47,6 +47,7 @@ in
         uiua386
         vollkorn
         work-sans
+        the-neue-black
       ];
       fontconfig = {
         enable = true;

From adc824d4b51e58382dded143bd2194edc691f1bc Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 24 May 2025 14:29:44 +0200
Subject: [PATCH 16/18] New nixos version

---
 modules/font.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/font.nix b/modules/font.nix
index d1c0225..ffe0efe 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -17,12 +17,8 @@ in
     fonts = {
       fontDir.enable = true;
       packages = with pkgs; [
-        (nerdfonts.override {
-          fonts = [
-            "FiraCode"
-            "Iosevka"
-          ];
-        })
+        nerdfonts.iosevka
+        nerdfonts.fira-code
         baekmuk-ttf
         blackout
         bqn386

From 5a4f97d73f77db5f8bfc8e6f0b25798eec9ebe10 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sat, 24 May 2025 14:31:35 +0200
Subject: [PATCH 17/18] Sigh...

---
 modules/font.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/font.nix b/modules/font.nix
index ffe0efe..1eee83e 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -17,8 +17,8 @@ in
     fonts = {
       fontDir.enable = true;
       packages = with pkgs; [
-        nerdfonts.iosevka
-        nerdfonts.fira-code
+        # nerdfonts.iosevka
+        # nerdfonts.fira-code
         baekmuk-ttf
         blackout
         bqn386

From 560b5b827105121369b7daa67f24f2add1d7f23e Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <martysluijtman@acknowledge.nl>
Date: Wed, 28 May 2025 15:26:42 +0200
Subject: [PATCH 18/18] Trying this again for a bit

---
 modules/font.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/font.nix b/modules/font.nix
index 1eee83e..02b62bb 100644
--- a/modules/font.nix
+++ b/modules/font.nix
@@ -67,9 +67,9 @@ in
             "Noto Color Emoji"
           ];
           monospace = [
+            "JetBrains Mono"
             "Fira Code"
             "Iosevka"
-            "JetBrains Mono"
             "IPAGothic"
             "Baekmuk Dotum"
             "Noto Color Emoji"