extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2024-11-22 08:14:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

desktop: Support japanese/wine by default

Browse Source 
Simplifies things a bit since my target audience includes those
interested in the Japanese language. Opinionated defaults like this
makes it easier for end-users to be immediately productive without
having to spend time configuring things.
This commit is contained in:
Donovan Glover 2024-04-06 13:40:41 -04:00
parent 5afd2f2b49
commit 00135526e7
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containers/shared.nix
View File

@ -21,11 +21,6 @@ in
../home/yazi.nix ../home/yazi.nix
]; ];
modules.desktop = {
japanese = true;
wine = true;
};
environment = { environment = {
defaultPackages = [ ]; defaultPackages = [ ];
variables.TERM = "xterm-kitty"; variables.TERM = "xterm-kitty";

2
default.nix
View File

@ -25,9 +25,7 @@ in
}; };
desktop = { desktop = {
japanese = true;
bloat = true; bloat = true;
wine = true;
}; };
}; };
} }

18
modules/desktop.nix
View File

@ -3,7 +3,7 @@
let let
inherit (lib) mkEnableOption mkIf mkMerge; inherit (lib) mkEnableOption mkIf mkMerge;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (cfg) japanese bloat wine gnome plasma; inherit (cfg) bloat gnome plasma;
inherit (builtins) attrValues; inherit (builtins) attrValues;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
@ -20,19 +20,17 @@ in
}; };
options.modules.desktop = { options.modules.desktop = {
japanese = mkEnableOption "Japanese support (fcitx, anki, kanjidraw, etc.)";
bloat = mkEnableOption "GUI applications like Logseq"; bloat = mkEnableOption "GUI applications like Logseq";
wine = mkEnableOption "wine support";
gnome = mkEnableOption "GNOME specialization"; gnome = mkEnableOption "GNOME specialization";
plasma = mkEnableOption "Plasma specialization"; plasma = mkEnableOption "Plasma specialization";
}; };
config = { config = {
hardware.opengl.driSupport32Bit = mkIf wine true; hardware.opengl.driSupport32Bit = true;
programs = { programs = {
hyprland.enable = true; hyprland.enable = true;
cdemu.enable = mkIf wine true; cdemu.enable = true;
thunar = { thunar = {
enable = true; enable = true;
@ -43,7 +41,7 @@ in
}; };
}; };
i18n.inputMethod = mkIf japanese { i18n.inputMethod = {
enabled = "fcitx5"; enabled = "fcitx5";
fcitx5 = { fcitx5 = {
@ -80,11 +78,6 @@ in
}; };
environment.systemPackages = mkMerge [ environment.systemPackages = mkMerge [
(mkIf japanese (attrValues {
inherit (pkgs) anki kanjidraw;
inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
}))
(mkIf bloat (attrValues { (mkIf bloat (attrValues {
inherit (pkgs) inherit (pkgs)
logseq logseq
@ -109,7 +102,8 @@ in
})) }))
(attrValues { (attrValues {
inherit (pkgs) pulseaudio glib; inherit (pkgs) anki kanjidraw pulseaudio glib;
inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
inherit (pkgs.xfce) exo; inherit (pkgs.xfce) exo;
}) })
]; ];