Ditto

flake.nix

@@ -17,6 +17,8 @@
           ./modules/prometheus.nix
           ./modules/kernel.nix
           ./modules/fcitx5.nix
+          ./modules/programs.nix
+          ./modules/bluetooth.nix
         ];
 
       };

modules/audio.nix

@@ -1,7 +1,9 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidconf.audio;
+let
-in {
+  cfg = config.voidconf.audio;
+in
+{
   options.voidconf.audio = {
     enable = mkEnableOption "Enable all the audio daemons";
   };

modules/bluetooth.nix

@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.voidconf.bluetooth;
+in
+{
+  options.voidconf.bluetooth = {
+    enable = mkEnableOption "Enables bluetooth tools";
+  };
+  config = mkIf cfg.enable {
+
+    hardware.bluetooth = {
+      enable = true;
+    };
+
+    services.blueman = {
+      enable = true;
+    };
+    environment.systemPackages = with pkgs; [
+      bluez
+    ];
+  };
+}

modules/fcitx5.nix

@@ -6,16 +6,13 @@ in {
     enable = mkEnableOption "Enables fcitx5 input method engine and mozc en anthy methods";
   };
   config = mkIf cfg.enable {
-    i18n = {
+    i18n.inputMethod = {
-      inputMethod = {
+      enable = true;
-        enabled = "fcitx5";
+      type = "fcitx5";
-        fcitx5 = {
+      fcitx5.addons = with pkgs; [
-          addons = with pkgs; [
+        fcitx5-mozc
-            fcitx5-mozc
+        fcitx5-anthy
-            fcitx5-anthy
+      ];
-          ];
-        };
-      };
     };
   };
 }

modules/font.nix

@@ -33,6 +33,7 @@ in {
         ubuntu_font_family
         uiua386
         vollkorn
+        work-sans
       ];
       fontconfig = {
         enable = true;
@@ -57,8 +58,8 @@ in {
           ];
           monospace = [
             "Fira Code"
-            "JetBrains Mono"
             "Iosevka"
+            "JetBrains Mono"
             "IPAGothic"
             "Baekmuk Dotum"
             "Noto Color Emoji"

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;

modules/programs.nix

@@ -0,0 +1,31 @@
+{
+  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 = {
+    programs = {
+
+      # gpg
+      gnupg.agent = mkIf cfg.gnupg.enable {
+        enable = true;
+        pinentryPackage = pkgs.pinentry-qt;
+      };
+
+    };
+  };
+}

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;