diff --git a/hosts/modules/gui/sxmo/conky-config b/hosts/modules/gui/sxmo/conky-config index ddbcba85..3b493122 100644 --- a/hosts/modules/gui/sxmo/conky-config +++ b/hosts/modules/gui/sxmo/conky-config @@ -1,5 +1,3 @@ --- configversion: 737cb1de0389cee32a04785691a446a2 - -- docs: -- color names are X11 colors: -- - can also use #rrggbb syntax diff --git a/hosts/modules/gui/sxmo/default.nix b/hosts/modules/gui/sxmo/default.nix index af03c80d..02875520 100644 --- a/hosts/modules/gui/sxmo/default.nix +++ b/hosts/modules/gui/sxmo/default.nix @@ -270,14 +270,8 @@ in }; sane.user.fs.".config/sxmo/profile".symlink.text = let mkKeyValue = key: value: ''export ${key}="${value}"''; - userConfig = lib.generators.toKeyValue { inherit mkKeyValue; } cfg.settings; - in '' - # configversion: 4284f96d91e9550ff8f3b25823e402ad - # ^ upstream adds new options every now and then, expects user config file - # to include the md5sum of the template it's based on. - # see `setup_config_version.sh` - ${userConfig} - ''; + in + lib.generators.toKeyValue { inherit mkKeyValue; } cfg.settings; sane.user.fs.".config/sxmo/sway".symlink.target = pkgs.substituteAll { src = ./sway-config; diff --git a/hosts/modules/gui/sxmo/sway-config b/hosts/modules/gui/sxmo/sway-config index cf17b95e..08334ee1 100644 --- a/hosts/modules/gui/sxmo/sway-config +++ b/hosts/modules/gui/sxmo/sway-config @@ -1,8 +1,3 @@ -# Default config for sway -# configversion: 5eff902ecca36b4e75567322335cc81c -# -# Copy this to ~/.config/sway/config and edit it to your liking. -# # Read `man 5 sway` for a complete reference. ### Variables diff --git a/pkgs/additional/sxmo-utils/default.nix b/pkgs/additional/sxmo-utils/default.nix index 560adfb1..538f243a 100644 --- a/pkgs/additional/sxmo-utils/default.nix +++ b/pkgs/additional/sxmo-utils/default.nix @@ -65,6 +65,11 @@ let url = "https://git.uninsane.org/colin/sxmo-utils/commit/f99f474bf079da21a2afb5a97cbc9d52da496476.patch"; hash = "sha256-3WGgAJqiivUyC/wLpcxoQQq8b0qw+EVSfgHdVq+Iv4g="; }) + (fetchpatch { + name = "sxmo_migrate: add option to disable configversion checks"; + url = "https://git.uninsane.org/colin/sxmo-utils/commit/8949c64451973212a8aa50375396ec375c676d1e.patch"; + hash = "sha256-Okjjwa2FBJOrDVZGrfaUEPGQY749+V4w0gALIBp50hQ="; + }) ## these might or might not be upstream-worthy ./0104-full-auto-rotate.patch