Remove custom lib usage

This commit is contained in:
2023-12-10 23:53:54 +00:00
parent 0d015ac418
commit 3f8c817418
42 changed files with 265 additions and 388 deletions

View File

@ -1,16 +1,17 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.apps.qbittorrent;
in {
options.modules.desktop.apps.qbittorrent = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
user.packages = with pkgs; [
qbittorrent
];
};
}
}

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.apps.slack;
in {
options.modules.desktop.apps.slack = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
user.packages = with pkgs; [
slack
];

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, inputs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.apps.thunderbird;
in {
options.modules.desktop.apps.thunderbird = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
home.programs.thunderbird = {

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.apps.zoom;
in {
options.modules.desktop.apps.zoom = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
user.packages = with pkgs; [
zoom-us
];

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, inputs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.browsers.firefox;
in {
options.modules.desktop.browsers.firefox = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
home.programs.firefox = {

View File

@ -1,34 +1,59 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.gaming.emulators;
in {
options.modules.desktop.gaming.emulators = {
ds.enable = mkBoolOpt false;
gb.enable = mkBoolOpt false;
gba.enable = mkBoolOpt false;
gamecube.enable = mkBoolOpt false;
ps2.enable = mkBoolOpt false;
ps3.enable = mkBoolOpt false;
psp.enable = mkBoolOpt false;
snes.enable = mkBoolOpt false;
wii.enable = mkBoolOpt false;
ds.enable = lib.mkOption {
default = false;
example = true;
};
gb.enable = lib.mkOption {
default = false;
example = true;
};
gba.enable = lib.mkOption {
default = false;
example = true;
};
gamecube.enable = lib.mkOption {
default = false;
example = true;
};
ps2.enable = lib.mkOption {
default = false;
example = true;
};
ps3.enable = lib.mkOption {
default = false;
example = true;
};
psp.enable = lib.mkOption {
default = false;
example = true;
};
snes.enable = lib.mkOption {
default = false;
example = true;
};
wii.enable = lib.mkOption {
default = false;
example = true;
};
};
config = {
user.packages = with pkgs; [
(mkIf cfg.ps2.enable pcsx2)
(mkIf cfg.ps3.enable rpcs3)
(mkIf cfg.psp.enable ppsspp)
(mkIf cfg.ds.enable desmume)
(mkIf (cfg.gba.enable ||
(lib.mkIf cfg.ps2.enable pcsx2)
(lib.mkIf cfg.ps3.enable rpcs3)
(lib.mkIf cfg.psp.enable ppsspp)
(lib.mkIf cfg.ds.enable desmume)
(lib.mkIf (cfg.gba.enable ||
cfg.gb.enable ||
cfg.snes.enable)
higan)
(mkIf (cfg.wii.enable ||
(lib.mkIf (cfg.wii.enable ||
cfg.gamecube.enable)
dolphin-emu)
];
};
}
}

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.gaming.lutris;
in {
options.modules.desktop.gaming.lutris = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
user.packages = with pkgs; [
lutris
vulkan-loader

View File

@ -1,16 +1,17 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.gaming.steam;
in {
options.modules.desktop.gaming.steam = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
programs.steam.enable = true;
systemd.extraConfig = "DefaultLimitNOFILE=1048576";
};
}
}

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.gnome;
in {
options.modules.desktop.gnome = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.xserver = {
enable = true;
displayManager.gdm.enable = true;

View File

@ -1,21 +1,28 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.media.graphics;
in {
options.modules.desktop.media.graphics = {
modeling.enable = mkBoolOpt false;
raster.enable = mkBoolOpt false;
vector.enable = mkBoolOpt false;
modeling.enable = lib.mkOption {
default = false;
example = true;
};
raster.enable = lib.mkOption {
default = false;
example = true;
};
vector.enable = lib.mkOption {
default = false;
example = true;
};
};
config = {
user.packages = with pkgs; [
(mkIf cfg.modeling.enable blender)
(mkIf cfg.raster.enable gimp)
(mkIf cfg.raster.enable krita)
(mkIf cfg.vector.enable inkscape)
(lib.mkIf cfg.modeling.enable blender)
(lib.mkIf cfg.raster.enable gimp)
(lib.mkIf cfg.raster.enable krita)
(lib.mkIf cfg.vector.enable inkscape)
];
};
}
}

View File

@ -1,12 +1,16 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.media.recording;
in {
options.modules.desktop.media.recording = {
audio.enable = mkBoolOpt false;
video.enable = mkBoolOpt false;
audio.enable = lib.mkOption {
default = false;
example = true;
};
video.enable = lib.mkOption {
default = false;
example = true;
};
};
config = {
@ -21,4 +25,4 @@ in {
obs-studio
] else []);
};
}
}

View File

@ -1,17 +1,18 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let
cfg = config.modules.desktop.mimeapps;
avApp = "io.github.celluloid_player.Celluloid.desktop";
imageApp = "org.gnome.eog.desktop";
in {
options.modules.desktop.mimeapps = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
xdg.mime.defaultApplications = {
# Audio/video
"audio/x-vorbis+ogg" = avApp;

View File

@ -1,14 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
with lib.my;
let cfg = config.modules.desktop.office.libreoffice;
in {
options.modules.desktop.office.libreoffice = {
enable = mkBoolOpt false;
enable = lib.mkOption {
default = false;
example = true;
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
user.packages = with pkgs; [
libreoffice
];