programs: split the guiApps category into slightly smaller bits
This commit is contained in:
parent
50812e5678
commit
d776c4618a
|
@ -15,6 +15,8 @@
|
||||||
sane.gui.sway.enable = true;
|
sane.gui.sway.enable = true;
|
||||||
sane.programs.iphoneUtils.enableFor.user.colin = true;
|
sane.programs.iphoneUtils.enableFor.user.colin = true;
|
||||||
|
|
||||||
|
sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
||||||
|
sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
|
||||||
|
|
||||||
sops.secrets.colin-passwd = {
|
sops.secrets.colin-passwd = {
|
||||||
sopsFile = ../../../secrets/lappy.yaml;
|
sopsFile = ../../../secrets/lappy.yaml;
|
||||||
neededForUsers = true;
|
neededForUsers = true;
|
||||||
|
|
|
@ -4,11 +4,23 @@ let
|
||||||
inherit (builtins) attrNames concatLists;
|
inherit (builtins) attrNames concatLists;
|
||||||
inherit (lib) mapAttrs mapAttrsToList mkDefault mkMerge optional;
|
inherit (lib) mapAttrs mapAttrsToList mkDefault mkMerge optional;
|
||||||
|
|
||||||
|
flattenedPkgs = pkgs // (with pkgs; {
|
||||||
|
# XXX can't `inherit` a nested attr, so we move them to the toplevel
|
||||||
|
"cacert.unbundled" = pkgs.cacert.unbundled;
|
||||||
|
"gnome.cheese" = gnome.cheese;
|
||||||
|
"gnome.dconf-editor" = gnome.dconf-editor;
|
||||||
|
"gnome.file-roller" = gnome.file-roller;
|
||||||
|
"gnome.gnome-disk-utility" = gnome.gnome-disk-utility;
|
||||||
|
"gnome.gnome-maps" = gnome.gnome-maps;
|
||||||
|
"gnome.nautilus" = gnome.nautilus;
|
||||||
|
"gnome.gnome-system-monitor" = gnome.gnome-system-monitor;
|
||||||
|
"gnome.gnome-terminal" = gnome.gnome-terminal;
|
||||||
|
"gnome.gnome-weather" = gnome.gnome-weather;
|
||||||
|
"libsForQt5.plasmatube" = libsForQt5.plasmatube;
|
||||||
|
});
|
||||||
|
|
||||||
sysadminPkgs = {
|
sysadminPkgs = {
|
||||||
inherit (pkgs // {
|
inherit (flattenedPkgs)
|
||||||
# XXX can't `inherit` a nested attr, so we move them to the toplevel
|
|
||||||
"cacert.unbundled" = pkgs.cacert.unbundled;
|
|
||||||
})
|
|
||||||
btrfs-progs
|
btrfs-progs
|
||||||
"cacert.unbundled" # some services require unbundled /etc/ssl/certs
|
"cacert.unbundled" # some services require unbundled /etc/ssl/certs
|
||||||
cryptsetup
|
cryptsetup
|
||||||
|
@ -117,40 +129,22 @@ let
|
||||||
# tageditor # music tagging
|
# tageditor # music tagging
|
||||||
unar
|
unar
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
|
xdg-utils # for xdg-open
|
||||||
# youtube-dl
|
# youtube-dl
|
||||||
yt-dlp
|
yt-dlp
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
guiPkgs = {
|
guiPkgs = {
|
||||||
inherit (pkgs // (with pkgs; {
|
inherit (flattenedPkgs)
|
||||||
# XXX can't `inherit` a nested attr, so we move them to the toplevel
|
|
||||||
# TODO: could use some "flatten attrs" helper instead
|
|
||||||
"gnome.cheese" = gnome.cheese;
|
|
||||||
"gnome.dconf-editor" = gnome.dconf-editor;
|
|
||||||
"gnome.file-roller" = gnome.file-roller;
|
|
||||||
"gnome.gnome-disk-utility" = gnome.gnome-disk-utility;
|
|
||||||
"gnome.gnome-maps" = gnome.gnome-maps;
|
|
||||||
"gnome.nautilus" = gnome.nautilus;
|
|
||||||
"gnome.gnome-system-monitor" = gnome.gnome-system-monitor;
|
|
||||||
"gnome.gnome-terminal" = gnome.gnome-terminal;
|
|
||||||
"gnome.gnome-weather" = gnome.gnome-weather;
|
|
||||||
"libsForQt5.plasmatube" = libsForQt5.plasmatube;
|
|
||||||
}))
|
|
||||||
audacity
|
|
||||||
celluloid # mpv frontend
|
celluloid # mpv frontend
|
||||||
chromium
|
|
||||||
clinfo
|
clinfo
|
||||||
dino
|
|
||||||
electrum
|
|
||||||
element-desktop
|
|
||||||
emote
|
emote
|
||||||
evince # works on phosh
|
evince # works on phosh
|
||||||
|
|
||||||
# { pkg = fluffychat-moby; dir = [ ".local/share/chat.fluffy.fluffychat" ]; } # TODO: ship normal fluffychat on non-moby?
|
# { pkg = fluffychat-moby; dir = [ ".local/share/chat.fluffy.fluffychat" ]; } # TODO: ship normal fluffychat on non-moby?
|
||||||
|
|
||||||
foliate # e-book reader
|
# foliate # e-book reader
|
||||||
font-manager
|
|
||||||
|
|
||||||
# XXX by default fractal stores its state in ~/.local/share/<UUID>.
|
# XXX by default fractal stores its state in ~/.local/share/<UUID>.
|
||||||
# after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir.
|
# after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir.
|
||||||
|
@ -158,14 +152,11 @@ let
|
||||||
# { pkg = fractal-latest; private = [ ".local/share/fractal" ]; }
|
# { pkg = fractal-latest; private = [ ".local/share/fractal" ]; }
|
||||||
# { pkg = fractal-next; private = [ ".local/share/fractal" ]; }
|
# { pkg = fractal-next; private = [ ".local/share/fractal" ]; }
|
||||||
|
|
||||||
gajim # XMPP client
|
# "gnome.cheese"
|
||||||
gimp # broken on phosh
|
|
||||||
"gnome.cheese"
|
|
||||||
"gnome.dconf-editor"
|
"gnome.dconf-editor"
|
||||||
gnome-feeds # RSS reader (with claimed mobile support)
|
gnome-feeds # RSS reader (with claimed mobile support)
|
||||||
"gnome.file-roller"
|
"gnome.file-roller"
|
||||||
"gnome.gnome-disk-utility"
|
# "gnome.gnome-maps" # works on phosh
|
||||||
"gnome.gnome-maps" # works on phosh
|
|
||||||
"gnome.nautilus"
|
"gnome.nautilus"
|
||||||
# gnome-podcasts
|
# gnome-podcasts
|
||||||
"gnome.gnome-system-monitor"
|
"gnome.gnome-system-monitor"
|
||||||
|
@ -173,21 +164,15 @@ let
|
||||||
"gnome.gnome-weather"
|
"gnome.gnome-weather"
|
||||||
gpodder-configured
|
gpodder-configured
|
||||||
gthumb
|
gthumb
|
||||||
inkscape
|
# lollypop
|
||||||
kdenlive
|
|
||||||
kid3 # audio tagging
|
|
||||||
krita
|
|
||||||
libreoffice-fresh # XXX colin: maybe don't want this on mobile
|
|
||||||
lollypop
|
|
||||||
mpv
|
mpv
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
newsflash
|
# newsflash
|
||||||
nheko
|
nheko
|
||||||
obsidian
|
|
||||||
pavucontrol
|
pavucontrol
|
||||||
# picard # music tagging
|
# picard # music tagging
|
||||||
playerctl
|
playerctl
|
||||||
"libsForQt5.plasmatube" # Youtube player
|
# "libsForQt5.plasmatube" # Youtube player
|
||||||
soundconverter
|
soundconverter
|
||||||
# sublime music persists any downloaded albums here.
|
# sublime music persists any downloaded albums here.
|
||||||
# it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
|
# it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
|
||||||
|
@ -195,15 +180,33 @@ let
|
||||||
# possible to pass config as a CLI arg (sublime-music -c config.json)
|
# possible to pass config as a CLI arg (sublime-music -c config.json)
|
||||||
# { pkg = sublime-music; dir = [ ".local/share/sublime-music" ]; }
|
# { pkg = sublime-music; dir = [ ".local/share/sublime-music" ]; }
|
||||||
sublime-music-mobile
|
sublime-music-mobile
|
||||||
tdesktop # broken on phosh
|
# tdesktop # broken on phosh
|
||||||
tokodon
|
# tokodon
|
||||||
vlc
|
vlc
|
||||||
# pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure)
|
# pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure)
|
||||||
# whalebird
|
# whalebird
|
||||||
xdg-utils # for xdg-open
|
|
||||||
xterm # broken on phosh
|
xterm # broken on phosh
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
desktopGuiPkgs = {
|
||||||
|
inherit (flattenedPkgs)
|
||||||
|
audacity
|
||||||
|
chromium
|
||||||
|
dino
|
||||||
|
electrum
|
||||||
|
element-desktop
|
||||||
|
font-manager
|
||||||
|
gajim # XMPP client
|
||||||
|
gimp # broken on phosh
|
||||||
|
"gnome.gnome-disk-utility"
|
||||||
|
inkscape
|
||||||
|
kdenlive
|
||||||
|
kid3 # audio tagging
|
||||||
|
krita
|
||||||
|
libreoffice-fresh # XXX colin: maybe don't want this on mobile
|
||||||
|
obsidian
|
||||||
|
;
|
||||||
|
};
|
||||||
x86GuiPkgs = {
|
x86GuiPkgs = {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
discord
|
discord
|
||||||
|
@ -236,6 +239,7 @@ in
|
||||||
config = {
|
config = {
|
||||||
sane.programs = mkMerge [
|
sane.programs = mkMerge [
|
||||||
(declarePkgs consolePkgs)
|
(declarePkgs consolePkgs)
|
||||||
|
(declarePkgs desktopGuiPkgs)
|
||||||
(declarePkgs guiPkgs)
|
(declarePkgs guiPkgs)
|
||||||
(declarePkgs iphonePkgs)
|
(declarePkgs iphonePkgs)
|
||||||
(declarePkgs sysadminPkgs)
|
(declarePkgs sysadminPkgs)
|
||||||
|
@ -248,6 +252,10 @@ in
|
||||||
package = null;
|
package = null;
|
||||||
suggestedPrograms = attrNames consolePkgs;
|
suggestedPrograms = attrNames consolePkgs;
|
||||||
};
|
};
|
||||||
|
desktopGuiApps = {
|
||||||
|
package = null;
|
||||||
|
suggestedPrograms = attrNames desktopGuiPkgs;
|
||||||
|
};
|
||||||
guiApps = {
|
guiApps = {
|
||||||
package = null;
|
package = null;
|
||||||
suggestedPrograms = (attrNames guiPkgs)
|
suggestedPrograms = (attrNames guiPkgs)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user