From e86caa8d8eb11e8871c76e5ae7e5761dc0c22d59 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Sun, 12 Nov 2023 12:49:26 -0500 Subject: [PATCH] Update Submodules - Update doom emacs - Update doom emacs config - Merge in upstream dwm-flexipatch changes - Add Manganelo to Mangal sources - Add starship icon for Git directory (changed from Projects) - Add `main` as default branch name in git config - Update git submodule URLs to point to gitea instance instead of github - Update bunch of dracula themes --- .config/doom-emacs | 2 +- .config/doom-emacs-config | 2 +- .config/dwm-flexipatch | 2 +- .config/mangal/mangal.toml | 2 +- .config/starship.toml | 1 + .gitconfig | 4 +++- .gitmodules | 10 +++++----- .themes/dracula-fish | 2 +- .themes/dracula-freecad | 2 +- .themes/dracula-gnome-terminal | 2 +- .themes/dracula-gtk | 2 +- .themes/dracula-libreoffice | 2 +- .themes/dracula-steam | 2 +- .vim/pack/themes/start/dracula | 2 +- README.org | 17 ++++++++++------- 15 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.config/doom-emacs b/.config/doom-emacs index 042fe0c..9863985 160000 --- a/.config/doom-emacs +++ b/.config/doom-emacs @@ -1 +1 @@ -Subproject commit 042fe0c43831c8575abfdec4196ebd7305fa16ac +Subproject commit 986398504d09e585c7d1a8d73a6394024fe6f164 diff --git a/.config/doom-emacs-config b/.config/doom-emacs-config index ff370e6..e7b1508 160000 --- a/.config/doom-emacs-config +++ b/.config/doom-emacs-config @@ -1 +1 @@ -Subproject commit ff370e62a8a4c6fd85f9ffc514f945f90020cf12 +Subproject commit e7b1508a6007dcf9fd337de6cbec50c93f3a08ce diff --git a/.config/dwm-flexipatch b/.config/dwm-flexipatch index 91ded7c..bd29edf 160000 --- a/.config/dwm-flexipatch +++ b/.config/dwm-flexipatch @@ -1 +1 @@ -Subproject commit 91ded7cbaad5fda28e53687bd54ca147c50a1dcc +Subproject commit bd29edf9c066d712c9ca40e887448c13ee258a6c diff --git a/.config/mangal/mangal.toml b/.config/mangal/mangal.toml index a7b5c2d..13aa7a3 100644 --- a/.config/mangal/mangal.toml +++ b/.config/mangal/mangal.toml @@ -40,7 +40,7 @@ create_volume_dir = false # Default sources to use. (string array) # Will prompt if not set. # Type "mangal sources list" to show available sources -default_sources = [ "Mangadex", "Manganelo", "Manganato", "Mangapill", "AsuraScans", "FlameScans", "LuminousScans", "Mangasee", "Readmanga" ] +default_sources = [ "Mangadex", "Manganelo", "Manganato", "Mangapill", "AsuraScans", "FlameScans", "LuminousScans", "Manganelo", "Mangasee", "Readmanga" ] # Whether to download manga cover or not (bool) download_cover = true diff --git a/.config/starship.toml b/.config/starship.toml index 9d53a99..4748e5d 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -60,6 +60,7 @@ read_only = "" "Finances" = "  " "Downloads" = "  " "Games" = "  " +"Git" = " 󰊢" "PrismLauncher" = " 󰍳 " "Steam" = "  " "ISOs" = " 󰗮 " diff --git a/.gitconfig b/.gitconfig index 671f492..2ef9d37 100644 --- a/.gitconfig +++ b/.gitconfig @@ -6,8 +6,10 @@ [color] # Enable colors in color-supporting terminals ui = auto +[init] + defaultBranch = main [pull] - rebase = true + rebase = true [alias] # List available aliases aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g' diff --git a/.gitmodules b/.gitmodules index 4112c89..ca43937 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,7 +56,7 @@ branch = master [submodule ".xmonad"] path = .xmonad - url = git@github.com:balajsra/xmonad.git + url = https://gitea.sravanbalaji.com/sravan/xmonad.git branch = master [submodule ".themes/dracula-qbittorrent"] path = .themes/dracula-qbittorrent @@ -68,7 +68,7 @@ branch = main [submodule ".config/dwm-flexipatch"] path = .config/dwm-flexipatch - url = git@github.com:balajsra/dwm-flexipatch.git + url = https://gitea.sravanbalaji.com/sravan/dwm-flexipatch.git branch = master [submodule ".config/emacs"] path = .config/emacs @@ -76,7 +76,7 @@ branch = main [submodule ".config/personal-emacs"] path = .config/personal-emacs - url = git@github.com:balajsra/emacs.git + url = https://gitea.sravanbalaji.com/sravan/emacs.git branch = main [submodule ".config/doom-emacs"] path = .config/doom-emacs @@ -84,7 +84,7 @@ branch = master [submodule ".config/doom-emacs-config"] path = .config/doom-emacs-config - url = git@github.com:balajsra/doom-emacs-config.git + url = https://gitea.sravanbalaji.com/sravan/doom-emacs-config.git branch = master [submodule ".config/zathura"] path = .config/zathura @@ -104,5 +104,5 @@ branch = main [submodule ".config/awesome"] path = .config/awesome - url = git@github.com:balajsra/awesome.git + url = https://gitea.sravanbalaji.com/sravan/awesome.git branch = main diff --git a/.themes/dracula-fish b/.themes/dracula-fish index 0e51af5..269cd7d 160000 --- a/.themes/dracula-fish +++ b/.themes/dracula-fish @@ -1 +1 @@ -Subproject commit 0e51af5e5346e5d24efabd43fb4631e2a8fd1b70 +Subproject commit 269cd7d76d5104fdc2721db7b8848f6224bdf554 diff --git a/.themes/dracula-freecad b/.themes/dracula-freecad index c1d7056..c74df35 160000 --- a/.themes/dracula-freecad +++ b/.themes/dracula-freecad @@ -1 +1 @@ -Subproject commit c1d7056838f7109f3823c936fe80f0958d868851 +Subproject commit c74df35fbf63c2de7fbb4eda2a9a4b280aba3ce3 diff --git a/.themes/dracula-gnome-terminal b/.themes/dracula-gnome-terminal index 5d7fd91..ccc75a2 160000 --- a/.themes/dracula-gnome-terminal +++ b/.themes/dracula-gnome-terminal @@ -1 +1 @@ -Subproject commit 5d7fd91f3066591b72a7ef8c4360b8304339272e +Subproject commit ccc75a2d7fd915e80d95059a80899249e7161e06 diff --git a/.themes/dracula-gtk b/.themes/dracula-gtk index 42dc8ed..e3400f7 160000 --- a/.themes/dracula-gtk +++ b/.themes/dracula-gtk @@ -1 +1 @@ -Subproject commit 42dc8ed0504a58426b96794237981debc57b04fc +Subproject commit e3400f7c08f015ceba05d7732951cb6b868e7dcc diff --git a/.themes/dracula-libreoffice b/.themes/dracula-libreoffice index 2b9ecb6..fae6772 160000 --- a/.themes/dracula-libreoffice +++ b/.themes/dracula-libreoffice @@ -1 +1 @@ -Subproject commit 2b9ecb6ee78475d40d5bb5f55fe75e1e7562bb91 +Subproject commit fae6772b8d78f2766f3dfb28be2c283e41aa8ec9 diff --git a/.themes/dracula-steam b/.themes/dracula-steam index a184151..2b0ebe0 160000 --- a/.themes/dracula-steam +++ b/.themes/dracula-steam @@ -1 +1 @@ -Subproject commit a1841516969a2cd222b862d748e0230a97a1c391 +Subproject commit 2b0ebe0e8e7dd5813980bf51de9a969cc70a7e6a diff --git a/.vim/pack/themes/start/dracula b/.vim/pack/themes/start/dracula index eb577d4..6495b4f 160000 --- a/.vim/pack/themes/start/dracula +++ b/.vim/pack/themes/start/dracula @@ -1 +1 @@ -Subproject commit eb577d47b0cfc9191bf04c414b4042d5f1a980f8 +Subproject commit 6495b4ff40479ec7705addb4ea800ec308026648 diff --git a/README.org b/README.org index 3aa4a26..54b65e0 100644 --- a/README.org +++ b/README.org @@ -194,7 +194,7 @@ Use [[https://www.gnu.org/software/stow/][GNU Stow]] to create symlinks. branch = master [submodule ".xmonad"] path = .xmonad - url = git@github.com:balajsra/xmonad.git + url = https://gitea.sravanbalaji.com/sravan/xmonad.git branch = master [submodule ".themes/dracula-qbittorrent"] path = .themes/dracula-qbittorrent @@ -206,7 +206,7 @@ Use [[https://www.gnu.org/software/stow/][GNU Stow]] to create symlinks. branch = main [submodule ".config/dwm-flexipatch"] path = .config/dwm-flexipatch - url = git@github.com:balajsra/dwm-flexipatch.git + url = https://gitea.sravanbalaji.com/sravan/dwm-flexipatch.git branch = master [submodule ".config/emacs"] path = .config/emacs @@ -214,7 +214,7 @@ Use [[https://www.gnu.org/software/stow/][GNU Stow]] to create symlinks. branch = main [submodule ".config/personal-emacs"] path = .config/personal-emacs - url = git@github.com:balajsra/emacs.git + url = https://gitea.sravanbalaji.com/sravan/emacs.git branch = main [submodule ".config/doom-emacs"] path = .config/doom-emacs @@ -222,7 +222,7 @@ Use [[https://www.gnu.org/software/stow/][GNU Stow]] to create symlinks. branch = master [submodule ".config/doom-emacs-config"] path = .config/doom-emacs-config - url = git@github.com:balajsra/doom-emacs-config.git + url = https://gitea.sravanbalaji.com/sravan/doom-emacs-config.git branch = master [submodule ".config/zathura"] path = .config/zathura @@ -242,7 +242,7 @@ Use [[https://www.gnu.org/software/stow/][GNU Stow]] to create symlinks. branch = main [submodule ".config/awesome"] path = .config/awesome - url = git@github.com:balajsra/awesome.git + url = https://gitea.sravanbalaji.com/sravan/awesome.git branch = main #+END_SRC @@ -304,8 +304,10 @@ stow -v -D . [color] # Enable colors in color-supporting terminals ui = auto +[init] + defaultBranch = main [pull] - rebase = true + rebase = true [alias] # List available aliases aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g' @@ -3306,6 +3308,7 @@ read_only = "" "Finances" = "  " "Downloads" = "  " "Games" = "  " +"Git" = " 󰊢" "PrismLauncher" = " 󰍳 " "Steam" = "  " "ISOs" = " 󰗮 " @@ -7786,7 +7789,7 @@ create_volume_dir = false # Default sources to use. (string array) # Will prompt if not set. # Type "mangal sources list" to show available sources -default_sources = [ "Mangadex", "Manganelo", "Manganato", "Mangapill", "AsuraScans", "FlameScans", "LuminousScans", "Mangasee", "Readmanga" ] +default_sources = [ "Mangadex", "Manganelo", "Manganato", "Mangapill", "AsuraScans", "FlameScans", "LuminousScans", "Manganelo", "Mangasee", "Readmanga" ] # Whether to download manga cover or not (bool) download_cover = true