From e61549d917e22a76c8aed4349f41fe06b24141d2 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 4 Jun 2024 14:38:32 +0000 Subject: [PATCH] moby: split remaining polyfill into roles.handheld --- hosts/by-name/moby/default.nix | 1 - hosts/by-name/moby/polyfill.nix | 42 -------------------- hosts/modules/roles/handheld.nix | 30 ++++++++++++++ pkgs/additional/sane-backgrounds/default.nix | 5 +++ 4 files changed, 35 insertions(+), 43 deletions(-) delete mode 100644 hosts/by-name/moby/polyfill.nix diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix index eba1c85c..b203b823 100644 --- a/hosts/by-name/moby/default.nix +++ b/hosts/by-name/moby/default.nix @@ -11,7 +11,6 @@ imports = [ ./fs.nix ./gps.nix - ./polyfill.nix ]; sane.hal.pine64.enable = true; diff --git a/hosts/by-name/moby/polyfill.nix b/hosts/by-name/moby/polyfill.nix deleted file mode 100644 index 55832afc..00000000 --- a/hosts/by-name/moby/polyfill.nix +++ /dev/null @@ -1,42 +0,0 @@ -# this file configures preferences per program, without actually enabling any programs. -# the goal is to separate the place where we decide *what* to use (i.e. `sane.programs.firefox.enable = true` -- at the toplevel) -# from where we specific how that thing should behave *if* it's in use. -# -# NixOS backgrounds: -# - -# - (colorful; unmerged) -# - (desktop-oriented; clean; unmerged) -# - - -{ lib, pkgs, sane-lib, ... }: -{ - sane.programs.firefox.config = { - # compromise impermanence for the sake of usability - persistCache = "private"; - persistData = "private"; - - # i don't do crypto stuff on moby - addons.ether-metamask.enable = false; - # sidebery UX doesn't make sense on small screen - addons.sidebery.enable = false; - }; - - sane.programs.alacritty.config.fontSize = 9; - - sane.programs.sway.config = { - font = "pango:monospace 10"; - mod = "Mod1"; # prefer Alt - workspace_layout = "tabbed"; - }; - - sane.programs.waybar.config = { - fontSize = 14; - height = 26; - persistWorkspaces = [ "1" "2" "3" "4" "5" ]; - modules.media = false; - modules.network = false; - modules.perf = false; - modules.windowTitle = false; - # TODO: show modem state - }; -} diff --git a/hosts/modules/roles/handheld.nix b/hosts/modules/roles/handheld.nix index 7900195a..c114adfc 100644 --- a/hosts/modules/roles/handheld.nix +++ b/hosts/modules/roles/handheld.nix @@ -13,6 +13,36 @@ "consoleMediaUtils" # overbroad, but handy on very rare occasion "handheldGuiApps" ]; + + sane.programs.alacritty.config.fontSize = 9; + + sane.programs.firefox.config = { + # compromise impermanence for the sake of usability + persistCache = "private"; + persistData = "private"; + + # i don't do crypto stuff on moby + addons.ether-metamask.enable = false; + # sidebery UX doesn't make sense on small screen + addons.sidebery.enable = false; + }; + + sane.programs.sway.config = { + font = "pango:monospace 10"; + mod = "Mod1"; # prefer Alt + workspace_layout = "tabbed"; + }; + + sane.programs.waybar.config = { + fontSize = 14; + height = 26; + persistWorkspaces = [ "1" "2" "3" "4" "5" ]; + modules.media = false; + modules.network = false; + modules.perf = false; + modules.windowTitle = false; + # TODO: show modem state + }; }; } diff --git a/pkgs/additional/sane-backgrounds/default.nix b/pkgs/additional/sane-backgrounds/default.nix index ce4a2391..6a5e83ab 100644 --- a/pkgs/additional/sane-backgrounds/default.nix +++ b/pkgs/additional/sane-backgrounds/default.nix @@ -1,3 +1,8 @@ +# NixOS backgrounds: +# - +# - (colorful; unmerged) +# - (desktop-oriented; clean; unmerged) +# - { stdenv , inkscape }: