Compare commits

..

No commits in common. "main" and "24.05" have entirely different histories.
main ... 24.05

14 changed files with 131 additions and 254 deletions

View file

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

View file

@ -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;

View file

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

View file

@ -1,25 +1,21 @@
{
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";
};
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
];
};
};
};
};
}

View file

@ -1,14 +1,7 @@
{
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";
@ -17,8 +10,7 @@ in
fonts = {
fontDir.enable = true;
packages = with pkgs; [
# nerdfonts.iosevka
# nerdfonts.fira-code
(nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; })
baekmuk-ttf
blackout
bqn386
@ -37,13 +29,10 @@ in
noto-fonts-emoji
noto-fonts-cjk-sans
noto-fonts-cjk-serif
orbitron
prociono
ubuntu_font_family
uiua386
vollkorn
work-sans
the-neue-black
];
fontconfig = {
enable = true;
@ -67,17 +56,14 @@ in
"Noto Color Emoji"
];
monospace = [
"JetBrains Mono"
"Fira Code"
"JetBrains Mono"
"Iosevka"
"IPAGothic"
"Baekmuk Dotum"
"Noto Color Emoji"
];
emoji = [
"Noto Color Emoji"
(mkIf cfg.joyPixels "JoyPixels")
];
emoji = [ "Noto Color Emoji" (mkIf cfg.joyPixels "JoyPixels") ];
};
localConf = ''

View file

@ -1,10 +1,8 @@
{ 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";
@ -13,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;
@ -27,6 +26,6 @@ in
nvidiaSettings = cfg.nvidia.proprietaryDrivers;
};
};
services.xserver.videoDrivers = mkIf cfg.nvidia.proprietaryDrivers [ "nvidia" ];
services.xserver.videoDrivers = mkIf cfg.nvidia.proprietaryDrivers ["nvidia"];
};
}

View file

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

View file

@ -1,9 +1,7 @@
{ lib, config, ... }:
with lib;
let
cfg = config.voidconf.nixSettings;
in
{
let cfg = config.voidconf.nixSettings;
in {
options.voidconf.nixSettings = {
gc = {
automatic = mkOption {
@ -38,10 +36,7 @@ in
automatic = cfg.gc.automatic;
dates = cfg.gc.dates;
};
settings.experimental-features = [
"flakes"
"nix-command"
];
settings.experimental-features = [ "flakes" "nix-command" ];
};
};
}

View file

@ -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;
};
};
};
}

View file

@ -1,9 +1,7 @@
{ lib, config, ... }:
with lib;
let
cfg = config.voidconf.prometheus;
in
{
let cfg = config.voidconf.prometheus;
in {
options.voidconf.prometheus = {
enable = mkEnableOption "Enable prometheus node";
};
@ -12,10 +10,7 @@ in
exporters = {
node = {
enable = true;
enabledCollectors = [
"systemd"
"cpu"
];
enabledCollectors = [ "systemd" "cpu" ];
port = 9002;
};
};

View file

@ -1,14 +1,7 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.voidconf.services;
in
{
let cfg = config.voidconf.services;
in {
options.voidconf.services = {
flatpak = {
@ -33,7 +26,7 @@ in
};
config = {
# flatpak
# flatpak
xdg.portal = mkIf cfg.flatpak.enable {
enable = true;
@ -42,7 +35,7 @@ in
config.common.default = "*";
};
# ssh agent
# ssh
programs.ssh = mkIf cfg.ssh.enable {
startAgent = true;
@ -50,11 +43,11 @@ in
services = {
# flatpak
# flatpak
flatpak.enable = cfg.flatpak.enable;
# yggdrasil
# yggdrasil
yggdrasil = mkIf cfg.yggdrasil.enable {
enable = true;
@ -81,9 +74,6 @@ in
];
};
};
# ssh daemon
openssh = mkIf cfg.ssh.enable {
enable = true;
settings = {
@ -92,7 +82,7 @@ in
};
};
# i2p container
# i2p container
containers.i2pd-container = mkIf cfg.i2p.enable {
autoStart = cfg.i2p.autoStart;

View file

@ -1,14 +1,7 @@
{
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";
@ -38,7 +31,7 @@ in
vimrcConfig = {
packages.myplugs = with pkgs.vimPlugins; {
start = [ vim-nix ];
opt = [ ];
opt = [];
};
customRC = ''
syntax on

View file

@ -1,9 +1,7 @@
{ 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";
@ -14,10 +12,7 @@ in
enableProperConfig = mkEnableOption "Enable the touchpad settings";
accelProfile = mkOption {
type = types.enum [
"flat"
"adaptive"
];
type = types.enum [ "flat" "adaptive" ];
default = "adaptive";
example = "flat";
description = ''
@ -28,10 +23,7 @@ in
};
mouse.accelProfile = mkOption {
type = types.enum [
"flat"
"adaptive"
];
type = types.enum [ "flat" "adaptive" ];
default = "flat";
example = "adaptive";
description = ''
@ -81,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;

View file

@ -1,9 +1,7 @@
{ 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";