From 1cf70fa9456b40b3d520a61198a1ad2a5c31617c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 26 Jan 2023 21:17:16 +0100 Subject: [PATCH] update configs --- .config/Vieb/viebrc | 4 ---- .config/conky/{conky.conf => conky.conf.cgt} | 20 ++++++++++---------- .config/dunst/{dunstrc => dunstrc.cgt} | 2 +- .config/gtk-3.0/settings.ini.cgt | 4 ++-- .config/gtk-4.0/settings.ini.cgt | 4 ++-- .config/i3/config.cgt | 14 +++++++------- .config/river/init.cgt | 2 +- .config/rofi/config.rasi.cgt | 2 +- cg_opts.lua | 10 ++++++++++ 9 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 .config/Vieb/viebrc rename .config/conky/{conky.conf => conky.conf.cgt} (61%) rename .config/dunst/{dunstrc => dunstrc.cgt} (99%) diff --git a/.config/Vieb/viebrc b/.config/Vieb/viebrc deleted file mode 100644 index fe4f3ac..0000000 --- a/.config/Vieb/viebrc +++ /dev/null @@ -1,4 +0,0 @@ -set firefoxmode=always -set nativenotification=always -set vimcommand=neovide - diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf.cgt similarity index 61% rename from .config/conky/conky.conf rename to .config/conky/conky.conf.cgt index 4d20fea..3c44cf1 100644 --- a/.config/conky/conky.conf +++ b/.config/conky/conky.conf.cgt @@ -5,7 +5,7 @@ conky.config = { cpu_avg_samples = 2, default_color = '#f8f8f2', double_buffer = true, - font = 'Bitstream Vera Sans:size=8', + font = '<% opt.font %>:size=8', gap_x = 64, gap_y = 64, minimum_width = 200, @@ -17,29 +17,29 @@ conky.config = { use_xft = true, } conky.text = [[ -${voffset 8}$color2${font Bitstream Vera Sans:size=16}${time %A}$font\ -${voffset -8}$alignr$color${font Bitstream Vera Sans:size=38}${time %e}$font -$color${voffset -30}$color${font Bitstream Vera Sans:size=18}${time %b}$font\ -${voffset -3} $color${font Bitstream Vera Sans:size=20}${time %Y}$font$color2$hr +${voffset 8}$color2${font <% opt.font %>:size=16}${time %A}$font\ +${voffset -8}$alignr$color${font <% opt.font %>:size=38}${time %e}$font +$color${voffset -30}$color${font <% opt.font %>:size=18}${time %b}$font\ +${voffset -3} $color${font <% opt.font %>:size=20}${time %Y}$font$color2$hr # -${voffset 20}${goto 40}${color}CPU${font Bitstream Vera Sans:bold:size=8}$alignr$cpu% +${voffset 20}${goto 40}${color}CPU${font <% opt.font %>:bold:size=8}$alignr$cpu% ${voffset 5}${goto 40}$font$color2${top name 1}$alignr$color${top cpu 1}% ${goto 40}$color2${top name 2}$alignr$color${top cpu 2}% ${goto 40}$color2${top name 3}$alignr$color${top cpu 3}% ${goto 40}$color2${top name 4}$alignr$color${top cpu 4}% # ${goto 40}$color2${top name 5}$alignr$color${top cpu 5}% # -${voffset 10}${goto 40}${color}RAM${font Bitstream Vera Sans:bold:size=8}$alignr$mem$font +${voffset 10}${goto 40}${color}RAM${font <% opt.font %>:bold:size=8}$alignr$mem$font ${goto 40}${voffset 5}$color2${top_mem name 1}$alignr$color${top_mem mem_res 1} ${goto 40}$color2${top_mem name 2}$alignr$color${top_mem mem_res 2} ${goto 40}$color2${top_mem name 3}$alignr$color${top_mem mem_res 3} ${goto 40}$color2${top_mem name 4}$alignr$color${top_mem mem_res 4} # ${goto 40}$color2${top_mem name 5}$alignr$color${top_mem mem_res 5} # -${voffset 10}${goto 40}${color}Swap${font Bitstream Vera Sans:bold:size=8}$alignr${swap}/ ${swapfree} +${voffset 10}${goto 40}${color}Swap${font <% opt.font %>:bold:size=8}$alignr${swap}/ ${swapfree} ${voffset 15}$font$alignr${execi 10000 awk -F= '/TION/ {print $2}' /etc/lsb-release |sed 's/"//g'} \ ${execi 10000 awk -F= '/EASE=/ {printf $2" "} /NAME/ {print $2}' /etc/lsb-release} ${voffset 10}${color2}${alignr}${execi 1200 whoami}@${nodename} -${alignr}${color2}${font Bitstream Vera Sans:size=8}uptime: ${color}${uptime_short} -${voffset 5}${color2}${font Bitstream Vera Sans:size=8}${alignr}kernel: ${color}${kernel} +${alignr}${color2}${font <% opt.font %>:size=8}uptime: ${color}${uptime_short} +${voffset 5}${color2}${font <% opt.font %>:size=8}${alignr}kernel: ${color}${kernel} ]] diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc.cgt similarity index 99% rename from .config/dunst/dunstrc rename to .config/dunst/dunstrc.cgt index dc71e14..fa2e088 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc.cgt @@ -86,7 +86,7 @@ ### Text ### - font = Monospace 10 + font = <% opt.font %> 10 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/.config/gtk-3.0/settings.ini.cgt b/.config/gtk-3.0/settings.ini.cgt index 13bcbed..77fb7c8 100644 --- a/.config/gtk-3.0/settings.ini.cgt +++ b/.config/gtk-3.0/settings.ini.cgt @@ -1,8 +1,8 @@ [Settings] gtk-theme-name=Dracula -gtk-icon-theme-name=candy-icons +gtk-icon-theme-name=<% opt.icon_theme %> gtk-font-name=<% opt.font %> 11 -gtk-cursor-theme-name=LyraQ-cursors +gtk-cursor-theme-name=<% opt.cursor_theme %> gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/.config/gtk-4.0/settings.ini.cgt b/.config/gtk-4.0/settings.ini.cgt index 1f694e6..eb2130b 100644 --- a/.config/gtk-4.0/settings.ini.cgt +++ b/.config/gtk-4.0/settings.ini.cgt @@ -1,8 +1,8 @@ [Settings] gtk-theme-name=Dracula -gtk-icon-theme-name=candy-icons +gtk-icon-theme-name=<% opt.icon_theme %> gtk-font-name=<% opt.font %> 11 -gtk-cursor-theme-name=LyraQ-cursors +gtk-cursor-theme-name=<% opt.cursor_theme %> gtk-cursor-theme-size=0 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 diff --git a/.config/i3/config.cgt b/.config/i3/config.cgt index 2317cd3..c63406c 100644 --- a/.config/i3/config.cgt +++ b/.config/i3/config.cgt @@ -39,8 +39,8 @@ bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous # other fancy keys -bindsym XF86Mail exec thunderbird -bindsym XF86Calculator exec qalculate-gtk +bindsym XF86Mail exec <% opt.commands.email %> +bindsym XF86Calculator exec <% opt.commands.calculator %> # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -48,11 +48,11 @@ floating_modifier $mod # start a terminal bindsym $mod+Return exec TERMINAL=<% opt.term.command %> i3-sensible-terminal -# open thunar -bindsym $mod+Ctrl+e exec thunar +# open file manager +bindsym $mod+Ctrl+e exec <% opt.commands.file_manager %> -# open luakit -bindsym $mod+Ctrl+b exec luakit +# open browser +bindsym $mod+Ctrl+b exec <% opt.commands.browser %> # vinput bindsym $mod+Ctrl+v exec vinput md @@ -278,4 +278,4 @@ bar { } } -<% opt.getDeviceConf("i3") %> +<% opt.getDeviceConf "i3" %> diff --git a/.config/river/init.cgt b/.config/river/init.cgt index 4c938d2..8af4dc0 100755 --- a/.config/river/init.cgt +++ b/.config/river/init.cgt @@ -161,7 +161,7 @@ riverctl csd-filter-add app-id "gedit" riverctl map normal Alt Space spawn 'wofi --show run' # cursor theme -riverctl xcursor-theme LyraQ-cursors +riverctl xcursor-theme <% opt.cursor_theme %> # power dialog riverctl map normal Super+Shift P spawn gpower2 diff --git a/.config/rofi/config.rasi.cgt b/.config/rofi/config.rasi.cgt index 841d422..6552ebf 100644 --- a/.config/rofi/config.rasi.cgt +++ b/.config/rofi/config.rasi.cgt @@ -3,7 +3,7 @@ configuration { modi: "window,drun,combi,emoji,nheko"; font: "<% opt.font %> 12"; show-icons: true; - icon-theme: "candy-icons"; + icon-theme: "<% opt.icon_theme %>"; combi-modi: "drun,nheko,window,run"; } @theme "dracula-sidebar.rasi" diff --git a/cg_opts.lua b/cg_opts.lua index 6b91960..e50f935 100644 --- a/cg_opts.lua +++ b/cg_opts.lua @@ -10,4 +10,14 @@ opts.term = { icon_name = "org.wezfurlong.wezterm", } +opts.cursor_theme = "LyraQ-cursors" +opts.icon_theme = "candy-icons" + +opts.commands = { + browser = "openbrowser", + email = "claws-mail", + calculator = "qalculate-gtk", + file_manager = "thunar", +} + return opts