diff --git a/README.md b/README.md index 918be092..1e349569 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ building [hosts/](./hosts/) will require [sops][sops]. you might specifically be interested in these files (elaborated further in #key-points-of-interest): - ~~[`sxmo-utils`](./pkgs/additional/sxmo-utils/default.nix)~~ - - ~~[example SXMO deployment](./hosts/modules/gui/sxmo/default.nix)~~ - these files will remain until my config settles down, but i no longer use or maintain SXMO. - [my implementation of impermanence](./modules/persist/default.nix) - my way of deploying dotfiles/configuring programs per-user: diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix index d372cd4e..cd939736 100644 --- a/hosts/by-name/moby/default.nix +++ b/hosts/by-name/moby/default.nix @@ -1,7 +1,4 @@ # Pinephone -# other setups to reference: -# - -# - sxmo Arch user. lots of app recommendations # # wikis, resources, ...: # - Linux Phone Apps: @@ -34,7 +31,6 @@ sops.secrets.colin-passwd.neededForUsers = true; - # sane.gui.sxmo.enable = true; sane.programs.sway.enableFor.user.colin = true; sane.programs.swaylock.enableFor.user.colin = false; #< not usable on touch sane.programs.schlock.enableFor.user.colin = true; diff --git a/hosts/common/programs/conky/battery_estimate b/hosts/common/programs/conky/battery_estimate index 60d1d268..ce36d220 100755 --- a/hosts/common/programs/conky/battery_estimate +++ b/hosts/common/programs/conky/battery_estimate @@ -15,7 +15,7 @@ usage() { echo " --percent-suffix : use the provided string when displaying percents" } -# these icons come from sxmo; they only render in nerdfonts +# these icons may only render in nerdfonts icon_bat_chg=("󰢟" "󱊤" "󱊥" "󰂅") icon_bat_dis=("󰂎" "󱊡" "󱊢" "󱊣") suffix_icon=" " # thin space diff --git a/hosts/common/programs/conky/default.nix b/hosts/common/programs/conky/default.nix index bab9086a..6b34370a 100644 --- a/hosts/common/programs/conky/default.nix +++ b/hosts/common/programs/conky/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { sane.programs.conky = { - # TODO: non-sandboxed `conky` still ships via `sxmo-utils`, but unused sandbox.method = "bwrap"; sandbox.net = "clearnet"; #< for the scripts it calls (weather) sandbox.extraPaths = [ diff --git a/hosts/common/programs/fontconfig.nix b/hosts/common/programs/fontconfig.nix index d34fa230..eafd89c4 100644 --- a/hosts/common/programs/fontconfig.nix +++ b/hosts/common/programs/fontconfig.nix @@ -16,13 +16,11 @@ let # - 󰍦 (message bubble) # - 󰏲 (phone) # -  (weather/sun-behind-clouds) - # used particularly by sxmo utilities, but also a few of my own (e.g. conky) + # i use these icons mostly in conky, swaync. # # nerdfonts is very heavy. each font is 20-900 MiB (2 MiB per "variation") # lots of redundant data inside there, but no deduplication except whatever nix or the fs does implicitly. wantedNerdfonts = [ - # used explicitly by SXMO - # "DejaVuSansMono" # 25 MiB # good terminal/coding font. grab via nerdfonts for more emoji/unicode support "Hack" # 26 MiB "Noto" # 861 MiB diff --git a/hosts/common/programs/mpv/input.conf b/hosts/common/programs/mpv/input.conf index 07f5bb16..932dce67 100644 --- a/hosts/common/programs/mpv/input.conf +++ b/hosts/common/programs/mpv/input.conf @@ -4,7 +4,7 @@ # - properties: # let volume/power keys be interpreted by the system. -# this is important for sxmo. +# this is important for moby/bonsai. # mpv defaults is POWER = close, VOLUME_{UP,DOWN} = adjust application-level volume POWER ignore VOLUME_UP ignore diff --git a/hosts/common/programs/rofi/snippets.txt b/hosts/common/programs/rofi/snippets.txt index bcefb9e0..cc8f632a 100644 --- a/hosts/common/programs/rofi/snippets.txt +++ b/hosts/common/programs/rofi/snippets.txt @@ -5,7 +5,6 @@ https://nixos.org/manual/nix/stable/language/builtins.html https://github.com/nixos/nixpkgs/pulls?q= https://nur.nix-community.org/ https://repology.org/projects/?maintainer=colin@uninsane.org&inrepo=nix_unstable&outdated=1 -https://lists.sr.ht/~mil/sxmo-devel https://w.uninsane.org/viewer#search?books.name=wikipedia_en_all_maxi_2022-05&pattern= https://jackett.uninsane.org/UI/Dashboard#search= https://lemmy.uninsane.org diff --git a/hosts/common/programs/sane-scripts.nix b/hosts/common/programs/sane-scripts.nix index 709b40fc..8c83475a 100644 --- a/hosts/common/programs/sane-scripts.nix +++ b/hosts/common/programs/sane-scripts.nix @@ -247,13 +247,7 @@ in # extraHomePaths = [ ".config/sane-vpn" ]; }; - "sane-scripts.which".sandbox = { - method = "bwrap"; - extraHomePaths = [ - # for SXMO - ".config/sxmo/hooks" - ]; - }; + "sane-scripts.which".sandbox.method = "bwrap"; "sane-scripts.wipe".sandbox = { method = "bwrap"; diff --git a/hosts/common/programs/sfeed.nix b/hosts/common/programs/sfeed.nix index 1157e331..a0be7fc0 100644 --- a/hosts/common/programs/sfeed.nix +++ b/hosts/common/programs/sfeed.nix @@ -1,6 +1,5 @@ # simple RSS and Atom parser # - -# - used by sxmo # - man 5 sfeedrc # # call `sfeed_update` to query each feed and populate entries in ~/.sfeed/feeds diff --git a/hosts/common/programs/waybar/default.nix b/hosts/common/programs/waybar/default.nix index 48e1c892..8629c61b 100644 --- a/hosts/common/programs/waybar/default.nix +++ b/hosts/common/programs/waybar/default.nix @@ -91,18 +91,14 @@ in sandbox.whitelistWayland = true; sandbox.extraRuntimePaths = [ "sway" - # "sxmo_status" #< only necessary if relying on sxmo's statusbar periodicals service ]; sandbox.extraPaths = [ - # for wifi status on sxmo/phone - "/dev/rfkill" + # for wifi status on phone + # "/dev/rfkill" # for the battery indicator "/sys/class/power_supply" "/sys/devices" ]; - sandbox.extraHomePaths = [ - ".config/sxmo/hooks" - ]; fs.".config/waybar/config".symlink.target = (pkgs.formats.json {}).generate "waybar-config.json" [ diff --git a/hosts/common/programs/waybar/waybar-style.css b/hosts/common/programs/waybar/waybar-style.css index c1b07407..40d28f03 100644 --- a/hosts/common/programs/waybar/waybar-style.css +++ b/hosts/common/programs/waybar/waybar-style.css @@ -61,8 +61,6 @@ window#waybar { #cpu, #custom-media, #custom-swaync, -#custom-sxmo, -#custom-sxmo-sane, #disk, #idle_inhibitor, #memory, diff --git a/hosts/common/users/colin.nix b/hosts/common/users/colin.nix index 2e8dec2e..7006c289 100644 --- a/hosts/common/users/colin.nix +++ b/hosts/common/users/colin.nix @@ -17,7 +17,7 @@ "dialout" # required for modem access (moby) "export" # to read filesystem exports (servo) "feedbackd" # moby, so `fbcli` can control vibrator and LEDs - "input" # for /dev/input/: sxmo + "input" # for /dev/input/... TODO:is this still necessary? "media" # servo "networkmanager" "nixbuild" diff --git a/modules/services/eg25-manager.nix b/modules/services/eg25-manager.nix index 07f997dc..3e3398fc 100644 --- a/modules/services/eg25-manager.nix +++ b/modules/services/eg25-manager.nix @@ -1,5 +1,4 @@ # eg25-manager: -# - used by sxmo, in # - requires modemmanager (ModemManager.service) { config, lib, pkgs, ... }: let