diff options
| -rw-r--r-- | ranger/config/rifle.conf | 1 | ||||
| -rw-r--r-- | ranger/core/main.py | 22 |
2 files changed, 10 insertions, 13 deletions
diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf index 39dee7e9..a0b46a40 100644 --- a/ranger/config/rifle.conf +++ b/ranger/config/rifle.conf @@ -175,6 +175,7 @@ mime ^image, has mirage, X, flag f = mirage -- "$@" mime ^image, has ristretto, X, flag f = ristretto "$@" mime ^image, has eog, X, flag f = eog -- "$@" mime ^image, has eom, X, flag f = eom -- "$@" +mime ^image, has nomacs, X, flag f = nomacs -- "$@" mime ^image, has gimp, X, flag f = gimp -- "$@" ext xcf, X, flag f = gimp -- "$@" diff --git a/ranger/core/main.py b/ranger/core/main.py index 38513970..9a0fe59f 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -350,19 +350,6 @@ def load_settings( # pylint: disable=too-many-locals,too-many-branches,too-many LOG.debug("Loaded custom commands from '%s'", custom_comm_path) sys.dont_write_bytecode = old_bytecode_setting - allow_access_to_confdir(ranger.args.confdir, False) - - # Load rc.conf - custom_conf = fm.confpath('rc.conf') - default_conf = fm.relpath('config', 'rc.conf') - - if os.environ.get('RANGER_LOAD_DEFAULT_RC', 'TRUE').upper() != 'FALSE': - fm.source(default_conf) - if os.access(custom_conf, os.R_OK): - fm.source(custom_conf) - - allow_access_to_confdir(ranger.args.confdir, True) - # XXX Load plugins (experimental) plugindir = fm.confpath('plugins') try: @@ -399,6 +386,15 @@ def load_settings( # pylint: disable=too-many-locals,too-many-branches,too-many ranger.fm = None allow_access_to_confdir(ranger.args.confdir, False) + # Load rc.conf + custom_conf = fm.confpath('rc.conf') + default_conf = fm.relpath('config', 'rc.conf') + + if os.environ.get('RANGER_LOAD_DEFAULT_RC', 'TRUE').upper() != 'FALSE': + fm.source(default_conf) + if os.access(custom_conf, os.R_OK): + fm.source(custom_conf) + else: fm.source(fm.relpath('config', 'rc.conf')) |