From e2a0b3054181c26825cfb64953e923b2552f9a8d Mon Sep 17 00:00:00 2001 From: frosty Date: Sun, 19 May 2024 02:23:03 -0400 Subject: [PATCH] i moved everything into packages --- .config/X11/xinitrc | 6 - .config/tint2/tint2rc.bak | 146 ------------------ .gitmodules | 16 +- .stow-local-ignore | 9 -- Makefile | 4 - README.md | 17 +- .bash_profile => bash/.bash_profile | 2 + .bashrc => bash/.bashrc | 8 +- {.local => bin/.local}/bin/proton-nv | 0 {.local => bin/.local}/bin/runners/run-i3lock | 0 {.local => bin/.local}/bin/screenlayout | 0 .../.local}/bin/screenlayouts/sl-external | 0 .../.local}/bin/statusbar/sb-battery | 0 {.local => bin/.local}/bin/statusbar/sb-date | 0 .../.local}/bin/statusbar/sb-memory | 0 .../.local}/bin/statusbar/sb-volume | 0 {.local => bin/.local}/bin/wallpaper | 0 dwm/.config/X11/xinitrc | 9 ++ {.config => dwm/.config}/X11/xprofile | 0 .../.config}/fastfetch/config.jsonc | 0 flameshot/.config/flameshot/flameshot.ini | 16 ++ .../.config}/fontconfig/fonts.conf | 0 {.config => git/.config}/git/config | 0 {.config => gtk/.config}/gtk-2.0/gtkrc | 0 {.config => gtk/.config}/gtk-3.0/settings.ini | 0 .../.local}/share/icons/default/index.theme | 0 {.config => mimeapps/.config}/mimeapps.list | 0 .../share/applications/browser.desktop | 0 .../.local}/share/applications/editor.desktop | 0 .../.local}/share/applications/file.desktop | 0 .../share/applications/nxm-handler.desktop | 0 .../share/applications/terminal.desktop | 0 .../.config}/nsxiv/exec/key-handler | 0 .../.config}/nvim/ftplugin/go.lua | 0 .../.config}/nvim/ftplugin/lua.lua | 0 .../.config}/nvim/ftplugin/sh.lua | 0 {.config => nvim/.config}/nvim/init.lua | 0 .../.config}/nvim/lua/plugins/lsp.lua | 0 .../.config}/nvim/lua/plugins/ui.lua | 0 {.config => openbox/.config}/openbox/menu.xml | 0 {.config => openbox/.config}/openbox/rc.xml | 0 .../.config}/openbox/scripts/screenlayout | 0 .../.local}/share/themes/icecubes | 0 {.config => picom/.config}/picom/picom.conf | 0 .../.local}/share/runit/sv/dunst/run | 0 .../.local}/share/runit/sv/picom/run | 0 .../.local}/share/runit/sv/pipewire-pulse/run | 0 .../.local}/share/runit/sv/pipewire/run | 0 .../.local}/share/runit/sv/sxhkd/run | 0 .../.local}/share/runit/sv/udiskie/run | 0 .../.local}/share/runit/sv/wireplumber/run | 0 {.config => shell/.config}/shell/aliases | 0 {.config => shell/.config}/shell/environment | 0 .../.config}/shell/functions/skinstall | 0 {.config => sxhkd/.config}/sxhkd/sxhkdrc | 0 {.config => tint2/.config}/tint2/tint2rc | 0 {.config => user-dirs/.config}/user-dirs.dirs | 0 .../.config}/VSCodium/User/settings.json | 0 .../.config}/VSCodium/product.json | 0 .../.config}/X11/xresources | 0 .../share/zsh/plugins/zsh-autosuggestions | 0 .../.local}/share/zsh/plugins/zsh-completions | 0 .../share/zsh/plugins/zsh-syntax-highlighting | 0 .zprofile => zsh/.zprofile | 2 +- .zshrc => zsh/.zshrc | 2 + 65 files changed, 55 insertions(+), 182 deletions(-) delete mode 100755 .config/X11/xinitrc delete mode 100644 .config/tint2/tint2rc.bak delete mode 100644 .stow-local-ignore delete mode 100644 Makefile rename .bash_profile => bash/.bash_profile (84%) rename .bashrc => bash/.bashrc (64%) rename {.local => bin/.local}/bin/proton-nv (100%) rename {.local => bin/.local}/bin/runners/run-i3lock (100%) rename {.local => bin/.local}/bin/screenlayout (100%) rename {.local => bin/.local}/bin/screenlayouts/sl-external (100%) rename {.local => bin/.local}/bin/statusbar/sb-battery (100%) rename {.local => bin/.local}/bin/statusbar/sb-date (100%) rename {.local => bin/.local}/bin/statusbar/sb-memory (100%) rename {.local => bin/.local}/bin/statusbar/sb-volume (100%) rename {.local => bin/.local}/bin/wallpaper (100%) create mode 100755 dwm/.config/X11/xinitrc rename {.config => dwm/.config}/X11/xprofile (100%) rename {.config => fastfetch/.config}/fastfetch/config.jsonc (100%) create mode 100644 flameshot/.config/flameshot/flameshot.ini rename {.config => fontconfig/.config}/fontconfig/fonts.conf (100%) rename {.config => git/.config}/git/config (100%) rename {.config => gtk/.config}/gtk-2.0/gtkrc (100%) rename {.config => gtk/.config}/gtk-3.0/settings.ini (100%) rename {.local => gtk/.local}/share/icons/default/index.theme (100%) rename {.config => mimeapps/.config}/mimeapps.list (100%) rename {.local => mimeapps/.local}/share/applications/browser.desktop (100%) rename {.local => mimeapps/.local}/share/applications/editor.desktop (100%) rename {.local => mimeapps/.local}/share/applications/file.desktop (100%) rename {.local => mimeapps/.local}/share/applications/nxm-handler.desktop (100%) rename {.local => mimeapps/.local}/share/applications/terminal.desktop (100%) rename {.config => nsxiv/.config}/nsxiv/exec/key-handler (100%) rename {.config => nvim/.config}/nvim/ftplugin/go.lua (100%) rename {.config => nvim/.config}/nvim/ftplugin/lua.lua (100%) rename {.config => nvim/.config}/nvim/ftplugin/sh.lua (100%) rename {.config => nvim/.config}/nvim/init.lua (100%) rename {.config => nvim/.config}/nvim/lua/plugins/lsp.lua (100%) rename {.config => nvim/.config}/nvim/lua/plugins/ui.lua (100%) rename {.config => openbox/.config}/openbox/menu.xml (100%) rename {.config => openbox/.config}/openbox/rc.xml (100%) rename {.config => openbox/.config}/openbox/scripts/screenlayout (100%) rename {.local => openbox/.local}/share/themes/icecubes (100%) rename {.config => picom/.config}/picom/picom.conf (100%) rename {.local => runit/.local}/share/runit/sv/dunst/run (100%) rename {.local => runit/.local}/share/runit/sv/picom/run (100%) rename {.local => runit/.local}/share/runit/sv/pipewire-pulse/run (100%) rename {.local => runit/.local}/share/runit/sv/pipewire/run (100%) rename {.local => runit/.local}/share/runit/sv/sxhkd/run (100%) rename {.local => runit/.local}/share/runit/sv/udiskie/run (100%) rename {.local => runit/.local}/share/runit/sv/wireplumber/run (100%) rename {.config => shell/.config}/shell/aliases (100%) rename {.config => shell/.config}/shell/environment (100%) rename {.config => shell/.config}/shell/functions/skinstall (100%) rename {.config => sxhkd/.config}/sxhkd/sxhkdrc (100%) rename {.config => tint2/.config}/tint2/tint2rc (100%) rename {.config => user-dirs/.config}/user-dirs.dirs (100%) rename {.config => vscodium/.config}/VSCodium/User/settings.json (100%) rename {.config => vscodium/.config}/VSCodium/product.json (100%) rename {.config => xresources/.config}/X11/xresources (100%) rename {.local => zsh/.local}/share/zsh/plugins/zsh-autosuggestions (100%) rename {.local => zsh/.local}/share/zsh/plugins/zsh-completions (100%) rename {.local => zsh/.local}/share/zsh/plugins/zsh-syntax-highlighting (100%) rename .zprofile => zsh/.zprofile (73%) rename .zshrc => zsh/.zshrc (91%) diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc deleted file mode 100755 index 6ad5ec3..0000000 --- a/.config/X11/xinitrc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" -[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile" - -exec dbus-launch dwm diff --git a/.config/tint2/tint2rc.bak b/.config/tint2/tint2rc.bak deleted file mode 100644 index e68ecef..0000000 --- a/.config/tint2/tint2rc.bak +++ /dev/null @@ -1,146 +0,0 @@ -#------------------------------------- -# Backgrounds -# Background 1: Panel -rounded = 0 -border_width = 0 -background_color = #1a1a1a 100 -background_color_hover = #000000 100 - -# Background 2: Default task, Iconified task -rounded = 0 -border_width = 0 -background_color = #333333 100 -background_color_hover = #404040 100 - -# Background 3: Active task -rounded = 0 -border_width = 0 -background_color = #3e6237 100 -background_color_hover = #497240 100 - -# Background 4: Urgent task -rounded = 0 -border_width = 0 -background_color = #422e6b 100 -background_color_hover = #cc7700 100 - -# Background 5: Tooltip -rounded = 0 -border_width = 1 -background_color = #222222 100 -border_color = #5a5a5a 100 - -#------------------------------------- -# Panel -panel_items = LTSC -panel_size = 100% 32 -panel_margin = 0 0 -panel_padding = 0 0 2 -panel_background_id = 1 -wm_menu = 1 -panel_dock = 0 -panel_position = bottom center horizontal -panel_layer = top -panel_monitor = all -panel_shrink = 0 -autohide = 0 -strut_policy = follow_size -panel_window_name = tint2 -disable_transparency = 1 -mouse_effects = 1 -font_shadow = 0 -mouse_hover_icon_asb = 100 0 10 -mouse_pressed_icon_asb = 100 0 0 - -#------------------------------------- -# Taskbar -taskbar_mode = single_desktop -taskbar_hide_if_empty = 0 -taskbar_padding = 0 0 0 -taskbar_background_id = 0 -taskbar_active_background_id = 0 -taskbar_name = 0 -taskbar_hide_inactive_tasks = 0 -taskbar_hide_different_monitor = 0 -taskbar_hide_different_desktop = 0 -taskbar_always_show_all_desktop_tasks = 0 -taskbar_name_padding = 4 2 -taskbar_name_background_id = 0 -taskbar_name_active_background_id = 0 -taskbar_name_font_color = #e3e3e3 100 -taskbar_name_active_font_color = #ffffff 100 -taskbar_distribute_size = 0 -taskbar_sort_order = none -task_align = left - -#------------------------------------- -# Task -task_text = 1 -task_icon = 0 -task_centered = 1 -urgent_nb_of_blink = 100000 -task_maximum_size = 175 35 -task_padding = 4 2 4 -task_tooltip = 1 -task_thumbnail = 1 -task_thumbnail_size = 210 -task_font_color = #ffffff 100 -task_background_id = 2 -task_active_background_id = 3 -task_urgent_background_id = 4 -task_iconified_background_id = 2 -mouse_left = toggle_iconify -mouse_middle = none -mouse_right = close -mouse_scroll_up = toggle -mouse_scroll_down = iconify - -#------------------------------------- -# System tray (notification area) -systray_padding = 0 4 2 -systray_background_id = 0 -systray_sort = ascending -systray_icon_size = 24 -systray_icon_asb = 100 0 0 -systray_monitor = primary -systray_name_filter = - -#------------------------------------- -# Launcher -launcher_padding = 4 4 4 -launcher_background_id = 0 -launcher_icon_background_id = 0 -launcher_icon_size = 24 -launcher_icon_asb = 100 0 0 -launcher_icon_theme_override = 0 -startup_notifications = 1 -launcher_tooltip = 1 -launcher_item_app = terminal.desktop -launcher_item_app = file.desktop -launcher_item_app = browser.desktop -launcher_item_app = editor.desktop - -#------------------------------------- -# Clock -time1_format = %H:%M -time2_format = %A %d %B -time1_timezone = -time2_timezone = -clock_font_color = #ffffff 100 -clock_padding = 2 0 -clock_background_id = 0 -clock_tooltip = -clock_tooltip_timezone = -clock_lclick_command = -clock_rclick_command = orage -clock_mclick_command = -clock_uwheel_command = -clock_dwheel_command = - -#------------------------------------- -# Tooltip -tooltip_show_timeout = 0.5 -tooltip_hide_timeout = 0.1 -tooltip_padding = 4 4 -tooltip_background_id = 5 -tooltip_font_color = #dddddd 100 diff --git a/.gitmodules b/.gitmodules index d9b9d94..55f216d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule ".local/share/themes/icecubes"] - path = .local/share/themes/icecubes +[submodule "openbox/.local/share/themes/icecubes"] + path = openbox/.local/share/themes/icecubes url = https://gitlab.com/frostalicious/icecubes -[submodule ".local/share/zsh/plugins/zsh-autosuggestions"] - path = .local/share/zsh/plugins/zsh-autosuggestions +[submodule "zsh/.local/share/zsh/plugins/zsh-autosuggestions"] + path = zsh/.local/share/zsh/plugins/zsh-autosuggestions url = https://github.com/zsh-users/zsh-autosuggestions -[submodule ".local/share/zsh/plugins/zsh-completions"] - path = .local/share/zsh/plugins/zsh-completions +[submodule "zsh/.local/share/zsh/plugins/zsh-completions"] + path = zsh/.local/share/zsh/plugins/zsh-completions url = https://github.com/zsh-users/zsh-completions -[submodule ".local/share/zsh/plugins/zsh-syntax-highlighting"] - path = .local/share/zsh/plugins/zsh-syntax-highlighting +[submodule "zsh/.local/share/zsh/plugins/zsh-syntax-highlighting"] + path = zsh/.local/share/zsh/plugins/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting diff --git a/.stow-local-ignore b/.stow-local-ignore deleted file mode 100644 index 3bc8ce2..0000000 --- a/.stow-local-ignore +++ /dev/null @@ -1,9 +0,0 @@ -\.git -\.gitignore -\.gitmodules - -^/README.* -^/LICENSE.* -^/COPYING - -^/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index c0270a2..0000000 --- a/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -stow: - stow --verbose --target=${HOME} --restow . -delete: - stow --verbose --target=${HOME} --delete . diff --git a/README.md b/README.md index 29f41af..00ec417 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,14 @@ # dotfiles -Collection of system configurations across multiple machines +This is my collection of configuration and setup data for all of my Linux machines. The distributions I primarily use are Artix Linux and Debian. + +## What to Expect + +### Environments + +- [dwm](https://dwm.suckless.org/) +- [Openbox](http://openbox.org/wiki/Main_Page) +- shells ([Bash](https://www.gnu.org/software/bash/) and [Zsh](https://www.zsh.org/)) ## Installation @@ -8,14 +16,17 @@ Collection of system configurations across multiple machines $ cd ~ $ git clone https://gitlab.com/frostalicious/dotfiles .dotfiles $ cd .dotfiles -$ make stow +$ stow --verbose --target=${HOME} --restow PACKAGES ``` +At the very least, no matter the environment, I would install the `bin`, `git`, `shell`, and either `bash` or `zsh`. + ## Other Repositories There are some other dotfiles repositories I cross-referenced when putting my system together, here is a list below: -* [Derek Taylor](https://gitlab.com/dwt1/dotfiles) +* [DistroTube](https://gitlab.com/dwt1/dotfiles) * [Luke Smith](https://github.com/LukeSmithxyz/voidrice) * [Un1q32](https://github.com/Un1q32/dotfiles) +* [David Zuber](https://github.com/storax/dotfiles) * [Gl00ria](https://github.com/Gl00ria/dotfiles) diff --git a/.bash_profile b/bash/.bash_profile similarity index 84% rename from .bash_profile rename to bash/.bash_profile index 1fc53d6..6396869 100644 --- a/.bash_profile +++ b/bash/.bash_profile @@ -1,2 +1,4 @@ +# shellcheck disable=SC1091 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/environment" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/shell/environment" + [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" diff --git a/.bashrc b/bash/.bashrc similarity index 64% rename from .bashrc rename to bash/.bashrc index 323feda..212d561 100644 --- a/.bashrc +++ b/bash/.bashrc @@ -1,13 +1,11 @@ -shopt -s autocd -shopt -s nocaseglob -shopt -s histverify - -PS1='\[\033[34m\]\w $(if [ "$?" -eq 0 ]; then printf "\033[32m"; else printf "\033[31m"; fi)\$ \[\033[0m\]' +PS1='%F{blue}%~ %(?.%F{green}.%F{red})%#%f ' +# shellcheck disable=SC1091 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliases" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliases" if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/shell/functions" ]; then for func in "${XDG_CONFIG_HOME:-$HOME/.config}"/shell/functions/*; do + # shellcheck disable=SC1090 . "$func" done unset func diff --git a/.local/bin/proton-nv b/bin/.local/bin/proton-nv similarity index 100% rename from .local/bin/proton-nv rename to bin/.local/bin/proton-nv diff --git a/.local/bin/runners/run-i3lock b/bin/.local/bin/runners/run-i3lock similarity index 100% rename from .local/bin/runners/run-i3lock rename to bin/.local/bin/runners/run-i3lock diff --git a/.local/bin/screenlayout b/bin/.local/bin/screenlayout similarity index 100% rename from .local/bin/screenlayout rename to bin/.local/bin/screenlayout diff --git a/.local/bin/screenlayouts/sl-external b/bin/.local/bin/screenlayouts/sl-external similarity index 100% rename from .local/bin/screenlayouts/sl-external rename to bin/.local/bin/screenlayouts/sl-external diff --git a/.local/bin/statusbar/sb-battery b/bin/.local/bin/statusbar/sb-battery similarity index 100% rename from .local/bin/statusbar/sb-battery rename to bin/.local/bin/statusbar/sb-battery diff --git a/.local/bin/statusbar/sb-date b/bin/.local/bin/statusbar/sb-date similarity index 100% rename from .local/bin/statusbar/sb-date rename to bin/.local/bin/statusbar/sb-date diff --git a/.local/bin/statusbar/sb-memory b/bin/.local/bin/statusbar/sb-memory similarity index 100% rename from .local/bin/statusbar/sb-memory rename to bin/.local/bin/statusbar/sb-memory diff --git a/.local/bin/statusbar/sb-volume b/bin/.local/bin/statusbar/sb-volume similarity index 100% rename from .local/bin/statusbar/sb-volume rename to bin/.local/bin/statusbar/sb-volume diff --git a/.local/bin/wallpaper b/bin/.local/bin/wallpaper similarity index 100% rename from .local/bin/wallpaper rename to bin/.local/bin/wallpaper diff --git a/dwm/.config/X11/xinitrc b/dwm/.config/X11/xinitrc new file mode 100755 index 0000000..f150e06 --- /dev/null +++ b/dwm/.config/X11/xinitrc @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" ]; then + . "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" +elif [ -f "$HOME/.xprofile" ]; then + . "$HOME/.xprofile" +fi + +exec dbus-launch dwm diff --git a/.config/X11/xprofile b/dwm/.config/X11/xprofile similarity index 100% rename from .config/X11/xprofile rename to dwm/.config/X11/xprofile diff --git a/.config/fastfetch/config.jsonc b/fastfetch/.config/fastfetch/config.jsonc similarity index 100% rename from .config/fastfetch/config.jsonc rename to fastfetch/.config/fastfetch/config.jsonc diff --git a/flameshot/.config/flameshot/flameshot.ini b/flameshot/.config/flameshot/flameshot.ini new file mode 100644 index 0000000..6beb65a --- /dev/null +++ b/flameshot/.config/flameshot/flameshot.ini @@ -0,0 +1,16 @@ +[General] +buttons=@Variant(\0\0\0\x7f\0\0\0\vQList\0\0\0\0\x5\0\0\0\0\0\0\0\x3\0\0\0\x4\0\0\0\x12\0\0\0\xf) +checkForUpdates=false +contrastOpacity=178 +contrastUiColor=#1a1a1a +copyPathAfterSave=false +disabledTrayIcon=false +drawColor=#ffffff +saveAfterCopy=true +savePath=/home/frosty/pictures/screenshots +showDesktopNotification=false +showHelp=false +showSidePanelButton=false +showStartupLaunchMessage=false +uiColor=#aaaaaa +userColors=#ff0000, #000000, #ffffff diff --git a/.config/fontconfig/fonts.conf b/fontconfig/.config/fontconfig/fonts.conf similarity index 100% rename from .config/fontconfig/fonts.conf rename to fontconfig/.config/fontconfig/fonts.conf diff --git a/.config/git/config b/git/.config/git/config similarity index 100% rename from .config/git/config rename to git/.config/git/config diff --git a/.config/gtk-2.0/gtkrc b/gtk/.config/gtk-2.0/gtkrc similarity index 100% rename from .config/gtk-2.0/gtkrc rename to gtk/.config/gtk-2.0/gtkrc diff --git a/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini similarity index 100% rename from .config/gtk-3.0/settings.ini rename to gtk/.config/gtk-3.0/settings.ini diff --git a/.local/share/icons/default/index.theme b/gtk/.local/share/icons/default/index.theme similarity index 100% rename from .local/share/icons/default/index.theme rename to gtk/.local/share/icons/default/index.theme diff --git a/.config/mimeapps.list b/mimeapps/.config/mimeapps.list similarity index 100% rename from .config/mimeapps.list rename to mimeapps/.config/mimeapps.list diff --git a/.local/share/applications/browser.desktop b/mimeapps/.local/share/applications/browser.desktop similarity index 100% rename from .local/share/applications/browser.desktop rename to mimeapps/.local/share/applications/browser.desktop diff --git a/.local/share/applications/editor.desktop b/mimeapps/.local/share/applications/editor.desktop similarity index 100% rename from .local/share/applications/editor.desktop rename to mimeapps/.local/share/applications/editor.desktop diff --git a/.local/share/applications/file.desktop b/mimeapps/.local/share/applications/file.desktop similarity index 100% rename from .local/share/applications/file.desktop rename to mimeapps/.local/share/applications/file.desktop diff --git a/.local/share/applications/nxm-handler.desktop b/mimeapps/.local/share/applications/nxm-handler.desktop similarity index 100% rename from .local/share/applications/nxm-handler.desktop rename to mimeapps/.local/share/applications/nxm-handler.desktop diff --git a/.local/share/applications/terminal.desktop b/mimeapps/.local/share/applications/terminal.desktop similarity index 100% rename from .local/share/applications/terminal.desktop rename to mimeapps/.local/share/applications/terminal.desktop diff --git a/.config/nsxiv/exec/key-handler b/nsxiv/.config/nsxiv/exec/key-handler similarity index 100% rename from .config/nsxiv/exec/key-handler rename to nsxiv/.config/nsxiv/exec/key-handler diff --git a/.config/nvim/ftplugin/go.lua b/nvim/.config/nvim/ftplugin/go.lua similarity index 100% rename from .config/nvim/ftplugin/go.lua rename to nvim/.config/nvim/ftplugin/go.lua diff --git a/.config/nvim/ftplugin/lua.lua b/nvim/.config/nvim/ftplugin/lua.lua similarity index 100% rename from .config/nvim/ftplugin/lua.lua rename to nvim/.config/nvim/ftplugin/lua.lua diff --git a/.config/nvim/ftplugin/sh.lua b/nvim/.config/nvim/ftplugin/sh.lua similarity index 100% rename from .config/nvim/ftplugin/sh.lua rename to nvim/.config/nvim/ftplugin/sh.lua diff --git a/.config/nvim/init.lua b/nvim/.config/nvim/init.lua similarity index 100% rename from .config/nvim/init.lua rename to nvim/.config/nvim/init.lua diff --git a/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from .config/nvim/lua/plugins/lsp.lua rename to nvim/.config/nvim/lua/plugins/lsp.lua diff --git a/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua similarity index 100% rename from .config/nvim/lua/plugins/ui.lua rename to nvim/.config/nvim/lua/plugins/ui.lua diff --git a/.config/openbox/menu.xml b/openbox/.config/openbox/menu.xml similarity index 100% rename from .config/openbox/menu.xml rename to openbox/.config/openbox/menu.xml diff --git a/.config/openbox/rc.xml b/openbox/.config/openbox/rc.xml similarity index 100% rename from .config/openbox/rc.xml rename to openbox/.config/openbox/rc.xml diff --git a/.config/openbox/scripts/screenlayout b/openbox/.config/openbox/scripts/screenlayout similarity index 100% rename from .config/openbox/scripts/screenlayout rename to openbox/.config/openbox/scripts/screenlayout diff --git a/.local/share/themes/icecubes b/openbox/.local/share/themes/icecubes similarity index 100% rename from .local/share/themes/icecubes rename to openbox/.local/share/themes/icecubes diff --git a/.config/picom/picom.conf b/picom/.config/picom/picom.conf similarity index 100% rename from .config/picom/picom.conf rename to picom/.config/picom/picom.conf diff --git a/.local/share/runit/sv/dunst/run b/runit/.local/share/runit/sv/dunst/run similarity index 100% rename from .local/share/runit/sv/dunst/run rename to runit/.local/share/runit/sv/dunst/run diff --git a/.local/share/runit/sv/picom/run b/runit/.local/share/runit/sv/picom/run similarity index 100% rename from .local/share/runit/sv/picom/run rename to runit/.local/share/runit/sv/picom/run diff --git a/.local/share/runit/sv/pipewire-pulse/run b/runit/.local/share/runit/sv/pipewire-pulse/run similarity index 100% rename from .local/share/runit/sv/pipewire-pulse/run rename to runit/.local/share/runit/sv/pipewire-pulse/run diff --git a/.local/share/runit/sv/pipewire/run b/runit/.local/share/runit/sv/pipewire/run similarity index 100% rename from .local/share/runit/sv/pipewire/run rename to runit/.local/share/runit/sv/pipewire/run diff --git a/.local/share/runit/sv/sxhkd/run b/runit/.local/share/runit/sv/sxhkd/run similarity index 100% rename from .local/share/runit/sv/sxhkd/run rename to runit/.local/share/runit/sv/sxhkd/run diff --git a/.local/share/runit/sv/udiskie/run b/runit/.local/share/runit/sv/udiskie/run similarity index 100% rename from .local/share/runit/sv/udiskie/run rename to runit/.local/share/runit/sv/udiskie/run diff --git a/.local/share/runit/sv/wireplumber/run b/runit/.local/share/runit/sv/wireplumber/run similarity index 100% rename from .local/share/runit/sv/wireplumber/run rename to runit/.local/share/runit/sv/wireplumber/run diff --git a/.config/shell/aliases b/shell/.config/shell/aliases similarity index 100% rename from .config/shell/aliases rename to shell/.config/shell/aliases diff --git a/.config/shell/environment b/shell/.config/shell/environment similarity index 100% rename from .config/shell/environment rename to shell/.config/shell/environment diff --git a/.config/shell/functions/skinstall b/shell/.config/shell/functions/skinstall similarity index 100% rename from .config/shell/functions/skinstall rename to shell/.config/shell/functions/skinstall diff --git a/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc similarity index 100% rename from .config/sxhkd/sxhkdrc rename to sxhkd/.config/sxhkd/sxhkdrc diff --git a/.config/tint2/tint2rc b/tint2/.config/tint2/tint2rc similarity index 100% rename from .config/tint2/tint2rc rename to tint2/.config/tint2/tint2rc diff --git a/.config/user-dirs.dirs b/user-dirs/.config/user-dirs.dirs similarity index 100% rename from .config/user-dirs.dirs rename to user-dirs/.config/user-dirs.dirs diff --git a/.config/VSCodium/User/settings.json b/vscodium/.config/VSCodium/User/settings.json similarity index 100% rename from .config/VSCodium/User/settings.json rename to vscodium/.config/VSCodium/User/settings.json diff --git a/.config/VSCodium/product.json b/vscodium/.config/VSCodium/product.json similarity index 100% rename from .config/VSCodium/product.json rename to vscodium/.config/VSCodium/product.json diff --git a/.config/X11/xresources b/xresources/.config/X11/xresources similarity index 100% rename from .config/X11/xresources rename to xresources/.config/X11/xresources diff --git a/.local/share/zsh/plugins/zsh-autosuggestions b/zsh/.local/share/zsh/plugins/zsh-autosuggestions similarity index 100% rename from .local/share/zsh/plugins/zsh-autosuggestions rename to zsh/.local/share/zsh/plugins/zsh-autosuggestions diff --git a/.local/share/zsh/plugins/zsh-completions b/zsh/.local/share/zsh/plugins/zsh-completions similarity index 100% rename from .local/share/zsh/plugins/zsh-completions rename to zsh/.local/share/zsh/plugins/zsh-completions diff --git a/.local/share/zsh/plugins/zsh-syntax-highlighting b/zsh/.local/share/zsh/plugins/zsh-syntax-highlighting similarity index 100% rename from .local/share/zsh/plugins/zsh-syntax-highlighting rename to zsh/.local/share/zsh/plugins/zsh-syntax-highlighting diff --git a/.zprofile b/zsh/.zprofile similarity index 73% rename from .zprofile rename to zsh/.zprofile index 1fc53d6..95e55da 100644 --- a/.zprofile +++ b/zsh/.zprofile @@ -1,2 +1,2 @@ +# shellcheck disable=SC1091 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/environment" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/shell/environment" -[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" diff --git a/.zshrc b/zsh/.zshrc similarity index 91% rename from .zshrc rename to zsh/.zshrc index 5948f11..e179614 100644 --- a/.zshrc +++ b/zsh/.zshrc @@ -6,10 +6,12 @@ setopt histreduceblanks PS1='%F{blue}%~ %(?.%F{green}.%F{red})%#%f ' +# shellcheck disable=SC1091 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliases" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliases" if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/shell/functions" ]; then for func in "${XDG_CONFIG_HOME:-$HOME/.config}"/shell/functions/*; do + # shellcheck disable=SC1090 . "$func" done unset func