diff --git a/configs/kitty/current-theme.conf b/configs/kitty/current-theme.conf index 29f8f9e..056ef3b 100644 --- a/configs/kitty/current-theme.conf +++ b/configs/kitty/current-theme.conf @@ -1,21 +1,21 @@ -background #000000 -foreground #fffaf3 -cursor #ffffff -selection_background #002a3a -color0 #222222 -color8 #444444 -color1 #ff000f -color9 #ff273f -color2 #8ce00a -color10 #abe05a -color3 #ffb900 -color11 #ffd141 -color4 #008df8 -color12 #0092ff -color5 #6c43a5 -color13 #9a5feb -color6 #00d7eb -color14 #67ffef -color7 #ffffff -color15 #ffffff -selection_foreground #0d0f18 +background #f8f8f8 +foreground #2a2b33 +cursor #bbbbbb +selection_background #ececec +color0 #000000 +color8 #000000 +color1 #de3d35 +color9 #de3d35 +color2 #3e953a +color10 #3e953a +color3 #d2b67b +color11 #d2b67b +color4 #2f5af3 +color12 #2f5af3 +color5 #950095 +color13 #a00095 +color6 #3e953a +color14 #3e953a +color7 #bbbbbb +color15 #ffffff +selection_foreground #f8f8f8 diff --git a/configs/kitty/kitty.conf b/configs/kitty/kitty.conf index c625178..8c61916 100644 --- a/configs/kitty/kitty.conf +++ b/configs/kitty/kitty.conf @@ -1314,6 +1314,6 @@ map kitty_mod+minus change_font_size all -2.0 # BEGIN_KITTY_THEME -# Argonaut +# Atom One Light include current-theme.conf # END_KITTY_THEME diff --git a/configs/kitty/kitty.conf.bak b/configs/kitty/kitty.conf.bak index 8c61916..c625178 100644 --- a/configs/kitty/kitty.conf.bak +++ b/configs/kitty/kitty.conf.bak @@ -1314,6 +1314,6 @@ map kitty_mod+minus change_font_size all -2.0 # BEGIN_KITTY_THEME -# Atom One Light +# Argonaut include current-theme.conf # END_KITTY_THEME diff --git a/configs/nvim/ftplugin/TelescopePrompt.vim b/configs/nvim/ftplugin/TelescopePrompt.vim index ff662f1..fec2e70 100644 --- a/configs/nvim/ftplugin/TelescopePrompt.vim +++ b/configs/nvim/ftplugin/TelescopePrompt.vim @@ -1 +1 @@ -:imap :lua require'telescope.builtin'.resume{} +:imap :lua require'telescope.builtin'.resume{} diff --git a/configs/nvim/lua/configs/lsp.lua b/configs/nvim/lua/configs/lsp.lua index 52f1e5c..5993b02 100644 --- a/configs/nvim/lua/configs/lsp.lua +++ b/configs/nvim/lua/configs/lsp.lua @@ -94,7 +94,9 @@ lsp.intelephense.setup { lsp.cssls.setup { on_attach = on_attach } - +lsp.zls.setup { + on_attach = on_attach +} lsp.bashls.setup { filetypes = { "sh", "bash" }, on_attach = on_attach diff --git a/configs/sway/config b/configs/sway/config index bc86c38..c104ef5 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -52,6 +52,7 @@ set $toggle_layout $sway_scripts/toggle-layout set $create_floating $sway_scripts/create-floating set $toggle_gaps $sway_scripts/toggle-gaps set $toggle_bar $sway_scripts/toggle-bar +set $open_project $wofi_scripts/open-project set $select_window $sway_scripts/select-window set $lock_screen $sway_scripts/lock-screen set $select_emoji $wofi_scripts/select-emoji @@ -271,6 +272,8 @@ input "1739:24385:Synaptics_TM2438-005" { bindsym $mod+i exec $select_emoji bindsym $mod+Shift+i exec $debug_window bindsym $mod+o exec $open_localhost + bindsym $mod+Shift+o exec $open_project + bindsym $mod+Control+l exec $lock_screen bindsym $mod+c exec $calculator bindsym $mod+Tab exec $select_window diff --git a/configs/waybar/config b/configs/waybar/config index 25ae3f4..317f71c 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -14,6 +14,7 @@ "sway/mode" ], "modules-right": [ + "custom/power-consumption", "custom/power-profile", "custom/dpi", "custom/theme", @@ -31,10 +32,14 @@ "on-click": "~/.config/waybar/scripts/toggle-theme --toggle", "restart-interval": 2 }, + "custom/power-consumption": { + "exec": "~/.config/waybar/scripts/power-consumption", + "interval": 1 + }, "custom/power-profile": { "exec": "~/.config/waybar/scripts/power-profile", "on-click": "~/.config/waybar/scripts/power-profile --toggle", - "restart-interval": 2 + "interval": 2 }, "custom/dpi": { "exec": "~/.config/waybar/scripts/toggle-hdpi", diff --git a/configs/waybar/scripts/power-consumption b/configs/waybar/scripts/power-consumption new file mode 100755 index 0000000..5768012 --- /dev/null +++ b/configs/waybar/scripts/power-consumption @@ -0,0 +1,6 @@ +#!/bin/bash +echo - | awk "{printf \"%.1f\", \ +$(( \ + $(cat /sys/class/power_supply/BAT0/current_now) * \ + $(cat /sys/class/power_supply/BAT0/voltage_now) \ +)) / 1000000000000 }" ; echo "W " diff --git a/configs/waybar/scripts/set-theme b/configs/waybar/scripts/set-theme index 9ef2651..d94fd8e 100755 --- a/configs/waybar/scripts/set-theme +++ b/configs/waybar/scripts/set-theme @@ -78,7 +78,7 @@ case "$CMD" in # new_emacs_modeline_theme="smart-mode-line-light" # new_gtk_theme='WhiteSur' - new_gtk_theme='Pop' + new_gtk_theme='adw-gtk3' #new_gtk_theme='Solarized-Light' #new_gtk_theme='Crux' @@ -105,7 +105,7 @@ case "$CMD" in # new_emacs_theme="solarized-dark" # new_emacs_modeline_theme="smart-mode-line-dark" - new_gtk_theme='Pop-dark' + new_gtk_theme='adw-gtk3-dark' #new_gtk_theme='Solarized-Dark' #new_gtk_theme='Crux-dark' @@ -170,6 +170,7 @@ esac # these two appear to be completely equivalent: dconf write /org/gnome/desktop/interface/gtk-theme "'$new_gtk_theme'" gsettings set org.gnome.desktop.interface gtk-theme $new_gtk_theme + gsettings set org.gnome.desktop.interface color-scheme "prefer-$TERM_BACKGROUND" dconf write /org/gnome/desktop/interface/icon-theme "'$new_icon_theme'" dconf write /org/gnome/desktop/interface/cursor-theme "'$new_cursor_theme'" diff --git a/configs/wofi/scripts/open-project b/configs/wofi/scripts/open-project new file mode 100755 index 0000000..23d41ac --- /dev/null +++ b/configs/wofi/scripts/open-project @@ -0,0 +1,13 @@ +#!/bin/bash +PROJECTS="$(ls -t $HOME/.local/share/nvim/sessions)" + +NAME="$(echo "$PROJECTS" | sed 's/.*\%//' | sed 's/\.vim//g' | wofi --show dmenu -i)" + +PROJECT="$(echo "$PROJECTS" | grep "$NAME.vim" | sed 's/\%/\//g' | sed 's/\.vim$//')" + +VIM="$HOME/.asdf/shims/nvim"; + +if [ "$PROJECT" != "" ]; then + cd $PROJECT + tmux new-window "$VIM . ; zsh" +fi