Merge branch 'main' of antimatterForge:Egg/voidconf

yes yes... I don't pay enough attention

flake.nix

@@ -9,7 +9,7 @@
           ./modules/audio.nix
           ./modules/font.nix
           ./modules/nix-settings.nix
-          ./modules/nvidia.nix
+          ./modules/graphics.nix
           ./modules/services.nix
           ./modules/vim.nix
           ./modules/xconfig.nix

modules/audio.nix

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

modules/font.nix

@@ -1,8 +1,8 @@
 { pkgs, config, lib, ... }:
 with lib;
-let cfg = config.voidcruiser.fontConfig;
+let cfg = config.voidconf.fontConfig;
 in {
-  options.voidcruiser.fontConfig = {
+  options.voidconf.fontConfig = {
     enable = mkEnableOption "Enable opinionated font configuration";
     joyPixels = mkEnableOption "Enables the JoyPixels font";
   };
@@ -11,24 +11,25 @@ in {
       fontDir.enable = true;
       packages = with pkgs; [
         (nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; })
-          jetbrains-mono
+        ubuntu_font_family
-          iosevka
+        jetbrains-mono
-          fira-code
+        iosevka
-          fira
+        fira-code
-          font-awesome
+        fira
-          liberation_ttf
+        font-awesome
-          libertine
+        liberation_ttf
-          libertinus
+        libertine
-          vollkorn
+        libertinus
-          noto-fonts-emoji
+        vollkorn
-          noto-fonts
+        noto-fonts-emoji
-          ipafont
+        noto-fonts
-          bqn386
+        ipafont
-          blackout
+        bqn386
-          prociono
+        blackout
-          mplus-outline-fonts.githubRelease
+        prociono
-          mononoki
+        mplus-outline-fonts.githubRelease
-          uiua386
+        mononoki
+        uiua386
       ];
       fontconfig = {
         enable = true;

modules/graphics.nix

@@ -0,0 +1,31 @@
+{ lib, config, ... }:
+with lib;
+let cfg = config.voidconf.graphics;
+in {
+  options.voidconf.graphics ={
+    defaultSettings.enable = mkEnableOption "Enables some basic graphical settings";
+    nvidia = {
+      enable = mkEnableOption "Enables Nvidia settings";
+      proprietaryDrivers = mkEnableOption "Enables proprietary drivers";
+    };
+  };
+  config = {
+    hardware = {
+      opengl = {
+        enable = true;
+        driSupport = true;
+        driSupport32Bit = true;
+      };
+      nvidia = mkIf cfg.nvidia.enable {
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
+        powerManagement = {
+          enable = false;
+          finegrained = false;
+        };
+        open = !cfg.nvidia.proprietaryDrivers;
+        nvidiaSettings = cfg.nvidia.proprietaryDrivers;
+      };
+    };
+    services.xserver.videoDrivers = mkIf cfg.nvidia.proprietaryDrivers ["nvidia"];
+  };
+}

modules/kernel.nix

@@ -1,8 +1,8 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidcruiser.kernelTweaks;
+let cfg = config.voidconf.kernelTweaks;
 in {
-  options.voidcruiser.kernelTweaks = {
+  options.voidconf.kernelTweaks = {
     enable = mkEnableOption "Enables kernel tweaks";
   };
   config = mkIf cfg.enable {

modules/nix-settings.nix

@@ -1,8 +1,8 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidcruiser.nixSettings;
+let cfg = config.voidconf.nixSettings;
 in {
-  options.voidcruiser.nixSettings = {
+  options.voidconf.nixSettings = {
     gc = {
       automatic = mkOption {
         type = types.bool;

modules/nvidia.nix

@@ -1,27 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let cfg = config.voidcruiser.nvidia;
-in {
-  options.voidcruiser.nvidia = {
-    enable = mkEnableOption "Enables proprietary Nvidia drivers and related config";
-  };
-  config = mkIf cfg.enable {
-    hardware = {
-      opengl = {
-        enable = true;
-        driSupport = true;
-        driSupport32Bit = true;
-      };
-      nvidia = {
-        package = config.boot.kernelPackages.nvidiaPackages.stable;
-        powerManagement = {
-          enable = false;
-          finegrained = false;
-        };
-        open = false;
-        nvidiaSettings = true;
-      };
-    };
-    services.xserver.videoDrivers = ["nvidia"];
-  };
-}

modules/prometheus.nix

@@ -1,8 +1,8 @@
 { lib, config, ... }:
 with lib;
-let cfg = config.voidcruiser.prometheus;
+let cfg = config.voidconf.prometheus;
 in {
-  options.voidcruiser.prometheus = {
+  options.voidconf.prometheus = {
     enable = mkEnableOption "Enable prometheus node";
   };
   config = mkIf cfg.enable {

modules/services.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 with lib;
-let cfg = config.voidcruiser.services;
+let cfg = config.voidconf.services;
 in {
-  options.voidcruiser.services = {
+  options.voidconf.services = {
 
     flatpak = {
       enable = mkEnableOption "Enables basic flatpak configuration";

modules/vim.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 with lib;
-let cfg = config.voidcruiser.vim;
+let cfg = config.voidconf.vim;
 in {
-  options.voidcruiser.vim = {
+  options.voidconf.vim = {
     enable = mkEnableOption "Enables opinionated vim configuration";
     enableNvim = mkEnableOption "Enables neovim and alias";
     setEnvVar = mkOption {

modules/xconfig.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.voidcruiser.xconfig;
+let cfg = config.voidconf.xconfig;
 in {
-  options.voidcruiser.xconfig = {
+  options.voidconf.xconfig = {
 
     enable = mkEnableOption "Enables opinionated xorg config";
 

modules/zsh.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.voidcruiser.zsh;
+let cfg = config.voidconf.zsh;
 in {
-  options.voidcruiser.zsh = {
+  options.voidconf.zsh = {
     enable = mkEnableOption "Enables opinionated zsh configuration";
     skim.enable = mkEnableOption "Enables skim support for shell history";
     highlightStyle = mkOption {