Unify configs so we can get rid of all those branches per machine. Also Wayland changes for Violet
This commit is contained in:
parent
5a0041e7d5
commit
6dd362247e
10 changed files with 274 additions and 105 deletions
18
config.py
18
config.py
|
@ -27,6 +27,7 @@
|
|||
# Import Theme
|
||||
from libqtile import hook
|
||||
from libqtile.log_utils import logger
|
||||
from kuro.utils import load_config_class
|
||||
|
||||
try:
|
||||
from kuro.theme import Kuro
|
||||
|
@ -40,20 +41,15 @@ except ImportError as e:
|
|||
Kuro = None
|
||||
raise ImportError("Could not load theme Config or BaseTheme! Error: {}".format(e))
|
||||
|
||||
# Import theme configuration
|
||||
try:
|
||||
from kuro.config import Config
|
||||
except ImportError as e:
|
||||
logger.error("Could not load Kuro Config. Trying to load BaseConfig. Error: {}".format(e))
|
||||
try:
|
||||
from kuro.base import BaseConfig as Config
|
||||
except ImportError as e:
|
||||
Config = None
|
||||
raise ImportError("Could not load theme Config or BaseConfig! Error: {}".format(e))
|
||||
|
||||
# Import theme configuration
|
||||
Config = load_config_class()
|
||||
if Config is None:
|
||||
raise ImportError("Could not load theme Config or BaseConfig! Error: {}".format(e))
|
||||
|
||||
try:
|
||||
logger.warning("Initializing theme...")
|
||||
logger.warning(f"Using config variables for '{Config.get('config_name', '????')}'")
|
||||
# Initialize the Theme
|
||||
Theme.initialize()
|
||||
logger.warning("Initialize done")
|
||||
|
@ -114,6 +110,8 @@ except Exception as e:
|
|||
|
||||
|
||||
def main(qtile):
|
||||
Config.initialize(qtile)
|
||||
|
||||
# set logging level
|
||||
if Config.get('debug', False):
|
||||
if Config.get('verbose', False):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue