From a0144c26dbbaeaa97634529ed128e39f3b410f36 Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Wed, 13 Sep 2023 01:24:50 +0200 Subject: [PATCH 1/3] [settings.ini] set theme to dark (gtk and cursor) --- .config/gtk-3.0/settings.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 85729f4d..ed8a1795 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,8 +1,8 @@ [Settings] gtk-font-name=Noto Sans 10 -gtk-theme-name=Arc-Darker -gtk-icon-theme-name=Qogir -gtk-cursor-theme-name=Qogir +gtk-theme-name=Arc-Dark +gtk-icon-theme-name=Qogir-dark +gtk-cursor-theme-name=Qogir-dark gtk-cursor-theme-size=16 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR From 99c57f1f41f0d9ab9a8fc67d2cf45070956832cf Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Wed, 13 Sep 2023 01:26:40 +0200 Subject: [PATCH 2/3] [.Xresources] set cursor to dark variant --- .Xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Xresources b/.Xresources index 2b423da3..567df63b 100644 --- a/.Xresources +++ b/.Xresources @@ -1,2 +1,2 @@ -Xcursor.theme: Qogir +Xcursor.theme: Qogir-dark Xcursor.size: 16 From 3a04912080bce517cb2b7011a60f554971184eaf Mon Sep 17 00:00:00 2001 From: killajoe Date: Wed, 18 Oct 2023 21:24:57 +0200 Subject: [PATCH 3/3] Galileo Release changes split reset non-conflicts --- .../autostart/firewall-applet.desktop | 0 {.config => etc/skel/.config}/dunst/dunstrc | 0 .../skel/.config}/example.picom.conf | 0 {.config => etc/skel/.config}/gtk-3.0/gtk.css | 0 .../skel/.config}/gtk-3.0/settings.ini | 0 {.config => etc/skel/.config}/i3/config | 1 + .../skel/.config}/i3/i3blocks.conf | 0 {.config => etc/skel/.config}/i3/keybindings | 0 .../skel/.config}/i3/scripts/bandwidth2 | 0 .../.config}/i3/scripts/battery-pinebook-pro | 0 .../skel/.config}/i3/scripts/battery1 | 0 .../skel/.config}/i3/scripts/battery2 | 0 .../skel/.config}/i3/scripts/blur-lock | 0 .../skel/.config}/i3/scripts/cpu_usage | 0 {.config => etc/skel/.config}/i3/scripts/disk | 0 .../skel/.config}/i3/scripts/empty_workspace | 0 .../skel/.config}/i3/scripts/keyboard-layout | 0 .../skel/.config}/i3/scripts/keyhint | 0 .../skel/.config}/i3/scripts/keyhint-2 | 0 .../skel/.config}/i3/scripts/memory | 0 .../skel/.config}/i3/scripts/openweather | 0 .../skel/.config}/i3/scripts/openweather-city | 0 .../skel/.config}/i3/scripts/openweather.conf | 0 .../skel/.config}/i3/scripts/power-profiles | 0 .../skel/.config}/i3/scripts/powermenu | 0 .../skel/.config}/i3/scripts/ppd-status | 0 .../skel/.config}/i3/scripts/temperature | 0 .../skel/.config}/i3/scripts/volume | 0 .../.config}/i3/scripts/volume_brightness.sh | 2 +- {.config => etc/skel/.config}/i3/scripts/vpn | 0 {.config => etc/skel/.config}/nano/nanorc | 0 .../skel/.config}/rofi/arc_dark_colors.rasi | 0 .../rofi/arc_dark_transparent_colors.rasi | 0 .../skel/.config}/rofi/power-profiles.rasi | 0 .../skel/.config}/rofi/powermenu.rasi | 0 .../skel/.config}/rofi/rofidmenu.rasi | 0 .../skel/.config}/rofi/rofikeyhint.rasi | 0 .../skel/.config}/xfce4/terminal/accels.scm | 0 .../skel/.config}/xfce4/terminal/terminalrc | 0 .profile => etc/skel/.profile | 0 .Xresources => etc/skel/Xresources | 0 etc/skel/set_once.sh | 4 ++++ xed.dconf => etc/skel/xed.dconf | 0 i3_install | 9 ++++----- i3_install_isomode | 19 +++++++++++++++++++ 45 files changed, 29 insertions(+), 6 deletions(-) rename {.config => etc/skel/.config}/autostart/firewall-applet.desktop (100%) rename {.config => etc/skel/.config}/dunst/dunstrc (100%) rename {.config => etc/skel/.config}/example.picom.conf (100%) rename {.config => etc/skel/.config}/gtk-3.0/gtk.css (100%) rename {.config => etc/skel/.config}/gtk-3.0/settings.ini (100%) rename {.config => etc/skel/.config}/i3/config (99%) rename {.config => etc/skel/.config}/i3/i3blocks.conf (100%) rename {.config => etc/skel/.config}/i3/keybindings (100%) rename {.config => etc/skel/.config}/i3/scripts/bandwidth2 (100%) rename {.config => etc/skel/.config}/i3/scripts/battery-pinebook-pro (100%) rename {.config => etc/skel/.config}/i3/scripts/battery1 (100%) rename {.config => etc/skel/.config}/i3/scripts/battery2 (100%) rename {.config => etc/skel/.config}/i3/scripts/blur-lock (100%) rename {.config => etc/skel/.config}/i3/scripts/cpu_usage (100%) rename {.config => etc/skel/.config}/i3/scripts/disk (100%) rename {.config => etc/skel/.config}/i3/scripts/empty_workspace (100%) rename {.config => etc/skel/.config}/i3/scripts/keyboard-layout (100%) rename {.config => etc/skel/.config}/i3/scripts/keyhint (100%) rename {.config => etc/skel/.config}/i3/scripts/keyhint-2 (100%) rename {.config => etc/skel/.config}/i3/scripts/memory (100%) rename {.config => etc/skel/.config}/i3/scripts/openweather (100%) rename {.config => etc/skel/.config}/i3/scripts/openweather-city (100%) rename {.config => etc/skel/.config}/i3/scripts/openweather.conf (100%) rename {.config => etc/skel/.config}/i3/scripts/power-profiles (100%) rename {.config => etc/skel/.config}/i3/scripts/powermenu (100%) rename {.config => etc/skel/.config}/i3/scripts/ppd-status (100%) rename {.config => etc/skel/.config}/i3/scripts/temperature (100%) rename {.config => etc/skel/.config}/i3/scripts/volume (100%) rename {.config => etc/skel/.config}/i3/scripts/volume_brightness.sh (98%) rename {.config => etc/skel/.config}/i3/scripts/vpn (100%) rename {.config => etc/skel/.config}/nano/nanorc (100%) rename {.config => etc/skel/.config}/rofi/arc_dark_colors.rasi (100%) rename {.config => etc/skel/.config}/rofi/arc_dark_transparent_colors.rasi (100%) rename {.config => etc/skel/.config}/rofi/power-profiles.rasi (100%) rename {.config => etc/skel/.config}/rofi/powermenu.rasi (100%) rename {.config => etc/skel/.config}/rofi/rofidmenu.rasi (100%) rename {.config => etc/skel/.config}/rofi/rofikeyhint.rasi (100%) rename {.config => etc/skel/.config}/xfce4/terminal/accels.scm (100%) rename {.config => etc/skel/.config}/xfce4/terminal/terminalrc (100%) rename .profile => etc/skel/.profile (100%) rename .Xresources => etc/skel/Xresources (100%) create mode 100644 etc/skel/set_once.sh rename xed.dconf => etc/skel/xed.dconf (100%) create mode 100644 i3_install_isomode diff --git a/.config/autostart/firewall-applet.desktop b/etc/skel/.config/autostart/firewall-applet.desktop similarity index 100% rename from .config/autostart/firewall-applet.desktop rename to etc/skel/.config/autostart/firewall-applet.desktop diff --git a/.config/dunst/dunstrc b/etc/skel/.config/dunst/dunstrc similarity index 100% rename from .config/dunst/dunstrc rename to etc/skel/.config/dunst/dunstrc diff --git a/.config/example.picom.conf b/etc/skel/.config/example.picom.conf similarity index 100% rename from .config/example.picom.conf rename to etc/skel/.config/example.picom.conf diff --git a/.config/gtk-3.0/gtk.css b/etc/skel/.config/gtk-3.0/gtk.css similarity index 100% rename from .config/gtk-3.0/gtk.css rename to etc/skel/.config/gtk-3.0/gtk.css diff --git a/.config/gtk-3.0/settings.ini b/etc/skel/.config/gtk-3.0/settings.ini similarity index 100% rename from .config/gtk-3.0/settings.ini rename to etc/skel/.config/gtk-3.0/settings.ini diff --git a/.config/i3/config b/etc/skel/.config/i3/config similarity index 99% rename from .config/i3/config rename to etc/skel/.config/i3/config index 215fb4f9..a92f6d64 100644 --- a/.config/i3/config +++ b/etc/skel/.config/i3/config @@ -1,3 +1,4 @@ +exec --no-startup-id ~/set_once.sh # This file is a modified version based on default i3-config-wizard config # source is available here: # https://raw.githubusercontent.com/endeavouros-team/endeavouros-i3wm-setup/master/.config/i3/config diff --git a/.config/i3/i3blocks.conf b/etc/skel/.config/i3/i3blocks.conf similarity index 100% rename from .config/i3/i3blocks.conf rename to etc/skel/.config/i3/i3blocks.conf diff --git a/.config/i3/keybindings b/etc/skel/.config/i3/keybindings similarity index 100% rename from .config/i3/keybindings rename to etc/skel/.config/i3/keybindings diff --git a/.config/i3/scripts/bandwidth2 b/etc/skel/.config/i3/scripts/bandwidth2 similarity index 100% rename from .config/i3/scripts/bandwidth2 rename to etc/skel/.config/i3/scripts/bandwidth2 diff --git a/.config/i3/scripts/battery-pinebook-pro b/etc/skel/.config/i3/scripts/battery-pinebook-pro similarity index 100% rename from .config/i3/scripts/battery-pinebook-pro rename to etc/skel/.config/i3/scripts/battery-pinebook-pro diff --git a/.config/i3/scripts/battery1 b/etc/skel/.config/i3/scripts/battery1 similarity index 100% rename from .config/i3/scripts/battery1 rename to etc/skel/.config/i3/scripts/battery1 diff --git a/.config/i3/scripts/battery2 b/etc/skel/.config/i3/scripts/battery2 similarity index 100% rename from .config/i3/scripts/battery2 rename to etc/skel/.config/i3/scripts/battery2 diff --git a/.config/i3/scripts/blur-lock b/etc/skel/.config/i3/scripts/blur-lock similarity index 100% rename from .config/i3/scripts/blur-lock rename to etc/skel/.config/i3/scripts/blur-lock diff --git a/.config/i3/scripts/cpu_usage b/etc/skel/.config/i3/scripts/cpu_usage similarity index 100% rename from .config/i3/scripts/cpu_usage rename to etc/skel/.config/i3/scripts/cpu_usage diff --git a/.config/i3/scripts/disk b/etc/skel/.config/i3/scripts/disk similarity index 100% rename from .config/i3/scripts/disk rename to etc/skel/.config/i3/scripts/disk diff --git a/.config/i3/scripts/empty_workspace b/etc/skel/.config/i3/scripts/empty_workspace similarity index 100% rename from .config/i3/scripts/empty_workspace rename to etc/skel/.config/i3/scripts/empty_workspace diff --git a/.config/i3/scripts/keyboard-layout b/etc/skel/.config/i3/scripts/keyboard-layout similarity index 100% rename from .config/i3/scripts/keyboard-layout rename to etc/skel/.config/i3/scripts/keyboard-layout diff --git a/.config/i3/scripts/keyhint b/etc/skel/.config/i3/scripts/keyhint similarity index 100% rename from .config/i3/scripts/keyhint rename to etc/skel/.config/i3/scripts/keyhint diff --git a/.config/i3/scripts/keyhint-2 b/etc/skel/.config/i3/scripts/keyhint-2 similarity index 100% rename from .config/i3/scripts/keyhint-2 rename to etc/skel/.config/i3/scripts/keyhint-2 diff --git a/.config/i3/scripts/memory b/etc/skel/.config/i3/scripts/memory similarity index 100% rename from .config/i3/scripts/memory rename to etc/skel/.config/i3/scripts/memory diff --git a/.config/i3/scripts/openweather b/etc/skel/.config/i3/scripts/openweather similarity index 100% rename from .config/i3/scripts/openweather rename to etc/skel/.config/i3/scripts/openweather diff --git a/.config/i3/scripts/openweather-city b/etc/skel/.config/i3/scripts/openweather-city similarity index 100% rename from .config/i3/scripts/openweather-city rename to etc/skel/.config/i3/scripts/openweather-city diff --git a/.config/i3/scripts/openweather.conf b/etc/skel/.config/i3/scripts/openweather.conf similarity index 100% rename from .config/i3/scripts/openweather.conf rename to etc/skel/.config/i3/scripts/openweather.conf diff --git a/.config/i3/scripts/power-profiles b/etc/skel/.config/i3/scripts/power-profiles similarity index 100% rename from .config/i3/scripts/power-profiles rename to etc/skel/.config/i3/scripts/power-profiles diff --git a/.config/i3/scripts/powermenu b/etc/skel/.config/i3/scripts/powermenu similarity index 100% rename from .config/i3/scripts/powermenu rename to etc/skel/.config/i3/scripts/powermenu diff --git a/.config/i3/scripts/ppd-status b/etc/skel/.config/i3/scripts/ppd-status similarity index 100% rename from .config/i3/scripts/ppd-status rename to etc/skel/.config/i3/scripts/ppd-status diff --git a/.config/i3/scripts/temperature b/etc/skel/.config/i3/scripts/temperature similarity index 100% rename from .config/i3/scripts/temperature rename to etc/skel/.config/i3/scripts/temperature diff --git a/.config/i3/scripts/volume b/etc/skel/.config/i3/scripts/volume similarity index 100% rename from .config/i3/scripts/volume rename to etc/skel/.config/i3/scripts/volume diff --git a/.config/i3/scripts/volume_brightness.sh b/etc/skel/.config/i3/scripts/volume_brightness.sh similarity index 98% rename from .config/i3/scripts/volume_brightness.sh rename to etc/skel/.config/i3/scripts/volume_brightness.sh index 398e2717..bb2e62e7 100644 --- a/.config/i3/scripts/volume_brightness.sh +++ b/etc/skel/.config/i3/scripts/volume_brightness.sh @@ -21,7 +21,7 @@ function get_mute { # Uses regex to get brightness from xbacklight function get_brightness { - xbacklight -get | grep -Po '[0-9]{1,3}' | head -n 1 + xbacklight | grep -Po '[0-9]{1,3}' | head -n 1 } # Returns a mute icon, a volume-low icon, or a volume-high icon, depending on the volume diff --git a/.config/i3/scripts/vpn b/etc/skel/.config/i3/scripts/vpn similarity index 100% rename from .config/i3/scripts/vpn rename to etc/skel/.config/i3/scripts/vpn diff --git a/.config/nano/nanorc b/etc/skel/.config/nano/nanorc similarity index 100% rename from .config/nano/nanorc rename to etc/skel/.config/nano/nanorc diff --git a/.config/rofi/arc_dark_colors.rasi b/etc/skel/.config/rofi/arc_dark_colors.rasi similarity index 100% rename from .config/rofi/arc_dark_colors.rasi rename to etc/skel/.config/rofi/arc_dark_colors.rasi diff --git a/.config/rofi/arc_dark_transparent_colors.rasi b/etc/skel/.config/rofi/arc_dark_transparent_colors.rasi similarity index 100% rename from .config/rofi/arc_dark_transparent_colors.rasi rename to etc/skel/.config/rofi/arc_dark_transparent_colors.rasi diff --git a/.config/rofi/power-profiles.rasi b/etc/skel/.config/rofi/power-profiles.rasi similarity index 100% rename from .config/rofi/power-profiles.rasi rename to etc/skel/.config/rofi/power-profiles.rasi diff --git a/.config/rofi/powermenu.rasi b/etc/skel/.config/rofi/powermenu.rasi similarity index 100% rename from .config/rofi/powermenu.rasi rename to etc/skel/.config/rofi/powermenu.rasi diff --git a/.config/rofi/rofidmenu.rasi b/etc/skel/.config/rofi/rofidmenu.rasi similarity index 100% rename from .config/rofi/rofidmenu.rasi rename to etc/skel/.config/rofi/rofidmenu.rasi diff --git a/.config/rofi/rofikeyhint.rasi b/etc/skel/.config/rofi/rofikeyhint.rasi similarity index 100% rename from .config/rofi/rofikeyhint.rasi rename to etc/skel/.config/rofi/rofikeyhint.rasi diff --git a/.config/xfce4/terminal/accels.scm b/etc/skel/.config/xfce4/terminal/accels.scm similarity index 100% rename from .config/xfce4/terminal/accels.scm rename to etc/skel/.config/xfce4/terminal/accels.scm diff --git a/.config/xfce4/terminal/terminalrc b/etc/skel/.config/xfce4/terminal/terminalrc similarity index 100% rename from .config/xfce4/terminal/terminalrc rename to etc/skel/.config/xfce4/terminal/terminalrc diff --git a/.profile b/etc/skel/.profile similarity index 100% rename from .profile rename to etc/skel/.profile diff --git a/.Xresources b/etc/skel/Xresources similarity index 100% rename from .Xresources rename to etc/skel/Xresources diff --git a/etc/skel/set_once.sh b/etc/skel/set_once.sh new file mode 100644 index 00000000..540156ea --- /dev/null +++ b/etc/skel/set_once.sh @@ -0,0 +1,4 @@ +#!/bin/sh +dbus-launch dconf load / < ~/xed.dconf +sed -i 's|\(exec --no-startup-id ~/set_once.sh\)|# \1|' ~/.config/i3/config +rm ~/xed.dconf ~/set_once.sh diff --git a/xed.dconf b/etc/skel/xed.dconf similarity index 100% rename from xed.dconf rename to etc/skel/xed.dconf diff --git a/i3_install b/i3_install index c64b0b7c..4827c80d 100644 --- a/i3_install +++ b/i3_install @@ -1,14 +1,13 @@ #!/usr/bin/env bash # Maintainer: joekamprad [joekamprad //a_t// endeavouros.com] git clone https://github.com/endeavouros-team/endeavouros-i3wm-setup.git -cd endeavouros-i3wm-setup +cd endeavouros-i3wm-setup/etc/skel/ cp -R .config ~/ chmod -R +x ~/.config/i3/scripts -cp xed.dconf ~/ -dbus-launch dconf load / < ~/xed.dconf +cp .Xresources .profile set_once.sh xed.dconf ~/ +cd .. +rm -rf endeavouros-i3wm-setup sed -i 's|\(exec --no-startup-id ~/set_once.sh\)|# \1|' ~/.config/i3/config #wget https://raw.githubusercontent.com/endeavouros-team/EndeavourOS-packages-lists/master/i3 #sudo pacman -S --needed - < i3 eos-packagelist --install "i3-Window-Manager" -cd .. -rm -rf endeavouros-i3wm-setup diff --git a/i3_install_isomode b/i3_install_isomode new file mode 100644 index 00000000..dc03402c --- /dev/null +++ b/i3_install_isomode @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# Maintainer: joekamprad [joekamprad //a_t// endeavouros.com] +username="$1" +git clone -b kde https://github.com/endeavouros-team/endeavouros-i3wm-setup.git +cd endeavouros-i3wm-setup/etc/skel/ +cp -R .config /home/$username/ +cp .Xresources .profile set_once.sh xed.dconf /home/$username/ +cd .. +rm -rf endeavouros-i3wm-setup +chown -R $username:$username /home/$username +su $username +cd /home/$username +chmod -R +x /home/$username/.config/i3/scripts +chmod +x /home/$username/set_once.sh +wget https://raw.githubusercontent.com/endeavouros-team/EndeavourOS-packages-lists/master/i3 +sudo pacman -S --needed --noconfirm - < /home/$username/i3 +rm /home/$username/i3 +#eos-packagelist --install "i3-Window-Manager" +cd /