From a4b767ac59a39e59b53c009d0e6d501391d045a3 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Fri, 12 Apr 2024 06:13:28 +0200 Subject: [PATCH] Cleanup and switched to dot- prefix now that stow has been fixed --- .../alacritty/alacritty.toml | 0 .../alacritty/gruvbox_dark.toml | 0 gdb/.config/gdb/gdbinit | 2 -- git/.stow-local-ignore | 1 + git/{.gitconfig => dot-gitconfig} | 10 ++----- git/{alten.gitconfig => gitconfig/ALTEN} | 0 gtk/.config/gtk-3.0/gtk.css | 30 ------------------- nvim/{.config => dot-config}/nvim/.gitignore | 0 nvim/{.config => dot-config}/nvim/LICENSE.md | 0 nvim/{.config => dot-config}/nvim/README.md | 0 nvim/{.config => dot-config}/nvim/init.lua | 0 .../nvim/lazy-lock.json | 0 .../nvim/lua/autocmds.lua | 0 .../nvim/lua/constant/symbols/diagnostic.lua | 0 .../nvim/lua/constant/symbols/file.lua | 0 .../nvim/lua/constant/symbols/fold.lua | 0 .../nvim/lua/constant/symbols/git.lua | 0 .../nvim/lua/constant/symbols/init.lua | 0 .../nvim/lua/keymaps.lua | 0 .../nvim/lua/options.lua | 0 .../nvim/lua/plugins/autopairs.lua | 0 .../nvim/lua/plugins/autotag.lua | 0 .../nvim/lua/plugins/bufdel.lua | 0 .../nvim/lua/plugins/bufferline.lua | 0 .../nvim/lua/plugins/colorizer.lua | 0 .../nvim/lua/plugins/comment.lua | 0 .../nvim/lua/plugins/guess-indent.lua | 0 .../nvim/lua/plugins/neotree.lua | 0 .../nvim/lua/plugins/null-ls.lua | 0 .../nvim/lua/plugins/peek.lua | 0 .../nvim/lua/plugins/surround.lua | 0 .../nvim/lua/plugins/symbols-outline.lua | 0 .../nvim/lua/plugins/tmux-navigation.lua | 0 .../nvim/lua/plugins/todo-comments.lua | 0 .../nvim/lua/plugins/treesj.lua | 0 .../nvim/lua/plugins/trouble.lua | 0 .../nvim/lua/plugins/undotree.lua | 0 .../nvim/lua/plugins/whitespace.lua | 0 .../nvim/lua/themes/gruvbox.lua | 0 tmux/{.tmux.conf => dot-tmux.conf} | 0 {bin/.local => tunnel/dot-local}/bin/tunnel | 0 urxvt/{.Xdefaults => dot-Xdefaults} | 0 urxvt/{.urxvt => dot-urxvt}/ext/vtwheel | 0 xdg/{.config => dot-config}/user-dirs.dirs | 9 +++--- xdg/{.config => dot-config}/user-dirs.locale | 0 45 files changed, 7 insertions(+), 45 deletions(-) rename alacritty/{.config => dot-config}/alacritty/alacritty.toml (100%) rename alacritty/{.config => dot-config}/alacritty/gruvbox_dark.toml (100%) delete mode 100644 gdb/.config/gdb/gdbinit rename git/{.gitconfig => dot-gitconfig} (65%) rename git/{alten.gitconfig => gitconfig/ALTEN} (100%) delete mode 100644 gtk/.config/gtk-3.0/gtk.css rename nvim/{.config => dot-config}/nvim/.gitignore (100%) rename nvim/{.config => dot-config}/nvim/LICENSE.md (100%) rename nvim/{.config => dot-config}/nvim/README.md (100%) rename nvim/{.config => dot-config}/nvim/init.lua (100%) rename nvim/{.config => dot-config}/nvim/lazy-lock.json (100%) rename nvim/{.config => dot-config}/nvim/lua/autocmds.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/constant/symbols/diagnostic.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/constant/symbols/file.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/constant/symbols/fold.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/constant/symbols/git.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/constant/symbols/init.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/keymaps.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/options.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/autopairs.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/autotag.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/bufdel.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/bufferline.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/colorizer.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/comment.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/guess-indent.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/neotree.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/null-ls.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/peek.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/surround.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/symbols-outline.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/tmux-navigation.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/todo-comments.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/treesj.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/trouble.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/undotree.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/plugins/whitespace.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/themes/gruvbox.lua (100%) rename tmux/{.tmux.conf => dot-tmux.conf} (100%) rename {bin/.local => tunnel/dot-local}/bin/tunnel (100%) rename urxvt/{.Xdefaults => dot-Xdefaults} (100%) rename urxvt/{.urxvt => dot-urxvt}/ext/vtwheel (100%) rename xdg/{.config => dot-config}/user-dirs.dirs (88%) rename xdg/{.config => dot-config}/user-dirs.locale (100%) diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/dot-config/alacritty/alacritty.toml similarity index 100% rename from alacritty/.config/alacritty/alacritty.toml rename to alacritty/dot-config/alacritty/alacritty.toml diff --git a/alacritty/.config/alacritty/gruvbox_dark.toml b/alacritty/dot-config/alacritty/gruvbox_dark.toml similarity index 100% rename from alacritty/.config/alacritty/gruvbox_dark.toml rename to alacritty/dot-config/alacritty/gruvbox_dark.toml diff --git a/gdb/.config/gdb/gdbinit b/gdb/.config/gdb/gdbinit deleted file mode 100644 index 38be22f..0000000 --- a/gdb/.config/gdb/gdbinit +++ /dev/null @@ -1,2 +0,0 @@ -# Allow loading of .gdbinit files everywhere (Might not be safe!) -set auto-load safe-path / diff --git a/git/.stow-local-ignore b/git/.stow-local-ignore index 4b6ad01..8a1e37f 100644 --- a/git/.stow-local-ignore +++ b/git/.stow-local-ignore @@ -1 +1,2 @@ gitignore +gitconfig diff --git a/git/.gitconfig b/git/dot-gitconfig similarity index 65% rename from git/.gitconfig rename to git/dot-gitconfig index edd408f..3da97c5 100644 --- a/git/.gitconfig +++ b/git/dot-gitconfig @@ -7,7 +7,7 @@ default = simple [core] - excludesfile = $HOME/.dotfiles/git/gitignore + excludesfile = ~/.dotfiles/git/gitignore [color] ui = true @@ -21,14 +21,8 @@ ; rebase = false [init] defaultBranch = master -[filter "kicad_project"] - clean = sed -E 's/^update=.*$/update=Date/' - smudge = cat -[filter "kicad_sch"] - clean = "sed -E 's/#(PWR|FLG)[0-9]+/#\\1?/'" - smudge = cat [commit] gpgsign = true [includeIf "gitdir:~/Projects/ALTEN/"] - path = ~/.dotfiles/git/alten.gitconfig + path = ~/.dotfiles/git/gitconfig/ALTEN diff --git a/git/alten.gitconfig b/git/gitconfig/ALTEN similarity index 100% rename from git/alten.gitconfig rename to git/gitconfig/ALTEN diff --git a/gtk/.config/gtk-3.0/gtk.css b/gtk/.config/gtk-3.0/gtk.css deleted file mode 100644 index c59a153..0000000 --- a/gtk/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1,30 +0,0 @@ -window.ssd separator:first-child + headerbar:backdrop, -window.ssd separator:first-child + headerbar, -window.ssd headerbar:first-child:backdrop, -window.ssd headerbar:first-child, -window.ssd headerbar:last-child:backdrop, -window.ssd headerbar:last-child, -window.ssd stack headerbar:first-child:backdrop, -window.ssd stack headerbar:first-child, -window.ssd stack headerbar:last-child:backdrop, -window.ssd stack headerbar:last-child, -window.ssd decoration, -window.ssd headerbar.titlebar { - border-radius: 0; -} - -window.ssd headerbar * { - margin-top: -100px; - color: #222d32; /* May need to tweak, this matches Adwaita Dark */ -} - -window.ssd headerbar.titlebar, -window.ssd headerbar.titlebar button.titlebutton { - border: none; - font-size: 0; - height: 0; - margin: 0; - max-height: 0; - min-height: 0; - padding: 0; -} diff --git a/nvim/.config/nvim/.gitignore b/nvim/dot-config/nvim/.gitignore similarity index 100% rename from nvim/.config/nvim/.gitignore rename to nvim/dot-config/nvim/.gitignore diff --git a/nvim/.config/nvim/LICENSE.md b/nvim/dot-config/nvim/LICENSE.md similarity index 100% rename from nvim/.config/nvim/LICENSE.md rename to nvim/dot-config/nvim/LICENSE.md diff --git a/nvim/.config/nvim/README.md b/nvim/dot-config/nvim/README.md similarity index 100% rename from nvim/.config/nvim/README.md rename to nvim/dot-config/nvim/README.md diff --git a/nvim/.config/nvim/init.lua b/nvim/dot-config/nvim/init.lua similarity index 100% rename from nvim/.config/nvim/init.lua rename to nvim/dot-config/nvim/init.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json similarity index 100% rename from nvim/.config/nvim/lazy-lock.json rename to nvim/dot-config/nvim/lazy-lock.json diff --git a/nvim/.config/nvim/lua/autocmds.lua b/nvim/dot-config/nvim/lua/autocmds.lua similarity index 100% rename from nvim/.config/nvim/lua/autocmds.lua rename to nvim/dot-config/nvim/lua/autocmds.lua diff --git a/nvim/.config/nvim/lua/constant/symbols/diagnostic.lua b/nvim/dot-config/nvim/lua/constant/symbols/diagnostic.lua similarity index 100% rename from nvim/.config/nvim/lua/constant/symbols/diagnostic.lua rename to nvim/dot-config/nvim/lua/constant/symbols/diagnostic.lua diff --git a/nvim/.config/nvim/lua/constant/symbols/file.lua b/nvim/dot-config/nvim/lua/constant/symbols/file.lua similarity index 100% rename from nvim/.config/nvim/lua/constant/symbols/file.lua rename to nvim/dot-config/nvim/lua/constant/symbols/file.lua diff --git a/nvim/.config/nvim/lua/constant/symbols/fold.lua b/nvim/dot-config/nvim/lua/constant/symbols/fold.lua similarity index 100% rename from nvim/.config/nvim/lua/constant/symbols/fold.lua rename to nvim/dot-config/nvim/lua/constant/symbols/fold.lua diff --git a/nvim/.config/nvim/lua/constant/symbols/git.lua b/nvim/dot-config/nvim/lua/constant/symbols/git.lua similarity index 100% rename from nvim/.config/nvim/lua/constant/symbols/git.lua rename to nvim/dot-config/nvim/lua/constant/symbols/git.lua diff --git a/nvim/.config/nvim/lua/constant/symbols/init.lua b/nvim/dot-config/nvim/lua/constant/symbols/init.lua similarity index 100% rename from nvim/.config/nvim/lua/constant/symbols/init.lua rename to nvim/dot-config/nvim/lua/constant/symbols/init.lua diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/dot-config/nvim/lua/keymaps.lua similarity index 100% rename from nvim/.config/nvim/lua/keymaps.lua rename to nvim/dot-config/nvim/lua/keymaps.lua diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/dot-config/nvim/lua/options.lua similarity index 100% rename from nvim/.config/nvim/lua/options.lua rename to nvim/dot-config/nvim/lua/options.lua diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/dot-config/nvim/lua/plugins/autopairs.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/autopairs.lua rename to nvim/dot-config/nvim/lua/plugins/autopairs.lua diff --git a/nvim/.config/nvim/lua/plugins/autotag.lua b/nvim/dot-config/nvim/lua/plugins/autotag.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/autotag.lua rename to nvim/dot-config/nvim/lua/plugins/autotag.lua diff --git a/nvim/.config/nvim/lua/plugins/bufdel.lua b/nvim/dot-config/nvim/lua/plugins/bufdel.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/bufdel.lua rename to nvim/dot-config/nvim/lua/plugins/bufdel.lua diff --git a/nvim/.config/nvim/lua/plugins/bufferline.lua b/nvim/dot-config/nvim/lua/plugins/bufferline.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/bufferline.lua rename to nvim/dot-config/nvim/lua/plugins/bufferline.lua diff --git a/nvim/.config/nvim/lua/plugins/colorizer.lua b/nvim/dot-config/nvim/lua/plugins/colorizer.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/colorizer.lua rename to nvim/dot-config/nvim/lua/plugins/colorizer.lua diff --git a/nvim/.config/nvim/lua/plugins/comment.lua b/nvim/dot-config/nvim/lua/plugins/comment.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/comment.lua rename to nvim/dot-config/nvim/lua/plugins/comment.lua diff --git a/nvim/.config/nvim/lua/plugins/guess-indent.lua b/nvim/dot-config/nvim/lua/plugins/guess-indent.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/guess-indent.lua rename to nvim/dot-config/nvim/lua/plugins/guess-indent.lua diff --git a/nvim/.config/nvim/lua/plugins/neotree.lua b/nvim/dot-config/nvim/lua/plugins/neotree.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/neotree.lua rename to nvim/dot-config/nvim/lua/plugins/neotree.lua diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/dot-config/nvim/lua/plugins/null-ls.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/null-ls.lua rename to nvim/dot-config/nvim/lua/plugins/null-ls.lua diff --git a/nvim/.config/nvim/lua/plugins/peek.lua b/nvim/dot-config/nvim/lua/plugins/peek.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/peek.lua rename to nvim/dot-config/nvim/lua/plugins/peek.lua diff --git a/nvim/.config/nvim/lua/plugins/surround.lua b/nvim/dot-config/nvim/lua/plugins/surround.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/surround.lua rename to nvim/dot-config/nvim/lua/plugins/surround.lua diff --git a/nvim/.config/nvim/lua/plugins/symbols-outline.lua b/nvim/dot-config/nvim/lua/plugins/symbols-outline.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/symbols-outline.lua rename to nvim/dot-config/nvim/lua/plugins/symbols-outline.lua diff --git a/nvim/.config/nvim/lua/plugins/tmux-navigation.lua b/nvim/dot-config/nvim/lua/plugins/tmux-navigation.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/tmux-navigation.lua rename to nvim/dot-config/nvim/lua/plugins/tmux-navigation.lua diff --git a/nvim/.config/nvim/lua/plugins/todo-comments.lua b/nvim/dot-config/nvim/lua/plugins/todo-comments.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/todo-comments.lua rename to nvim/dot-config/nvim/lua/plugins/todo-comments.lua diff --git a/nvim/.config/nvim/lua/plugins/treesj.lua b/nvim/dot-config/nvim/lua/plugins/treesj.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/treesj.lua rename to nvim/dot-config/nvim/lua/plugins/treesj.lua diff --git a/nvim/.config/nvim/lua/plugins/trouble.lua b/nvim/dot-config/nvim/lua/plugins/trouble.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/trouble.lua rename to nvim/dot-config/nvim/lua/plugins/trouble.lua diff --git a/nvim/.config/nvim/lua/plugins/undotree.lua b/nvim/dot-config/nvim/lua/plugins/undotree.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/undotree.lua rename to nvim/dot-config/nvim/lua/plugins/undotree.lua diff --git a/nvim/.config/nvim/lua/plugins/whitespace.lua b/nvim/dot-config/nvim/lua/plugins/whitespace.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/whitespace.lua rename to nvim/dot-config/nvim/lua/plugins/whitespace.lua diff --git a/nvim/.config/nvim/lua/themes/gruvbox.lua b/nvim/dot-config/nvim/lua/themes/gruvbox.lua similarity index 100% rename from nvim/.config/nvim/lua/themes/gruvbox.lua rename to nvim/dot-config/nvim/lua/themes/gruvbox.lua diff --git a/tmux/.tmux.conf b/tmux/dot-tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to tmux/dot-tmux.conf diff --git a/bin/.local/bin/tunnel b/tunnel/dot-local/bin/tunnel similarity index 100% rename from bin/.local/bin/tunnel rename to tunnel/dot-local/bin/tunnel diff --git a/urxvt/.Xdefaults b/urxvt/dot-Xdefaults similarity index 100% rename from urxvt/.Xdefaults rename to urxvt/dot-Xdefaults diff --git a/urxvt/.urxvt/ext/vtwheel b/urxvt/dot-urxvt/ext/vtwheel similarity index 100% rename from urxvt/.urxvt/ext/vtwheel rename to urxvt/dot-urxvt/ext/vtwheel diff --git a/xdg/.config/user-dirs.dirs b/xdg/dot-config/user-dirs.dirs similarity index 88% rename from xdg/.config/user-dirs.dirs rename to xdg/dot-config/user-dirs.dirs index e94251d..fb97170 100644 --- a/xdg/.config/user-dirs.dirs +++ b/xdg/dot-config/user-dirs.dirs @@ -4,7 +4,7 @@ # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an # absolute path. No other format is supported. -# +# XDG_CONFIG_HOME="$HOME/.config" XDG_CACHE_HOME="$HOME/.cache" XDG_DATA_HOME="$HOME/.local/share" @@ -14,8 +14,7 @@ XDG_DOCUMENTS_DIR="$HOME/Documents" XDG_MUSIC_DIR="$HOME/Music" XDG_PICTURES_DIR="$HOME/Pictures" XDG_VIDEOS_DIR="$HOME/Videos" +XDG_DESKTOP_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/" +XDG_TEMPLATES_DIR="$HOME/" XDG_ACTIVITIES_DIR="$HOME/Projects" - -XDG_DESKTOP_DIR="$HOME" -XDG_PUBLICSHARE_DIR="$HOME" -XDG_TEMPLATES_DIR="$HOME" diff --git a/xdg/.config/user-dirs.locale b/xdg/dot-config/user-dirs.locale similarity index 100% rename from xdg/.config/user-dirs.locale rename to xdg/dot-config/user-dirs.locale