From 26ee4b001772213e928fc81d772c9d34e261c452 Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Sun, 22 Jan 2023 20:19:10 -0400 Subject: [PATCH] Completed the transition to Gruvbox --- user/.config/awesome/apps.lua | 5 +++++ user/.config/awesome/keymaps/keyboard.lua | 10 +++++----- user/.config/awesome/ui/rules.lua | 2 +- user/.config/awesome/ui/theme.lua | 4 ++-- user/.config/btop/btop.conf | 4 ++-- user/.config/doom/config.el | 4 ++-- user/.config/doom/config.org | 4 ++-- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/user/.config/awesome/apps.lua b/user/.config/awesome/apps.lua index 87546d516..3be9dbf9d 100644 --- a/user/.config/awesome/apps.lua +++ b/user/.config/awesome/apps.lua @@ -3,6 +3,11 @@ local apps = { terminal = "alacritty", editor = "emacsclient -c -a emacs", music = "alacritty -t musik --class musik,musik -e cmus", + tut = "alacritty -t tut --class tut,tut -e tut", + youm = "alacritty --title youm --class youm,youm -e ytfzf -mlst", + ytfzf = "alacritty --title ytfzf --class ytfzf,ytfzf -e ytfzf -flst", + ani = "alacritty --title ani-cli --class ani-cli,ani-cli -e ani-cli -f", + flix = "alacritty --title flix-cli --class flix-cli,flix-cli -e flix-cli", chat = "revolt-desktop", game = "retroarch", file = "alacritty -t vifm --class vifm,vifm -e ./.config/vifm/scripts/vifmrun", diff --git a/user/.config/awesome/keymaps/keyboard.lua b/user/.config/awesome/keymaps/keyboard.lua index d2e7e4a8f..0b6aa7f95 100644 --- a/user/.config/awesome/keymaps/keyboard.lua +++ b/user/.config/awesome/keymaps/keyboard.lua @@ -696,15 +696,15 @@ awful.keyboard.append_global_keybindings( return end if key == "m" then - awful.spawn.with_shell("alacritty --title youm --class youm,youm -e ytfzf -mlst") + awful.util.spawn(apps.youm) elseif key == "y" then - awful.spawn.with_shell("alacritty --title ytfzf --class ytfzf,ytfzf -e ytfzf -flst") + awful.util.spawn(apps.ytfzf) elseif key == "a" then - awful.spawn.with_shell("alacritty --title ani-cli --class ani-cli,ani-cli -e ani-cli -f") + awful.util.spawn(apps.ani) elseif key == "f" then - awful.spawn.with_shell("alacritty --title flix-cli --class flix-cli,flix-cli -e flix-cli") + awful.util.spawn(apps.flix) elseif key == "t" then - awful.spawn.with_shell("alacritty --title toot --class toot,toot -e toot tui") + awful.util.spawn(apps.tut) end awful.keygrabber.stop(grabber) end diff --git a/user/.config/awesome/ui/rules.lua b/user/.config/awesome/ui/rules.lua index 9ed93acf1..ff5fb23bb 100644 --- a/user/.config/awesome/ui/rules.lua +++ b/user/.config/awesome/ui/rules.lua @@ -80,7 +80,7 @@ ruled.client.connect_signal( "Chromium", "Bitwarden", "qutebrowser", - "toot" + "tut" } }, properties = { tag = "" } diff --git a/user/.config/awesome/ui/theme.lua b/user/.config/awesome/ui/theme.lua index 632c2fc53..28d865427 100644 --- a/user/.config/awesome/ui/theme.lua +++ b/user/.config/awesome/ui/theme.lua @@ -45,8 +45,8 @@ theme.border_marked = "#cc241d" theme.taglist_font = "mononoki Nerd Font Mono 28" theme.taglist_bg = "#3c3836" theme.taglist_fg_focus = "#fb4934" -theme.taglist_fg_occupied = "#689d6a" -theme.taglist_fg_urgent = "#cc241d" +theme.taglist_fg_occupied = "#bdae93" +theme.taglist_fg_urgent = "#fb4934" theme.taglist_fg_empty = "#928374" theme.taglist_spacing = 5 -- }}} diff --git a/user/.config/btop/btop.conf b/user/.config/btop/btop.conf index abafd10ce..a13cdc93d 100644 --- a/user/.config/btop/btop.conf +++ b/user/.config/btop/btop.conf @@ -2,7 +2,7 @@ #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" -color_theme = "/usr/share/btop/themes/tokyo-night.theme" +color_theme = "/usr/share/btop/themes/gruvbox_dark_v2.theme" #* If the theme set background should be shown, set to False if you want terminal background transparency. theme_background = False @@ -209,4 +209,4 @@ selected_battery = "Auto" #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. -log_level = "WARNING" +log_level = "WARNING" \ No newline at end of file diff --git a/user/.config/doom/config.el b/user/.config/doom/config.el index b03d5ea92..806ebf298 100644 --- a/user/.config/doom/config.el +++ b/user/.config/doom/config.el @@ -176,7 +176,7 @@ List of keybindings (SPC h b b)") (setq delete-by-moving-to-trash t trash-directory "~/.local/share/Trash/files/") -(setq doom-theme 'doom-tokyo-night) +(setq doom-theme 'doom-gruvbox) (map! :leader :desc "Load new theme" "h t" #'counsel-load-theme) @@ -557,7 +557,7 @@ List of keybindings (SPC h b b)") (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) ;; Load our desired dt/org-colors-* theme on startup -(dt/org-colors-gruvbox-dark) +(dt/org-colors-tomorrow-night) (use-package ox-man) (use-package ox-gemini) diff --git a/user/.config/doom/config.org b/user/.config/doom/config.org index da07d1f07..10dfa1221 100644 --- a/user/.config/doom/config.org +++ b/user/.config/doom/config.org @@ -398,7 +398,7 @@ If peep-dired is enabled, you will get image previews as you go up/down with 'j' Setting the theme to doom-one. To try out new themes, I set a keybinding for counsel-load-theme with 'SPC h t'. #+BEGIN_SRC emacs-lisp -(setq doom-theme 'doom-tokyo-night) +(setq doom-theme 'doom-gruvbox) (map! :leader :desc "Load new theme" "h t" #'counsel-load-theme) #+END_SRC @@ -950,7 +950,7 @@ I have created an interactive function for each color scheme (M-x dt/org-colors- (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) ;; Load our desired dt/org-colors-* theme on startup -(dt/org-colors-gruvbox-dark) +(dt/org-colors-tomorrow-night) #+end_src