diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml.cgt similarity index 97% rename from .config/alacritty/alacritty.yml rename to .config/alacritty/alacritty.yml.cgt index ea24587..fff048f 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml.cgt @@ -6,7 +6,7 @@ env: font: normal: - family: "Iosevka Term Nerd Font Mono" + family: "<% opt.term_font %>" bell: duration: 20 diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini.cgt similarity index 91% rename from .config/gtk-3.0/settings.ini rename to .config/gtk-3.0/settings.ini.cgt index 7a8866c..13bcbed 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini.cgt @@ -1,7 +1,7 @@ [Settings] gtk-theme-name=Dracula gtk-icon-theme-name=candy-icons -gtk-font-name=Iosevka Nerd Font 11 +gtk-font-name=<% opt.font %> 11 gtk-cursor-theme-name=LyraQ-cursors gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini.cgt similarity index 87% rename from .config/gtk-4.0/settings.ini rename to .config/gtk-4.0/settings.ini.cgt index 04be629..1f694e6 100644 --- a/.config/gtk-4.0/settings.ini +++ b/.config/gtk-4.0/settings.ini.cgt @@ -1,7 +1,7 @@ [Settings] gtk-theme-name=Dracula gtk-icon-theme-name=candy-icons -gtk-font-name=Iosevka Nerd Font 11 +gtk-font-name=<% opt.font %> 11 gtk-cursor-theme-name=LyraQ-cursors gtk-cursor-theme-size=0 gtk-enable-event-sounds=1 diff --git a/.config/i3/config b/.config/i3/config.cgt old mode 100755 new mode 100644 similarity index 96% rename from .config/i3/config rename to .config/i3/config.cgt index eeafda3..77181f8 --- a/.config/i3/config +++ b/.config/i3/config.cgt @@ -1,10 +1,3 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - # i3 config file (v4) # # Please see https://i3wm.org/docs/userguide.html for a complete reference! @@ -13,7 +6,7 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Iosevka Nerd Font 10 +font pango:<% opt.font %> 10 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -267,7 +260,7 @@ client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36 client.background #F8F8F2 bar { - font pango:Iosevka Term Nerd Font Mono 12 + font pango:<% opt.term_font %> 12 mode hide position top status_command i3status-rs diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf.cgt similarity index 96% rename from .config/kitty/kitty.conf rename to .config/kitty/kitty.conf.cgt index b82014b..d6f22ff 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf.cgt @@ -1,4 +1,4 @@ -font_family Iosevka Term Nerd Font Mono +font_family <% opt.term_font %> background_opacity 0.8 # https://draculatheme.com/kitty diff --git a/.config/luakit/theme.lua b/.config/luakit/theme.lua.cgt similarity index 96% rename from .config/luakit/theme.lua rename to .config/luakit/theme.lua.cgt index 9b59dee..eec06ee 100644 --- a/.config/luakit/theme.lua +++ b/.config/luakit/theme.lua.cgt @@ -15,7 +15,7 @@ local dracula = { local theme = {} -- Default settings -theme.font = "12px Iosevka Nerd Font" +theme.font = "12px <% opt.font %>" theme.fg = dracula.fg theme.bg = dracula.bg @@ -89,7 +89,7 @@ theme.trust_fg = dracula.green theme.notrust_fg = dracula.red -- Follow mode hints -theme.hint_font = "12px Iosevka Nerd Font, monospace, courier, sans-serif" +theme.hint_font = "12px <% opt.font %>, monospace, courier, sans-serif" theme.hint_fg = dracula.fg theme.hint_bg = dracula.very_bright_bg theme.hint_border = "2px dashed " .. dracula.green diff --git a/.config/luakit/usersettings.lua b/.config/luakit/usersettings.lua.cgt similarity index 93% rename from .config/luakit/usersettings.lua rename to .config/luakit/usersettings.lua.cgt index f6e37b2..19bff1e 100644 --- a/.config/luakit/usersettings.lua +++ b/.config/luakit/usersettings.lua.cgt @@ -1,6 +1,6 @@ local settings = require "settings" -local font_family = "Iosevka Nerd Font" +local font_family = "<% opt.font %>" settings.application.prefer_dark_mode = true diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi.cgt similarity index 86% rename from .config/rofi/config.rasi rename to .config/rofi/config.rasi.cgt index b25b6aa..841d422 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi.cgt @@ -1,7 +1,7 @@ configuration { /* requires rofi-emoji */ modi: "window,drun,combi,emoji,nheko"; - font: "Iosevka Nerd Font 12"; + font: "<% opt.font %> 12"; show-icons: true; icon-theme: "candy-icons"; combi-modi: "drun,nheko,window,run"; diff --git a/.config/wired/wired.ron b/.config/wired/wired.ron.cgt similarity index 96% rename from .config/wired/wired.ron rename to .config/wired/wired.ron.cgt index 0441ac8..cf16b6e 100644 --- a/.config/wired/wired.ron +++ b/.config/wired/wired.ron.cgt @@ -34,7 +34,7 @@ params: ScrollingTextBlock(( color: Color(hex: "#8be9fd"), ellipsize: End, - font: "Iosevka Nerd Font Bold 12", + font: "<% opt.font %> Bold 12", lhs_dist: 25.0, padding: Padding(left: 8.0, right: 8.0, top: 8.0, bottom: 4.0), rhs_dist: 25.0, @@ -54,7 +54,7 @@ text: "%b", color: Color(hex: "#f8f8f2"), ellipsize: End, - font: "Iosevka Nerd Font Bold 12", + font: "<% opt.font %> Bold 12", padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0), dimensions: ( width: (min: 500, max: 500), diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c7c97a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# confgen output +cgout diff --git a/.local/share/rofi/themes/dracula-sidebar.rasi b/.local/share/rofi/themes/dracula-sidebar.rasi.cgt similarity index 98% rename from .local/share/rofi/themes/dracula-sidebar.rasi rename to .local/share/rofi/themes/dracula-sidebar.rasi.cgt index f097eb1..c1b0c3a 100644 --- a/.local/share/rofi/themes/dracula-sidebar.rasi +++ b/.local/share/rofi/themes/dracula-sidebar.rasi.cgt @@ -80,7 +80,7 @@ element-text { background-color: inherit; text-color: inherit; vertical-align: 0.5; - font: "Iosevka Nerd Font Mono 24px"; + font: "<% opt.font %> 24px"; } element selected normal { background-color: @blue; diff --git a/.luarc.json b/.luarc.json index 4351138..c036ec0 100644 --- a/.luarc.json +++ b/.luarc.json @@ -3,7 +3,8 @@ "Lua.diagnostics.globals": [ "vim", "luakit", - "lfs" + "lfs", + "cg" ], "Lua.workspace.library": [ "${3rd}/lfs/library" diff --git a/cg_opts.lua b/cg_opts.lua new file mode 100644 index 0000000..d0d2bbe --- /dev/null +++ b/cg_opts.lua @@ -0,0 +1,6 @@ +local opts = {} + +opts.font = "Iosevka Nerd Font" +opts.term_font = "Iosevka Term Nerd Font Mono" + +return opts diff --git a/confgen.lua b/confgen.lua new file mode 100644 index 0000000..7a1bbab --- /dev/null +++ b/confgen.lua @@ -0,0 +1,8 @@ +cg.addPath ".config" +cg.addPath ".local" +cg.addPath ".ssh" +cg.addPath ".cargo" + +for k, v in pairs(require "cg_opts") do + cg.opt[k] = v +end diff --git a/justfile b/justfile index 205dc8f..efe6925 100644 --- a/justfile +++ b/justfile @@ -45,3 +45,7 @@ setup-nvim-config: install-mzte-nv rm -rf ~/.config/nvim cp -r mzte-nv/conf ~/.config/nvim mzte-nv-compile ~/.config/nvim + +confgen: + rm -rf cgout + confgen cgout