From 7594c06095117a1bda51f84ad9209965082c205a Mon Sep 17 00:00:00 2001 From: linarphy Date: Wed, 2 Aug 2023 01:33:40 +0200 Subject: [PATCH] Add more config --- private_dot_config/alacritty/alacritty.toml | 2 ++ private_dot_config/alacritty/colors.toml | 4 ++++ private_dot_config/nvim/lua/display/graphic.lua | 2 +- private_dot_config/scripts/executable_generate | 8 ++++++++ private_dot_config/scripts/executable_get_color | 10 ++++++++++ private_dot_config/settings/colors.conf | 4 ++++ .../sway/config.d/display/background.conf | 2 +- private_dot_config/sway/config.d/display/bar.conf | 10 +++++++--- .../sway/config.d/display/colors.conf | 4 ++++ .../config.d/display/empty_general_display.conf | 0 .../sway/config.d/display/general_display.conf | 1 - private_dot_config/sway/config.d/display/init.conf | 6 +++++- .../sway/config.d/display/window.conf | 13 +++++++++++++ .../sway/config.d/general/autostart.conf | 5 +++++ private_dot_config/sway/config.d/general/init.conf | 2 ++ .../sway/config.d/plugins/systemd/init.conf | 2 ++ .../sway/config.d/plugins/systemd/target.conf | 3 +++ 17 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 private_dot_config/alacritty/colors.toml create mode 100644 private_dot_config/scripts/executable_generate create mode 100644 private_dot_config/scripts/executable_get_color create mode 100644 private_dot_config/settings/colors.conf create mode 100644 private_dot_config/sway/config.d/display/colors.conf create mode 100644 private_dot_config/sway/config.d/display/empty_general_display.conf delete mode 100644 private_dot_config/sway/config.d/display/general_display.conf create mode 100644 private_dot_config/sway/config.d/display/window.conf create mode 100644 private_dot_config/sway/config.d/general/autostart.conf create mode 100644 private_dot_config/sway/config.d/plugins/systemd/target.conf diff --git a/private_dot_config/alacritty/alacritty.toml b/private_dot_config/alacritty/alacritty.toml index dbc7610..bb1f7d6 100644 --- a/private_dot_config/alacritty/alacritty.toml +++ b/private_dot_config/alacritty/alacritty.toml @@ -1,3 +1,5 @@ +import = [ "~/.config/alacritty/colors.toml" ] + [font] size = 10.0 [font.normal] diff --git a/private_dot_config/alacritty/colors.toml b/private_dot_config/alacritty/colors.toml new file mode 100644 index 0000000..665a989 --- /dev/null +++ b/private_dot_config/alacritty/colors.toml @@ -0,0 +1,4 @@ +[colors] +[colors.primary] +background = "#20262E" +foreground = "#E9E8E8" diff --git a/private_dot_config/nvim/lua/display/graphic.lua b/private_dot_config/nvim/lua/display/graphic.lua index 6a0bcfa..78de4f5 100644 --- a/private_dot_config/nvim/lua/display/graphic.lua +++ b/private_dot_config/nvim/lua/display/graphic.lua @@ -4,4 +4,4 @@ Loads general graphic settings vim.opt.guifont = "mononoki NFM:h11" -- set font vim.opt.background = dark -- set theme -vim.cmd( 'silent! colorscheme monokai') -- set colorscheme +vim.cmd( 'silent! colorscheme monokai_pro') -- set colorscheme diff --git a/private_dot_config/scripts/executable_generate b/private_dot_config/scripts/executable_generate new file mode 100644 index 0000000..dcefd9f --- /dev/null +++ b/private_dot_config/scripts/executable_generate @@ -0,0 +1,8 @@ +#! /bin/sh + +awk '{print "set $"$1, $2}' ~/.config/settings/colors.conf | tee ~/.config/sway/config.d/display/colors.conf + +echo "[colors] +[colors.primary] +background = \"$(grep dark_main ~/.config/settings/colors.conf | cut -d ' ' -f 2)\" +foreground = \"$(grep light_main ~/.config/settings/colors.conf | cut -d ' ' -f 2 )\"" | tee ~/.config/alacritty/colors.toml diff --git a/private_dot_config/scripts/executable_get_color b/private_dot_config/scripts/executable_get_color new file mode 100644 index 0000000..128db83 --- /dev/null +++ b/private_dot_config/scripts/executable_get_color @@ -0,0 +1,10 @@ +#! /bin/sh +if [ ${1} = '-h' ] +then + echo "Get current theme color + + Usage: get_color dark|light accent|main" + exit 0 +else + grep "${1}_${2}" ~/.config/settings/colors.conf | cut -d " " -f 2 +fi diff --git a/private_dot_config/settings/colors.conf b/private_dot_config/settings/colors.conf new file mode 100644 index 0000000..464bad7 --- /dev/null +++ b/private_dot_config/settings/colors.conf @@ -0,0 +1,4 @@ +dark_main #20262E +dark_accent #913175 +light_accent #CD5888 +light_main #E9E8E8 diff --git a/private_dot_config/sway/config.d/display/background.conf b/private_dot_config/sway/config.d/display/background.conf index 75774a5..beedec0 100644 --- a/private_dot_config/sway/config.d/display/background.conf +++ b/private_dot_config/sway/config.d/display/background.conf @@ -1,2 +1,2 @@ # Background settings -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * bg /usr/share/backgrounds/sway/main.png fill diff --git a/private_dot_config/sway/config.d/display/bar.conf b/private_dot_config/sway/config.d/display/bar.conf index 73832cd..adc83a9 100644 --- a/private_dot_config/sway/config.d/display/bar.conf +++ b/private_dot_config/sway/config.d/display/bar.conf @@ -7,9 +7,13 @@ bar { # The default just shows the current date and time. status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done + font pango:monospace 9 + colors { - statusline #ffffff - background #323232 - inactive_workspace #32323200 #32323200 #5c5c5c + statusline $light_main + background $dark_main + focused_workspace $dark_main $light_main $dark_accent + active_workspace $dark_main $light_main $dark_accent + inactive_workspace $light_main $dark_main $light_accent } } diff --git a/private_dot_config/sway/config.d/display/colors.conf b/private_dot_config/sway/config.d/display/colors.conf new file mode 100644 index 0000000..78de366 --- /dev/null +++ b/private_dot_config/sway/config.d/display/colors.conf @@ -0,0 +1,4 @@ +set $dark_main #20262E +set $dark_accent #913175 +set $light_accent #CD5888 +set $light_main #E9E8E8 diff --git a/private_dot_config/sway/config.d/display/empty_general_display.conf b/private_dot_config/sway/config.d/display/empty_general_display.conf new file mode 100644 index 0000000..e69de29 diff --git a/private_dot_config/sway/config.d/display/general_display.conf b/private_dot_config/sway/config.d/display/general_display.conf deleted file mode 100644 index 3efd8d5..0000000 --- a/private_dot_config/sway/config.d/display/general_display.conf +++ /dev/null @@ -1 +0,0 @@ -# General display settings, like default colors diff --git a/private_dot_config/sway/config.d/display/init.conf b/private_dot_config/sway/config.d/display/init.conf index 1565add..100194f 100644 --- a/private_dot_config/sway/config.d/display/init.conf +++ b/private_dot_config/sway/config.d/display/init.conf @@ -5,8 +5,12 @@ # To have a full display of the configuration structure, see the root # config file -include background.conf +include colors.conf include general_display.conf +include background.conf + include bar.conf + +include window.conf diff --git a/private_dot_config/sway/config.d/display/window.conf b/private_dot_config/sway/config.d/display/window.conf new file mode 100644 index 0000000..f11deaa --- /dev/null +++ b/private_dot_config/sway/config.d/display/window.conf @@ -0,0 +1,13 @@ +# Window display setting + +client.focused $light_accent $light_accent $dark_main +client.focused_inactive $dark_main $dark_accent $light_main +client.unfocused $dark_accent $dark_accent $light_main + +default_border pixel 2 +default_floating_border pixel 2 +titlebar_padding 1 +font pango:monospace 0 +titlebar_border_thickness 0 + +gaps inner 5 diff --git a/private_dot_config/sway/config.d/general/autostart.conf b/private_dot_config/sway/config.d/general/autostart.conf new file mode 100644 index 0000000..3fb3206 --- /dev/null +++ b/private_dot_config/sway/config.d/general/autostart.conf @@ -0,0 +1,5 @@ +# Launch command at start + +exec keepassxc +exec copyq +exec nextcloud diff --git a/private_dot_config/sway/config.d/general/init.conf b/private_dot_config/sway/config.d/general/init.conf index 616ebcd..3ed52f7 100644 --- a/private_dot_config/sway/config.d/general/init.conf +++ b/private_dot_config/sway/config.d/general/init.conf @@ -6,3 +6,5 @@ # config file include general.conf + +include autostart.conf diff --git a/private_dot_config/sway/config.d/plugins/systemd/init.conf b/private_dot_config/sway/config.d/plugins/systemd/init.conf index 6c13826..9e12a6a 100644 --- a/private_dot_config/sway/config.d/plugins/systemd/init.conf +++ b/private_dot_config/sway/config.d/plugins/systemd/init.conf @@ -6,3 +6,5 @@ # config file include systemd-user.conf + +include target.conf diff --git a/private_dot_config/sway/config.d/plugins/systemd/target.conf b/private_dot_config/sway/config.d/plugins/systemd/target.conf new file mode 100644 index 0000000..a3fdf7e --- /dev/null +++ b/private_dot_config/sway/config.d/plugins/systemd/target.conf @@ -0,0 +1,3 @@ +# Set user-graphical-session.target as reached + +exec systemctl --user start user-graphical-session.target