mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #281 from gpyh/master

Browse source 
Can customize fallback config directory
This commit is contained in:
Drew DeVault 2015-11-30 19:16:47 -05:00
commit 3075b4a61d
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0)
project(sway C) project(sway C)
set(FALLBACK_CONFIG_DIR "/etc/sway/")
add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"')
set(CMAKE_C_FLAGS "-g") set(CMAKE_C_FLAGS "-g")
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
SET(CMAKE_C_EXTENSIONS OFF) SET(CMAKE_C_EXTENSIONS OFF)
@ -80,7 +83,7 @@ install(
COMPONENT runtime) COMPONENT runtime)
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" FILES "${CMAKE_CURRENT_SOURCE_DIR}/config"
DESTINATION /etc/sway/ DESTINATION "${FALLBACK_CONFIG_DIR}"
COMPONENT configuration) COMPONENT configuration)
add_custom_target(man ALL) add_custom_target(man ALL)

6
README.md
View file

@ -57,8 +57,10 @@ On systems without logind, you need to suid the sway binary:
## Configuration ## Configuration
If you already use i3, then copy your i3 config to `~/.config/sway/config` and If you already use i3, then copy your i3 config to `~/.config/sway/config` and
it'll work out of the box. Otherwise, copy `/etc/sway/config` to it'll work out of the box. Otherwise, copy the sample configuration file to
`~/.config/sway/config`. Run `man 5 sway` for information on the configuration. `~/.config/sway/config`. It is located at `/etc/sway/config`, unless the
`DFALLBACK_CONFIG_DIR` flag has been set. Run `man 5 sway` for information on
the configuration.
## Running ## Running

12
sway.1.txt
View file

@ -66,11 +66,13 @@ Configuration
------------- -------------
If _-c_ is not specified, sway will look in several locations for your config If _-c_ is not specified, sway will look in several locations for your config
file. The default one is provided at /etc/sway/config. The suggested location for file. The suggested location for your config file is ~/.config/sway/config.
your config file is ~/.config/sway/config. ~/.sway/config will also work, and the ~/.sway/config will also work, and the rest of the usual XDG config locations
rest of the usual XDG config locations are supported. If no sway config is found, are supported. At last, sway looks for a config file in a fallback directory,
sway will attempt to load an i3 config from all the config locations i3 supports. which is /etc/sway/ by default. A standard configuration file is installed at
If still nothing is found, you will receive an error. this location. If no sway config is found, sway will attempt to load an i3
config from all the config locations i3 supports. If still nothing is found,
you will receive an error.
For information on the config file format, see **sway**(5). For information on the config file format, see **sway**(5).

2
sway/config.c
View file

@ -136,7 +136,7 @@ static char *get_config_path(void) {
"$XDG_CONFIG_HOME/sway/config", "$XDG_CONFIG_HOME/sway/config",
"$HOME/.i3/config", "$HOME/.i3/config",
"$XDG_CONFIG_HOME/i3/config", "$XDG_CONFIG_HOME/i3/config",
"/etc/sway/config", FALLBACK_CONFIG_DIR "config",
"/etc/i3/config", "/etc/i3/config",
}; };