Minor refactoring to move all runtime configs from 'config.js' into 'environment.js'. (#1588)

16 files changed, 252 insertions, 270 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 5365f9dbe..75d18f234 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -14,7 +14,8 @@ import OrderModel from '../../models/Order';
 
 import { sleep } from '../../helpers/async-helpers';
 
-import { RECIPES_PATH, SERVER_NOT_LOADED } from '../../config';
+import { SERVER_NOT_LOADED } from '../../config';
+import { RECIPES_PATH } from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index d31bb8933..4ba7dc720 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -14,11 +14,10 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import Input from '../../ui/Input';
 
 import {
-  DEFAULT_APP_SETTINGS,
   FRANZ_TRANSLATION,
   GITHUB_FRANZ_URL,
 } from '../../../config';
-import { isMac, isWindows } from '../../../environment';
+import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/config.js b/src/config.js
index d96a6068b..089ec1a8d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,9 +1,6 @@
-import ms from 'ms';
-import path from 'path';
-import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
-import { asarPath } from './helpers/asar-helpers';
+// Note: This file has now become devoid of all references to values deduced from the runtime process - all those now live in the `environment.js` file
 
-const { app, nativeTheme } = process.type === 'renderer' ? require('@electron/remote') : require('electron');
+import ms from 'ms';
 
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
@@ -122,61 +119,6 @@ export const ICON_SIZES = {
 // The bias should always be the "Normal icons" value
 export const iconSizeBias = 20;
 
-export const DEFAULT_APP_SETTINGS = {
-  autoLaunchInBackground: false,
-  runInBackground: true,
-  reloadAfterResume: true,
-  enableSystemTray: true,
-  startMinimized: false,
-  minimizeToSystemTray: false,
-  closeToSystemTray: false,
-  privateNotifications: false,
-  clipboardNotifications: true,
-  notifyTaskBarOnMessage: false,
-  showDisabledServices: true,
-  showMessageBadgeWhenMuted: true,
-  showDragArea: false,
-  enableSpellchecking: true,
-  spellcheckerLanguage: 'en-us',
-  darkMode: process.platform === 'darwin' ? nativeTheme.shouldUseDarkColors : false, // We can't use refs from `./environment` at this time
-  locale: '',
-  fallbackLocale: 'en-US',
-  beta: false,
-  isAppMuted: false,
-  enableGPUAcceleration: true,
-  serviceLimit: 5,
-
-  // Ferdi specific options
-  server: LIVE_FERDI_API,
-  predefinedTodoServer: DEFAULT_TODO_SERVICE,
-  autohideMenuBar: false,
-  lockingFeatureEnabled: false,
-  locked: false,
-  lockedPassword: '',
-  useTouchIdToUnlock: true,
-  scheduledDNDEnabled: false,
-  scheduledDNDStart: '17:00',
-  scheduledDNDEnd: '09:00',
-  hibernate: false,
-  hibernateOnStartup: true,
-  hibernationStrategy: 300,
-  inactivityLock: 0,
-  automaticUpdates: true,
-  showServiceNavigationBar: false,
-  universalDarkMode: true,
-  userAgentPref: '',
-  adaptableDarkMode: true,
-  accentColor: DEFAULT_ACCENT_COLOR,
-  serviceRibbonWidth: 68,
-  iconSize: iconSizeBias,
-  sentry: false,
-  nightly: false,
-  navigationBarBehaviour: 'custom',
-  searchEngine: SEARCH_ENGINE_DDG,
-  useVerticalStyle: false,
-  alwaysShowWorkspaces: false,
-};
-
 export const DEFAULT_FEATURES_CONFIG = {
   isSpellcheckerIncludedInCurrentPlan: true,
   needToWaitToProceed: false,
@@ -217,45 +159,6 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 export const LOCAL_SERVER = 'You are using Ferdi without a server';
 export const SERVER_NOT_LOADED = 'Ferdi::SERVER_NOT_LOADED';
 
-// TODO: This seems to be duplicated between here and 'index.js'
-// Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', path.join(app.getPath('appData')));
-} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
-} else if (process.platform === 'win32') {
-  app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', path.join(app.getPath('appData'), app.name));
-}
-
-const ELECTRON_IS_DEV_VAR = 'ELECTRON_IS_DEV';
-const NODE_ENV_VAR = 'NODE_ENV';
-
-// TODO Move this to environment.js and remove the re-export from there.
-export const isDevMode = (() => {
-  const isEnvVarSet = name => name in process.env;
-  if (isEnvVarSet(ELECTRON_IS_DEV_VAR)) {
-    // Copied from https://github.com/sindresorhus/electron-is-dev/blob/f05330b856782dac7987b10859bfd95ea6a187a6/index.js
-    // but electron-is-dev breaks in a renderer process, so we use the app import from above instead.
-    const electronIsDev = process.env[ELECTRON_IS_DEV_VAR];
-    return electronIsDev === 'true' || Number.parseInt(electronIsDev, 10) === 1;
-  }
-  if (isEnvVarSet(NODE_ENV_VAR)) {
-    return process.env[NODE_ENV_VAR] === 'development';
-  }
-  return !app.isPackaged;
-})();
-if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}Dev`));
-}
-
-export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
-
-// Replacing app.asar is not beautiful but unfortunately necessary
-export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
-
 export const ALLOWED_PROTOCOLS = [
   'https:',
   'http:',
@@ -285,7 +188,6 @@ export const PLANS_MAPPING = {
   free: PLANS.FREE,
 };
 
-
 export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
 
 export const DEFAULT_SERVICE_LIMIT = 3;
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 93c5daca2..d601e03d4 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -10,10 +10,10 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
-  DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
+  HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
   DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER,
 } from '../../config';
-import { isMac } from '../../environment';
+import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index c69a70e2f..117f62ea8 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -14,7 +14,8 @@ import UserStore from '../../stores/UserStore';
 
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config';
+import { FRANZ_DEV_DOCS } from '../../config';
+import { RECIPES_PATH } from '../../environment';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 743d48632..2f3f8261a 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -2,7 +2,7 @@ import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
 import path from 'path';
 
-import { SETTINGS_PATH } from '../config';
+import { SETTINGS_PATH } from '../environment';
 
 const debug = require('debug')('Ferdi:Settings');
 
diff --git a/src/environment.js b/src/environment.js
index 18d686232..6a55045a7 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,5 +1,8 @@
+import path from 'path';
+
+import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
+
 import {
-  isDevMode as isDev,
   LIVE_FERDI_API,
   DEV_FRANZ_API,
   LOCAL_API,
@@ -12,16 +15,56 @@ import {
   LOCAL_TODOS_FRONTEND_URL,
   PRODUCTION_TODOS_FRONTEND_URL,
   LIVE_FRANZ_API,
+  DEFAULT_TODO_SERVICE,
+  SEARCH_ENGINE_DDG,
+  iconSizeBias,
 } from './config';
 
+import { asarPath } from './helpers/asar-helpers';
+
 // eslint-disable-next-line global-require
 export const { app } = process.type === 'renderer' ? require('@electron/remote') : require('electron');
+const { nativeTheme } = process.type === 'renderer' ? require('@electron/remote') : require('electron');
 
-// TODO Remove this re-export and move the code from config.js to here.
-export const isDevMode = isDev;
+// TODO: This seems to be duplicated between here and 'index.js'
+// Set app directory before loading user modules
+if (process.env.FERDI_APPDATA_DIR != null) {
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', path.join(app.getPath('appData')));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
+} else if (process.platform === 'win32') {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', path.join(app.getPath('appData'), app.name));
+}
+
+const ELECTRON_IS_DEV_VAR = 'ELECTRON_IS_DEV';
+const NODE_ENV_VAR = 'NODE_ENV';
+
+export const isDevMode = (() => {
+  const isEnvVarSet = name => name in process.env;
+  if (isEnvVarSet(ELECTRON_IS_DEV_VAR)) {
+    // Copied from https://github.com/sindresorhus/electron-is-dev/blob/f05330b856782dac7987b10859bfd95ea6a187a6/index.js
+    // but electron-is-dev breaks in a renderer process, so we use the app import from above instead.
+    const electronIsDev = process.env[ELECTRON_IS_DEV_VAR];
+    return electronIsDev === 'true' || Number.parseInt(electronIsDev, 10) === 1;
+  }
+  if (isEnvVarSet(NODE_ENV_VAR)) {
+    return process.env[NODE_ENV_VAR] === 'development';
+  }
+  return !app.isPackaged;
+})();
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}Dev`));
+}
+
+export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
+
+// Replacing app.asar is not beautiful but unfortunately necessary
+export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
 
 export const useLiveAPI = process.env.LIVE_API;
-export const useLocalAPI = process.env.LOCAL_API;
 
 let { platform } = process;
 if (process.env.OS_PLATFORM) {
@@ -46,7 +89,7 @@ if (!isDevMode || (isDevMode && useLiveAPI)) {
   web = LIVE_API_FERDI_WEBSITE;
   // web = DEV_API_FRANZ_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
-} else if (isDevMode && useLocalAPI) {
+} else if (isDevMode && process.env.LOCAL_API) {
   api = LOCAL_API;
   wsApi = LOCAL_WS_API;
   web = LOCAL_API_WEBSITE;
@@ -64,6 +107,61 @@ export const WS_API = wsApi;
 export const WEBSITE = web;
 export const TODOS_FRONTEND = todos;
 
+export const DEFAULT_APP_SETTINGS = {
+  autoLaunchInBackground: false,
+  runInBackground: true,
+  reloadAfterResume: true,
+  enableSystemTray: true,
+  startMinimized: false,
+  minimizeToSystemTray: false,
+  closeToSystemTray: false,
+  privateNotifications: false,
+  clipboardNotifications: true,
+  notifyTaskBarOnMessage: false,
+  showDisabledServices: true,
+  showMessageBadgeWhenMuted: true,
+  showDragArea: false,
+  enableSpellchecking: true,
+  spellcheckerLanguage: 'en-us',
+  darkMode: isMac ? nativeTheme.shouldUseDarkColors : false,
+  locale: '',
+  fallbackLocale: 'en-US',
+  beta: false,
+  isAppMuted: false,
+  enableGPUAcceleration: true,
+  serviceLimit: 5,
+
+  // Ferdi specific options
+  server: LIVE_FERDI_API,
+  predefinedTodoServer: DEFAULT_TODO_SERVICE,
+  autohideMenuBar: false,
+  lockingFeatureEnabled: false,
+  locked: false,
+  lockedPassword: '',
+  useTouchIdToUnlock: true,
+  scheduledDNDEnabled: false,
+  scheduledDNDStart: '17:00',
+  scheduledDNDEnd: '09:00',
+  hibernate: false,
+  hibernateOnStartup: true,
+  hibernationStrategy: 300,
+  inactivityLock: 0,
+  automaticUpdates: true,
+  showServiceNavigationBar: false,
+  universalDarkMode: true,
+  userAgentPref: '',
+  adaptableDarkMode: true,
+  accentColor: DEFAULT_ACCENT_COLOR,
+  serviceRibbonWidth: 68,
+  iconSize: iconSizeBias,
+  sentry: false,
+  nightly: false,
+  navigationBarBehaviour: 'custom',
+  searchEngine: SEARCH_ENGINE_DDG,
+  useVerticalStyle: false,
+  alwaysShowWorkspaces: false,
+};
+
 export function termsBase() {
   return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
 }
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 4e465286a..794d20142 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -13,7 +13,7 @@ import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
 import { matchRoute } from '../../helpers/routing-helpers';
-import { DEFAULT_APP_SETTINGS } from '../../config';
+import { DEFAULT_APP_SETTINGS } from '../../environment';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
index b5648250e..87651a3f4 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.js
@@ -1,7 +1,8 @@
 import color from 'color';
 import { reaction } from 'mobx';
 import themeInfo from '../../assets/themeInfo.json';
-import { DEFAULT_APP_SETTINGS, iconSizeBias } from '../../config';
+import { iconSizeBias } from '../../config';
+import { DEFAULT_APP_SETTINGS } from '../../environment';
 
 const STYLE_ELEMENT_ID = 'custom-appearance-style';
 
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 3c57f5df3..8401184de 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3241,416 +3241,416 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headline",
         "start": {
           "column": 12,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 28
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.sentryInfo",
         "start": {
           "column": 14,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.hibernateInfo",
         "start": {
           "column": 17,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.inactivityLockInfo",
         "start": {
           "column": 22,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.todoServerInfo",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPassword",
         "start": {
           "column": 18,
-          "line": 48
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 54
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPasswordInfo",
         "start": {
           "column": 22,
-          "line": 52
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 58
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockInfo",
         "start": {
           "column": 12,
-          "line": 56
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 62
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDTimeInfo",
         "start": {
           "column": 24,
-          "line": 60
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 66
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDInfo",
         "start": {
           "column": 20,
-          "line": 64
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 70
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 68
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 74
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 72
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 78
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 76
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 82
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.universalDarkModeInfo",
         "start": {
           "column": 25,
-          "line": 80
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 86
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.accentColorInfo",
         "start": {
           "column": 19,
-          "line": 84
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Privacy",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 90
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlinePrivacy",
         "start": {
           "column": 19,
-          "line": 88
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 94
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 92
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 98
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 96
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 102
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.spellCheckerLanguageInfo",
         "start": {
           "column": 28,
-          "line": 100
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 106
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 104
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 110
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 108
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 114
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheNotCleared",
         "start": {
           "column": 19,
-          "line": 112
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 118
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 116
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 122
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 120
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 126
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 124
+          "line": 123
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 130
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 128
+          "line": 127
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 134
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 132
+          "line": 131
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 138
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 136
+          "line": 135
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 142
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 140
+          "line": 139
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 146
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 22,
-          "line": 144
+          "line": 143
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 150
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 148
+          "line": 147
         }
       }
     ],
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index a1e8c714e..c96a1de22 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 12
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 30,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 35,
+      "line": 34,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 35,
       "column": 17
     },
     "end": {
-      "line": 39,
+      "line": 38,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 39,
       "column": 22
     },
     "end": {
-      "line": 43,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 47,
       "column": 18
     },
     "end": {
-      "line": 51,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 51,
       "column": 22
     },
     "end": {
-      "line": 55,
+      "line": 54,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 55,
       "column": 12
     },
     "end": {
-      "line": 59,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 59,
       "column": 24
     },
     "end": {
-      "line": 63,
+      "line": 62,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 63,
       "column": 20
     },
     "end": {
-      "line": 67,
+      "line": 66,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 67,
       "column": 20
     },
     "end": {
-      "line": 71,
+      "line": 70,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 71,
       "column": 19
     },
     "end": {
-      "line": 75,
+      "line": 74,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 75,
       "column": 22
     },
     "end": {
-      "line": 79,
+      "line": 78,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 79,
       "column": 25
     },
     "end": {
-      "line": 83,
+      "line": 82,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 83,
       "column": 19
     },
     "end": {
-      "line": 87,
+      "line": 86,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Privacy",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 88,
+      "line": 87,
       "column": 19
     },
     "end": {
-      "line": 91,
+      "line": 90,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 92,
+      "line": 91,
       "column": 20
     },
     "end": {
-      "line": 95,
+      "line": 94,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 96,
+      "line": 95,
       "column": 19
     },
     "end": {
-      "line": 99,
+      "line": 98,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 100,
+      "line": 99,
       "column": 28
     },
     "end": {
-      "line": 103,
+      "line": 102,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 104,
+      "line": 103,
       "column": 20
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 13
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Couldn't clear all cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 112,
+      "line": 111,
       "column": 19
     },
     "end": {
-      "line": 115,
+      "line": 114,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 116,
+      "line": 115,
       "column": 23
     },
     "end": {
-      "line": 119,
+      "line": 118,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 120,
+      "line": 119,
       "column": 25
     },
     "end": {
-      "line": 123,
+      "line": 122,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 124,
+      "line": 123,
       "column": 23
     },
     "end": {
-      "line": 127,
+      "line": 126,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 128,
+      "line": 127,
       "column": 25
     },
     "end": {
-      "line": 131,
+      "line": 130,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 132,
+      "line": 131,
       "column": 25
     },
     "end": {
-      "line": 135,
+      "line": 134,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 136,
+      "line": 135,
       "column": 24
     },
     "end": {
-      "line": 139,
+      "line": 138,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 140,
+      "line": 139,
       "column": 18
     },
     "end": {
-      "line": 143,
+      "line": 142,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 144,
+      "line": 143,
       "column": 22
     },
     "end": {
-      "line": 147,
+      "line": 146,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 148,
+      "line": 147,
       "column": 22
     },
     "end": {
-      "line": 151,
+      "line": 150,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 21cf61c0c..d3b996540 100644
--- a/src/index.js
+++ b/src/index.js
@@ -16,35 +16,16 @@ import ms from 'ms';
 
 require('@electron/remote/main').initialize();
 
-import {
-  DEFAULT_APP_SETTINGS,
-  DEFAULT_WINDOW_OPTIONS,
-} from './config';
+import { DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
+  DEFAULT_APP_SETTINGS,
   isDevMode,
   isMac,
   isWindows,
   isLinux,
 } from './environment';
 
-// TODO: This seems to be duplicated between here and 'config.js'
-// Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', path.join(app.getPath('appData')));
-} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
-} else if (process.platform === 'win32') {
-  app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', path.join(app.getPath('appData'), app.name));
-}
-
-if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}Dev`));
-}
-
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 4af802460..dd4ab3629 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -13,8 +13,8 @@ import { readJsonSync } from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac } from '../environment';
+import { CHECK_INTERVAL } from '../config';
+import { DEFAULT_APP_SETTINGS, isMac } from '../environment';
 import locales from '../i18n/translations';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 965aa3a0a..b49fb72d9 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -7,7 +7,7 @@ import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
-import { RECIPES_PATH } from '../config';
+import { RECIPES_PATH } from '../environment';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b433efd45..292242552 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -5,9 +5,9 @@ import {
 } from 'mobx';
 import localStorage from 'mobx-localstorage';
 import {
-  DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER, SEARCH_ENGINE_DDG,
+  FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER, SEARCH_ENGINE_DDG,
 } from '../config';
-import { API } from '../environment';
+import { API, DEFAULT_APP_SETTINGS } from '../environment';
 import { getLocale } from '../helpers/i18n-helpers';
 import { hash } from '../helpers/password-helpers';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 6c382d388..8da45864b 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -29,8 +29,7 @@ import contextMenu from './contextMenu';
 import './notifications';
 import { screenShareCss } from './screenshare';
 
-import { DEFAULT_APP_SETTINGS } from '../config';
-import { isDevMode } from '../environment';
+import { DEFAULT_APP_SETTINGS, isDevMode } from '../environment';
 
 const debug = require('debug')('Ferdi:Plugin');