flake.nix

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

modules/audio.nix

@@ -1,13 +1,12 @@
 { 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";
   };
   config = mkIf cfg.enable {
+    sound.enable = true;
     hardware.pulseaudio.enable = false;
     services.pipewire = {
       enable = true;

modules/bluetooth.nix

@@ -1,26 +0,0 @@
-{
-  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
-    ];
-  };
-}

modules/fcitx5.nix

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

modules/font.nix

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

modules/graphics.nix

@@ -11,9 +11,10 @@ in {
   };
   config = {
     hardware = {
-      graphics = {
+      opengl = {
         enable = true;
-        enable32Bit = true;
+        driSupport = true;
+        driSupport32Bit = true;
       };
       nvidia = mkIf cfg.nvidia.enable {
         package = config.boot.kernelPackages.nvidiaPackages.stable;

modules/programs.nix

@@ -1,31 +0,0 @@
-{
-  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,10 +73,7 @@ in {
       autoRepeatInterval = 16;
       windowManager = {
         windowmaker.enable = true;
-        xmonad = {
-          enable = true;
-          extraPackages = h: with h; [ xmonad-contrib ];
-        };
+        xmonad.enable = true;
       };
       displayManager.lightdm = {
         enable = cfg.lightdm.enable;