From efb36c50c737fad80707ebf3ee3eb728778cfe72 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Mon, 26 Dec 2022 18:22:04 +0100 Subject: [PATCH] refactor: move dotfiles into subfolders --- .dotbot.conf.yaml | 35 +++++++++-------- docker/lazydocker.yml | 54 +++++++++++++++++++++++++++ gitconfig => git/gitconfig | 0 gitignore => git/gitignore | 0 lazygit.yml => git/lazygit.yml | 0 starship.toml => prompt/starship.toml | 0 ack => search/ack | 0 ag => search/ag | 0 ctags => search/ctags | 0 ripgrep => search/ripgrep | 0 skhd/skhdrc | 18 ++++----- editorconfig => style/editorconfig | 0 vale.ini => style/vale.ini | 0 tmux.conf => tmux/tmux.conf | 0 url/curlrc | 8 ++++ wget => url/wget | 0 zsh/{ => zsh.d}/_cht | 0 zshrc => zsh/zshrc | 3 ++ 18 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 docker/lazydocker.yml rename gitconfig => git/gitconfig (100%) rename gitignore => git/gitignore (100%) rename lazygit.yml => git/lazygit.yml (100%) rename starship.toml => prompt/starship.toml (100%) rename ack => search/ack (100%) rename ag => search/ag (100%) rename ctags => search/ctags (100%) rename ripgrep => search/ripgrep (100%) rename editorconfig => style/editorconfig (100%) rename vale.ini => style/vale.ini (100%) rename tmux.conf => tmux/tmux.conf (100%) create mode 100644 url/curlrc rename wget => url/wget (100%) rename zsh/{ => zsh.d}/_cht (100%) rename zshrc => zsh/zshrc (99%) diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml index e2deb57..2e005a2 100644 --- a/.dotbot.conf.yaml +++ b/.dotbot.conf.yaml @@ -4,9 +4,13 @@ - clean: ["~"] +- create: + - ~/.config/lazygit + - ~/.config/lazydocker + - link: - ~/.ack: ack - ~/.ag: ag + ~/.ack: search/ack + ~/.ag: search/ag ~/.asdfrc: asdf/asdfrc ~/.config/alacritty: alacritty ~/.config/base16-shell: .base16-shell @@ -16,32 +20,33 @@ ~/.config/gh/config.yml: github/config.yml ~/.config/karabiner: karabiner ~/.config/kitty: kitty + ~/.config/lazydocker/config.yml: docker/lazydocker.yml + ~/.config/lazygit/config.yml: git/lazygit.yml ~/.config/nvim: nvim ~/.config/ranger: ranger ~/.config/skhd: skhd - ~/.config/starship.toml: starship.toml + ~/.config/starship.toml: prompt/starship.toml ~/.config/tmuxinator: tmuxinator ~/.config/yabai: yabai - ~/.ctags: ctags + ~/.ctags: search/ctags + ~/.curlrc: url/curlrc ~/.default-gems: asdf/default-gems ~/.default-npm-packages: asdf/default-npm-packages ~/.default-python-packages: asdf/default-python-packages - ~/.editorconfig: editorconfig - ~/.gitconfig: gitconfig - ~/.gitignore: gitignore + ~/.editorconfig: style/editorconfig + ~/.gitconfig: git/gitconfig + ~/.gitignore: git/gitignore ~/.gitmux.conf: tmux/gitmux.conf ~/.hammerspoon: hammerspoon ~/.pandoc: pandoc - ~/.ripgreprc: ripgrep + ~/.ripgreprc: search/ripgrep ~/.tmux-cht-command: tmux/tmux-cht-command ~/.tmux-cht-languages: tmux/tmux-cht-languages - ~/.tmux.conf: tmux.conf - ~/.vale.ini: vale.ini - ~/.vale: .vale - ~/.wget: wget - ~/.zsh.d: zsh - ~/.zshrc: zshrc - ~/Library/Application Support/lazygit/config.yml: lazygit.yml + ~/.tmux.conf: tmux/tmux.conf + ~/.vale.ini: style/vale.ini + ~/.wget: url/wget + ~/.zsh.d: zsh/zsh.d + ~/.zshrc: zsh/zshrc - shell: - [git submodule update --init --recursive, Installing submodules] diff --git a/docker/lazydocker.yml b/docker/lazydocker.yml new file mode 100644 index 0000000..09b4e5b --- /dev/null +++ b/docker/lazydocker.yml @@ -0,0 +1,54 @@ +gui: + scrollHeight: 2 + language: "auto" # one of 'auto' | 'en' | 'pl' | 'nl' | 'de' | 'tr' + theme: + activeBorderColor: + - green + - bold + inactiveBorderColor: + - white + optionsTextColor: + - blue + returnImmediately: false + wrapMainPanel: true + # Side panel width as a ratio of the screen's width + sidePanelWidth: 0.333 + # Determines whether we show the bottom line (the one containing keybinding + # info and the status of the app). + showBottomLine: true + # When true, increases vertical space used by focused side panel, + # creating an accordion effect + expandFocusedSidePanel: false +logs: + timestamps: false + since: "60m" # set to '' to show all logs + tail: "" # set to 200 to show last 200 lines of logs +commandTemplates: + dockerCompose: docker-compose + restartService: "{{ .DockerCompose }} restart {{ .Service.Name }}" + up: "{{ .DockerCompose }} up -d" + down: "{{ .DockerCompose }} down" + downWithVolumes: "{{ .DockerCompose }} down --volumes" + upService: "{{ .DockerCompose }} up -d {{ .Service.Name }}" + startService: "{{ .DockerCompose }} start {{ .Service.Name }}" + stopService: "{{ .DockerCompose }} stop {{ .Service.Name }}" + serviceLogs: "{{ .DockerCompose }} logs --since=60m --follow {{ .Service.Name }}" + viewServiceLogs: "{{ .DockerCompose }} logs --follow {{ .Service.Name }}" + rebuildService: "{{ .DockerCompose }} up -d --build {{ .Service.Name }}" + recreateService: "{{ .DockerCompose }} up -d --force-recreate {{ .Service.Name }}" + allLogs: "{{ .DockerCompose }} logs --tail=300 --follow" + viewAlLogs: "{{ .DockerCompose }} logs" + dockerComposeConfig: "{{ .DockerCompose }} config" + checkDockerComposeConfig: "{{ .DockerCompose }} config --quiet" + serviceTop: "{{ .DockerCompose }} top {{ .Service.Name }}" +oS: + openCommand: open {{filename}} + openLinkCommand: open {{link}} +stats: + graphs: + - caption: CPU (%) + statPath: DerivedStats.CPUPercentage + color: blue + - caption: Memory (%) + statPath: DerivedStats.MemoryPercentage + color: green diff --git a/gitconfig b/git/gitconfig similarity index 100% rename from gitconfig rename to git/gitconfig diff --git a/gitignore b/git/gitignore similarity index 100% rename from gitignore rename to git/gitignore diff --git a/lazygit.yml b/git/lazygit.yml similarity index 100% rename from lazygit.yml rename to git/lazygit.yml diff --git a/starship.toml b/prompt/starship.toml similarity index 100% rename from starship.toml rename to prompt/starship.toml diff --git a/ack b/search/ack similarity index 100% rename from ack rename to search/ack diff --git a/ag b/search/ag similarity index 100% rename from ag rename to search/ag diff --git a/ctags b/search/ctags similarity index 100% rename from ctags rename to search/ctags diff --git a/ripgrep b/search/ripgrep similarity index 100% rename from ripgrep rename to search/ripgrep diff --git a/skhd/skhdrc b/skhd/skhdrc index 4b47920..0c8b4b3 100644 --- a/skhd/skhdrc +++ b/skhd/skhdrc @@ -36,15 +36,15 @@ alt - e : yabai -m window --toggle split shift + alt - 0 : yabai -m space --balance # Move Window and Focus Desktop -shift + alt - 1 : yabai -m window --space 1 -shift + alt - 2 : yabai -m window --space 2 -shift + alt - 3 : yabai -m window --space 3 -shift + alt - 4 : yabai -m window --space 4 -shift + alt - 5 : yabai -m window --space 5 -shift + alt - 6 : yabai -m window --space 6 -shift + alt - 7 : yabai -m window --space 7 -shift + alt - 8 : yabai -m window --space 8 -shift + alt - 9 : yabai -m window --space 9 +shift + alt + ctrl - 1 : yabai -m window --space 1 +shift + alt + ctrl - 2 : yabai -m window --space 2 +shift + alt + ctrl - 3 : yabai -m window --space 3 +shift + alt + ctrl - 4 : yabai -m window --space 4 +shift + alt + ctrl - 5 : yabai -m window --space 5 +shift + alt + ctrl - 6 : yabai -m window --space 6 +shift + alt + ctrl - 7 : yabai -m window --space 7 +shift + alt + ctrl - 8 : yabai -m window --space 8 +shift + alt + ctrl - 9 : yabai -m window --space 9 # Send Window to Monitor and Follow Focus shift + alt - n : yabai -m window --display next; yabai -m display --focus next diff --git a/editorconfig b/style/editorconfig similarity index 100% rename from editorconfig rename to style/editorconfig diff --git a/vale.ini b/style/vale.ini similarity index 100% rename from vale.ini rename to style/vale.ini diff --git a/tmux.conf b/tmux/tmux.conf similarity index 100% rename from tmux.conf rename to tmux/tmux.conf diff --git a/url/curlrc b/url/curlrc new file mode 100644 index 0000000..71d46d7 --- /dev/null +++ b/url/curlrc @@ -0,0 +1,8 @@ +# Disguise as Googlebot +user-agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" + +# When following a redirect, automatically set the previous URL as referer. +referer = ";auto" + +# Wait 60 seconds before timing out. +connect-timeout = 60 diff --git a/wget b/url/wget similarity index 100% rename from wget rename to url/wget diff --git a/zsh/_cht b/zsh/zsh.d/_cht similarity index 100% rename from zsh/_cht rename to zsh/zsh.d/_cht diff --git a/zshrc b/zsh/zshrc similarity index 99% rename from zshrc rename to zsh/zshrc index 349faa9..b03518c 100644 --- a/zshrc +++ b/zsh/zshrc @@ -7,6 +7,9 @@ COMPLETION_WAITING_DOTS="true" # Red dots while waiting for completion # Autosuggest Highlighting ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7,bg=bold,underline" +# Set .config folder +export XDG_CONFIG_HOME="$HOME/.config" + export KEYTIMEOUT=1 export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc export GIT_EDITOR=nvim