From 9e2d872968a5ed32847aee4964f8d6a753f5203e Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Tue, 10 Oct 2023 10:57:39 -0700
Subject: [PATCH] Added config defaults

---
 config-template.lua => defaults.lua | 94 +++++++++++++++++------------
 rc.lua                              |  3 +-
 2 files changed, 57 insertions(+), 40 deletions(-)
 rename config-template.lua => defaults.lua (78%)

diff --git a/config-template.lua b/defaults.lua
similarity index 78%
rename from config-template.lua
rename to defaults.lua
index 92ad839..7fb8de7 100755
--- a/config-template.lua
+++ b/defaults.lua
@@ -1,22 +1,53 @@
--- Copy this file to `config.lua` before starting awesome.
+-- Default configuration values.
+-- Override these by creating `config.lua`
+-- Example contents:
+--
+--[[ config.lua
 
--- To enable a module, add a line like the ones below.
--- To disable a module, delete its config table or set
--- enabled to false.
 
-config.picom = { enabled = true }
+-- Override values in defaults.lua.
+-- If you only want to overwrite one, you'll need to do explicitly:
+-- config.core = { wallpaper = "" } will delete all other value in config.core.
+
+config.battery = { enabled = true }
+config.backlight = { enabled = true }
+config.launcher = { enabled = true, icon = "nix"}
+
+config.core.wallpaper = "/home/assets/wallpapers/Themed/Stellaris/upscale/City.png"
+config.core.default_clienticon = "arch_grey"
+config.core.browser = "firefox-developer-edition --new-tab"
+
+config.core.startup_commands = {
+	"ibus-daemon --daemonize --replace --xim",
+	"keepassxc"
+}
+
+
+]]--
+
+
+
+local config = {}
+
+config.launcher = { enabled = true, icon = "arch"}
 config.lock = { enabled = true, type = "i3lock"}
+config.screenshot = { enabled = true }
+config.simple_widgets = { enabled = true }
+config.keymap_popup = { enabled = true }
 config.battery = { enabled = false }
 config.backlight = { enabled = false }
-config.simple_widgets = { enabled = true }
-config.launcher = { enabled = true, icon = "arch" } -- available icons: arch, nix
-config.screenshot = { enabled = true }
-config.keymap_popup = { enabled = true }
+config.picom = { enabled = true }
 
 config.core = {
-	wallpaper = "/home/assets/wallpapers/Themed/Stellaris/Gigapixel/City.png",
+	-- Icon to use when a window doesn't provide one
 	default_clienticon = "arch_grey",
-	--
+	continuous_tag_updates = true,
+
+	-- Run these commands in this order when awesome starts.
+	startup_commands = {},
+
+	wallpaper = "",
+
 	-- Dynamic: a table of files and times
 	-- {file = "path", start_time = {hour, minute}}
 	--[[
@@ -24,18 +55,15 @@ config.core = {
 		{ file = "morning-file.png", start_time = {04, 00} },
 		{ file = "noon-file.png", start_time = {11, 00} },
 		{ file = "night-file.png", start_time = {19, 00} },
-	},
+	}
 	]]--
 
-	
 
-	-- Font definitions
 	font = {
 		normal_large = "Hack NF 16",
 		normal_medium = "Hack NF 14",
 		normal = "Hack NF 12",
 		normal_small = "Hack NF 10",
-
 		prompt = "Hack NF 14"
 	},
 
@@ -50,7 +78,7 @@ config.core = {
 	-- Preferred terminal.
 	terminal = "kitty",
 	-- Preferred browser.
-	browser = "firefox-developer-edition --new-tab",
+	browser = "firefox --new-tab",
 
 	-- Table of layouts.
 	-- This is not handled by the regular awesomewm facility.
@@ -90,19 +118,8 @@ config.core = {
 		--awful.layout.suit.corner.se,
 	},
 
-	-- Run these commands, in this order, when awesome starts.
-	startup_commands = {
-		"ibus-daemon --daemonize --replace --xim",
-		"keepassxc"
-	},
 
-	continuous_tag_updates = true,
 
-	-- Format:
-	-- {command, icon-name}
-	--
-	-- Icons files are in assets/apps,
-	-- Icon names are defined in assts/apps.lua.
 	bar_shortcuts = {
 		{
 			"thunar",
@@ -117,8 +134,8 @@ config.core = {
 			"thunderbird"
 		},
 		{
-			"onlyoffice-desktopeditors",
-			"writer"
+			"code",
+			"code"
 		},
 		{
 			"signal-desktop",
@@ -129,7 +146,6 @@ config.core = {
 			"keepassx"
 		}
 	}
-
 }
 
 config.mpc = {
@@ -145,7 +161,6 @@ config.mpc = {
 }
 
 
-
 config.volume = {
 	enabled = true,
 
@@ -156,11 +171,10 @@ config.volume = {
 	-- The pulse sink volume widgets and keybinds should use.
 	--   To use the default, keep this value an empty string.
 	--   Applies the --sink option to pamixer
-	pamixer_sink = ""
+	pamixer_sink = "",
 }
 
 
-
 config.ibus = {
 	enabled = true,
 
@@ -178,16 +192,18 @@ config.ibus = {
 			indicator_code = "en",
 			ibus_engine = "xkb:us::eng",
 		},
+		{
+			title = "Russian",
+			indicator_code = "ru",
+			ibus_engine = "xkb:ru::rus"
+		},
 		{
 			title = "LaTeX",
 			indicator_code = "∫x",
 			ibus_engine = "table:latex",
 			requires_engine = "xkb:us::eng"
-		},
-		{
-			title = "Russian",
-			indicator_code = "ru",
-			ibus_engine = "xkb:ru::rus"
 		}
 	}
-}
\ No newline at end of file
+}
+
+return config
\ No newline at end of file
diff --git a/rc.lua b/rc.lua
index 81dc5c9..fe028ea 100755
--- a/rc.lua
+++ b/rc.lua
@@ -10,7 +10,8 @@ require("awful.autofocus")
 -- Load configuration
 conf_dir = gears.filesystem.get_configuration_dir()
 conf_env = os.getenv("AWESOMEWM_CONFIG")
-config = {}
+config = require("defaults")
+
 if (conf_env == nil) then
 	-- Default location: in this directory
 	dofile(conf_dir .. "/config.lua")