From 6b8ab58884d042b8b1d5e6c8ff27c52ec9b4f9e3 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 3 Feb 2023 09:11:14 +0000 Subject: [PATCH] disable a bunch of moby package to speed up the build --- hosts/by-name/moby/default.nix | 2 + hosts/common/home/firefox.nix | 6 ++- modules/packages.nix | 78 +++++++++++++++++----------------- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix index 7146d24e..8e2b67c1 100644 --- a/hosts/by-name/moby/default.nix +++ b/hosts/by-name/moby/default.nix @@ -6,6 +6,8 @@ ./kernel.nix ]; + sane.web-browser.enable = lib.mkForce false; # TODO: re-enable after i can cross compile it + sane.roles.client = true; sane.services.wg-home.enable = true; sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip; diff --git a/hosts/common/home/firefox.nix b/hosts/common/home/firefox.nix index 6f2556cd..d93aeebf 100644 --- a/hosts/common/home/firefox.nix +++ b/hosts/common/home/firefox.nix @@ -103,6 +103,10 @@ let in { options = { + sane.web-browser.enable = mkOption { + default = config.sane.gui.enable; + type = types.bool; + }; sane.web-browser.browser = mkOption { default = defaultSettings; type = types.attrs; @@ -145,7 +149,7 @@ in }; }; - config = { + config = mkIf cfg.enable { # uBlock filter list configuration. # specifically, enable the GDPR cookie prompt blocker. diff --git a/modules/packages.nix b/modules/packages.nix index 5eb16c9c..18d09711 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -61,26 +61,26 @@ let guiPkgs = [ # GUI only - aerc # email client - audacity - celluloid # mpv frontend - chromium - clinfo - { pkg = dino; private = [ ".local/share/dino" ]; } - electrum + # aerc # email client + # audacity + # celluloid # mpv frontend + # chromium + # clinfo + # { pkg = dino; private = [ ".local/share/dino" ]; } + # electrum # creds/session keys, etc - { pkg = element-desktop; private = [ ".config/Element" ]; } + # { pkg = element-desktop; private = [ ".config/Element" ]; } # `emote` will show a first-run dialog based on what's in this directory. # mostly, it just keeps a LRU of previously-used emotes to optimize display order. # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience. - { pkg = emote; dir = [ ".local/share/Emote" ]; } - evince # works on phosh + # { pkg = emote; dir = [ ".local/share/Emote" ]; } + # evince # works on phosh # { pkg = fluffychat-moby; dir = [ ".local/share/chat.fluffy.fluffychat" ]; } # TODO: ship normal fluffychat on non-moby? - foliate - font-manager + # foliate + # font-manager # XXX by default fractal stores its state in ~/.local/share/. # after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir. @@ -88,40 +88,40 @@ let # { pkg = fractal-latest; private = [ ".local/share/fractal" ]; } # { pkg = fractal-next; private = [ ".local/share/fractal" ]; } - gajim # XMPP client - gimp # broken on phosh - gnome.cheese - gnome.dconf-editor - gnome-feeds # RSS reader (with claimed mobile support) - gnome.file-roller - gnome.gnome-disk-utility - gnome.gnome-maps # works on phosh + # gajim # XMPP client + # gimp # broken on phosh + # gnome.cheese + # gnome.dconf-editor + # gnome-feeds # RSS reader (with claimed mobile support) + # gnome.file-roller + # gnome.gnome-disk-utility + # gnome.gnome-maps # works on phosh gnome.nautilus # gnome-podcasts - gnome.gnome-system-monitor + # gnome.gnome-system-monitor gnome.gnome-terminal # works on phosh - gnome.gnome-weather + # gnome.gnome-weather # XXX: we preserve the whole thing because if we only preserve gPodder/Downloads # then startup is SLOW during feed import, and we might end up with zombie eps in the dl dir. { pkg = gpodder-configured; dir = [ "gPodder" ]; } gthumb - inkscape + # inkscape - kdenlive - kid3 # audio tagging + # kdenlive + # kid3 # audio tagging kitty - krita - libreoffice-fresh # XXX colin: maybe don't want this on mobile - lollypop + # krita + # libreoffice-fresh # XXX colin: maybe don't want this on mobile + # lollypop - { pkg = mpv; dir = [ ".config/mpv/watch_later" ]; } + # { pkg = mpv; dir = [ ".config/mpv/watch_later" ]; } networkmanagerapplet # not strictly necessary, but allows caching articles; offline use, etc. - { pkg = newsflash; dir = [ ".local/share/news-flash" ]; } + # { pkg = newsflash; dir = [ ".local/share/news-flash" ]; } { pkg = nheko; private = [ ".config/nheko" # config file (including client token) @@ -130,30 +130,30 @@ let ]; } # settings (electron app) - { pkg = obsidian; dir = [ ".config/obsidian" ]; } + # { pkg = obsidian; dir = [ ".config/obsidian" ]; } - pavucontrol - # picard # music tagging - playerctl + # pavucontrol + # # picard # music tagging + # playerctl - libsForQt5.plasmatube # Youtube player + # libsForQt5.plasmatube # Youtube player - soundconverter + # soundconverter # sublime music persists any downloaded albums here. # it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking # config (e.g. server connection details) is persisted in ~/.config/sublime-music/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-mobile; dir = [ ".local/share/sublime-music" ]; } - { pkg = tdesktop; private = [ ".local/share/TelegramDesktop" ]; } # broken on phosh + # { pkg = tdesktop; private = [ ".local/share/TelegramDesktop" ]; } # broken on phosh - { pkg = tokodon; private = [ ".cache/KDE/tokodon" ]; } + # { pkg = tokodon; private = [ ".cache/KDE/tokodon" ]; } # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf { pkg = vlc; dir = [ ".config/vlc" ]; } # pleroma client (Electron). input is broken on phosh. - { pkg = whalebird; private = [ ".config/Whalebird" ]; } + # { pkg = whalebird; private = [ ".config/Whalebird" ]; } xdg-utils # for xdg-open xterm # broken on phosh