colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

hosts/modules/gui: refactor package sets

Browse Source
This commit is contained in:
Colin 2023-11-18 22:20:38 +00:00
parent 91c2f6fc95
commit 3c7ebb5385
1 changed files with 62 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hosts/modules/gui/default.nix
View File

@ -1,4 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let
declPackageSet = pkgs: {
package = null;
suggestedPrograms = pkgs;
};
in
{ {
imports = [ imports = [
./gnome.nix ./gnome.nix
@ -10,18 +16,13 @@
./theme ./theme
]; ];
sane.programs.gameApps = { sane.programs.gameApps = declPackageSet [
package = null;
suggestedPrograms = [
"animatch" "animatch"
"gnome-2048" "gnome-2048"
"superTux" # keyboard-only controls "superTux" # keyboard-only controls
"superTuxKart" # poor FPS on pinephone "superTuxKart" # poor FPS on pinephone
]; ];
}; sane.programs.desktopGameApps = declPackageSet [
sane.programs.desktopGameApps = {
package = null;
suggestedPrograms = [
# "andyetitmoves" # TODO: fix build! # "andyetitmoves" # TODO: fix build!
# "armagetronad" # tron/lightcycles; WAN and LAN multiplayer # "armagetronad" # tron/lightcycles; WAN and LAN multiplayer
# "cutemaze" # meh: trivial maze game; qt6 and keyboard-only # "cutemaze" # meh: trivial maze game; qt6 and keyboard-only
@ -43,11 +44,9 @@
"tumiki-fighters" # keyboard-only "tumiki-fighters" # keyboard-only
"vvvvvv" # keyboard-only controls "vvvvvv" # keyboard-only controls
]; ];
};
sane.programs.guiApps = { sane.programs.guiApps = declPackageSet (
package = null; lib.optionals (pkgs.system == "x86_64-linux") [
suggestedPrograms = lib.optionals (pkgs.system == "x86_64-linux") [
"x86GuiApps" "x86GuiApps"
] ++ [ ] ++ [
# package sets # package sets
@ -109,12 +108,11 @@
"wike" # Wikipedia Reader "wike" # Wikipedia Reader
"xdg-terminal-exec" "xdg-terminal-exec"
"xterm" # broken on phosh "xterm" # broken on phosh
]; ]
}; );
sane.programs.desktopGuiApps = { sane.programs.desktopGuiApps = declPackageSet (
package = null; [
suggestedPrograms = [
# package sets # package sets
"desktopGameApps" "desktopGameApps"
] ++ [ ] ++ [
@ -149,21 +147,16 @@
"steam" "steam"
"vlc" "vlc"
"wireshark" # could maybe ship the cli as sysadmin pkg "wireshark" # could maybe ship the cli as sysadmin pkg
]; ]
}; );
sane.programs.handheldGuiApps = { sane.programs.handheldGuiApps = declPackageSet [
package = null;
suggestedPrograms = [
"megapixels" # camera app "megapixels" # camera app
"portfolio-filemanager" "portfolio-filemanager"
"xarchiver" "xarchiver"
]; ];
};
sane.programs.x86GuiApps = { sane.programs.x86GuiApps = declPackageSet [
package = null;
suggestedPrograms = [
"discord" "discord"
# "gnome.zenity" # for kaiteki (it will use qarma, kdialog, or zenity) # "gnome.zenity" # for kaiteki (it will use qarma, kdialog, or zenity)
# "gpt2tc" # XXX: unreliable mirror # "gpt2tc" # XXX: unreliable mirror
@ -177,7 +170,7 @@
"tor-browser-bundle-bin" "tor-browser-bundle-bin"
"zecwallet-lite" "zecwallet-lite"
]; ];
};
sane.persist.sys.byStore.plaintext = lib.mkIf config.sane.programs.guiApps.enabled [ sane.persist.sys.byStore.plaintext = lib.mkIf config.sane.programs.guiApps.enabled [
"/var/lib/alsa" # preserve output levels, default devices "/var/lib/alsa" # preserve output levels, default devices