Compare commits

...

12 Commits

Author SHA1 Message Date
ivuorinen
5b4cf1bb2f chore(git): Update submodules (automated)
config/nvim v3.21.0
2023-06-09 03:10:46 +00:00
c9edd4bf84 chore(config): Update iterm2 configuration 2023-06-08 14:32:57 +03:00
1023228ddc chore(zsh): Moved brew autocomplete config 2023-06-08 14:32:19 +03:00
8f8851d08f chore(astronvim): Updated configurations
- Comment line changes
- Open trouble automagically
- Do not hide gitignored files from tree
- Tweaked nyancat dashboard header
2023-06-08 14:31:16 +03:00
2b06642e4b chore(docs): Update README and add screenshots 2023-06-08 14:28:52 +03:00
ivuorinen
52cbebc0b3 chore(git): Update submodules (automated)
config/nvim v3.19.1
2023-06-07 03:09:02 +00:00
2b64164f2b chore(brew): Update Brewfile 2023-06-06 06:53:06 +03:00
7c8fb993a2 chore(zsh): Update zsh completion locations 2023-06-06 06:53:06 +03:00
ivuorinen
e745583f07 chore(git): Update submodules (automated)
config/nvim v3.19.0
2023-06-06 03:09:41 +00:00
5762d57eb1 chore(config): Update iterm2 configuration 2023-06-05 22:29:04 +03:00
ivuorinen
4b1d860cb5 chore(git): Update submodules (automated)
config/nvim v3.18.1
2023-06-04 03:15:29 +00:00
ivuorinen
288580c150 chore(git): Update submodules (automated)
config/nvim v3.18.0
2023-06-03 03:04:32 +00:00
11 changed files with 141 additions and 59 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

BIN
.github/screenshots/tmux-starship.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

View File

@@ -379,3 +379,69 @@ mas "Keynote", id: 409183694
mas "Numbers", id: 409203825
mas "Pages", id: 409201541
mas "Tailscale", id: 1475387142
vscode "akamud.vscode-theme-onelight"
vscode "amiralizadeh9480.laravel-extra-intellisense"
vscode "andrewleedham.vscode-css-modules"
vscode "andrewmcodes.tailwindcss-extension-pack"
vscode "austenc.tailwind-docs"
vscode "bmewburn.vscode-intelephense-client"
vscode "Box-Of-Hats.bemhelper"
vscode "bradlc.vscode-tailwindcss"
vscode "christian-kohler.npm-intellisense"
vscode "DavidAnson.vscode-markdownlint"
vscode "dbaeumer.vscode-eslint"
vscode "DotJoshJohnson.xml"
vscode "eamodio.gitlens"
vscode "EditorConfig.EditorConfig"
vscode "esbenp.prettier-vscode"
vscode "formulahendry.auto-close-tag"
vscode "formulahendry.code-runner"
vscode "gencer.html-slim-scss-css-class-completion"
vscode "github.vscode-github-actions"
vscode "GitHub.vscode-pull-request-github"
vscode "GraphQL.vscode-graphql"
vscode "GraphQL.vscode-graphql-execution"
vscode "GraphQL.vscode-graphql-syntax"
vscode "heybourn.headwind"
vscode "JohnnyMorganz.stylua"
vscode "jumpinjackie.vscode-map-preview"
vscode "k--kato.intellij-idea-keybindings"
vscode "liamhammett.inline-parameters"
vscode "macieklad.tailwind-sass-syntax"
vscode "MehediDracula.php-namespace-resolver"
vscode "mikestead.dotenv"
vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
vscode "mrorz.language-gettext"
vscode "ms-azuretools.vscode-docker"
vscode "ms-python.python"
vscode "ms-python.vscode-pylance"
vscode "ms-toolsai.jupyter"
vscode "ms-toolsai.jupyter-renderers"
vscode "ms-toolsai.vscode-jupyter-cell-tags"
vscode "ms-toolsai.vscode-jupyter-slideshow"
vscode "ms-vscode-remote.remote-containers"
vscode "ms-vscode-remote.remote-wsl"
vscode "ms-vscode.cpptools"
vscode "msjsdiag.vscode-react-native"
vscode "mtxr.sqltools"
vscode "neilbrayfield.php-docblocker"
vscode "nemesarial.dust"
vscode "nhoizey.gremlins"
vscode "octref.vetur"
vscode "oderwat.indent-rainbow"
vscode "pflannery.vscode-versionlens"
vscode "phiter.phpstorm-snippets"
vscode "SonarSource.sonarlint-vscode"
vscode "stylelint.vscode-stylelint"
vscode "syler.sass-indented"
vscode "timonwong.shellcheck"
vscode "tootone.org-mode"
vscode "valeryanm.vscode-phpsab"
vscode "Vue.volar"
vscode "WakaTime.vscode-wakatime"
vscode "wix.vscode-import-cost"
vscode "xdebug.php-debug"
vscode "xdebug.php-pack"
vscode "yinfei.luahelper"
vscode "yoavbls.pretty-ts-errors"
vscode "ZainChen.json"

View File

@@ -17,12 +17,26 @@ fork or download the repo as a zip and go from there with your own configs.
3. ???
4. Profit
### Updates
`cd $HOME/.dotfiles && git pull && ./install`
## The looks
## tmux with starship, the default view
![screenshot of tmux with starship](./.github/screenshots/tmux-starship.png)
## tmux + nvim (astronvim) editing this repository
![screenshot of tmux showing nvim](.github/screenshots/tmux-nvim-astronvim.png)
## Interesting files and locations
### Interesting folders
| Path | Description |
| ------------------- | -------------------------------------------- |
|---------------------|----------------------------------------------|
| `.github` | GitHub Repository configuration files. |
| `hosts/{hostname}/` | Configs that should apply to that host only. |
| `local/bin` | Helper scripts that I've collected or wrote. |
@@ -31,7 +45,7 @@ fork or download the repo as a zip and go from there with your own configs.
### dotfile folders
| Repo | Destination | Description |
| --------- | ----------- | ------------------------------------------- |
|-----------|-------------|---------------------------------------------|
| `base/` | `.*` | `$HOME` level files. |
| `config/` | `.config/` | Configurations for applications. |
| `local/` | `.local/` | XDG Base folder: `bin`, `share` and `state` |
@@ -47,32 +61,30 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
### XDG Variables
| Var | Default |
| ------------------ | -------------------- |
| Env | Default |
|--------------------|----------------------|
| `$XDG_BIN_HOME` | `$HOME/.local/bin` |
| `$XDG_CONFIG_HOME` | `$HOME/.config` |
| `$XDG_DATA_HOME` | `$HOME/.local/share` |
| `$XDG_STATE_HOME` | `$HOME/.local/state` |
| `$XDG_CONFIG_HOME` | `$HOME/.config` |
| `$XDG_BIN_HOME` | `$HOME/.local/bin` |
- `$XDG_BIN_HOME` is a custom `env` for `.local/bin` folder.
- `$XDG_BIN_HOME` defines directory that contains local binaries.
- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data
files should be stored. If `$XDG_DATA_HOME` is either not set or empty,
a default equal to `$HOME/.local/share` should be used.
- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration
files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty,
a default equal to `$HOME/.config` should be used.
files should be stored.
- If `$XDG_DATA_HOME` is either not set or empty, a default equal to
`$HOME/.local/share` should be used.
- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific
configuration files should be stored.
- If `$XDG_CONFIG_HOME` is either not set or empty, a default equal to `$HOME/.config` should be used.
- `$XDG_STATE_HOME` defines the base directory relative
to which user-specific state files should be stored.
If `$XDG_STATE_HOME` is either not set or empty, a default
equal to `$HOME/.local/state` should be used.
- The `$XDG_STATE_HOME` contains state data that should persist
between (application) restarts,
but that is not important or portable enough to the user that
it should be stored in `$XDG_DATA_HOME`.
It may contain:
- actions history (logs, history, recently used files, …)
- current state of the application that can be reused
on a restart (view, layout, open files, undo history, …)
- If `$XDG_STATE_HOME` is either not set or empty, a default equal to `$HOME/.local/state` should be used.
- The `$XDG_STATE_HOME` contains state data that should persist between (application) restarts,
but that is not important or portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
- It may contain:
- actions history (logs, history, recently used files, …)
- current state of the application that can be reused
on a restart (view, layout, open files, undo history, …)
- User-specific executable files may be stored in `$HOME/.local/bin`.
Distributions should ensure this directory shows up in the UNIX `$PATH`
environment variable, at an appropriate place.
@@ -81,14 +93,3 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
[xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
## Interesting links
### Interesting dotfiles repos
- [dotfiles.github.io/inspiration/](https://dotfiles.github.io/inspiration)
- [frdmn/dotfiles](https://github.com/github.com/frdmn/dotfiles) - Ansible-based
dotfile setup for macOS
- [mvdan/dotfiles](https://github.com/mvdan/dotfiles) - Here be dragons
- [vsouza/dotfiles](https://github.com/vsouza/dotfiles) - 🏡 My dotfiles
- [freekmurze/dotfiles](https://github.com/freekmurze/dotfiles) - My personal dotfiles

View File

@@ -6,7 +6,7 @@ colors
setopt correct
# Add completion scripts to zsh path
fpath=(~/.config/zsh/completion $fpath)
FPATH="~/.config/zsh/completion:$FPATH"
autoload -Uz compinit && compinit -i
# Defaults
@@ -49,4 +49,3 @@ have starship && eval "$(starship init zsh)"
[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
&& source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh

View File

@@ -1,5 +1,7 @@
return { -- Add the community repository of plugin specifications
"AstroNvim/astrocommunity", -- example of imporing a plugin, comment out to use it or add your own
return {
-- Add the community repository of plugin specifications
"AstroNvim/astrocommunity",
-- example of imporing a plugin, comment out to use it or add your own.
-- available plugins can be found at
-- https://github.com/AstroNvim/astrocommunity
{
@@ -27,7 +29,7 @@ return { -- Add the community repository of plugin specific
{
"folke/trouble.nvim",
opts = {
auto_open = false,
auto_open = true,
position = "right"
}
},

View File

@@ -5,20 +5,18 @@ return {
opts = function(_, opts)
-- customize the dashboard header
opts.section.header.val = {
"░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░",
"░░░░░░░░░░▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄░░░░░░░░░",
"░░░░░░░░▄▀░░░░░░░░░░░░▄░░░░░░░▀▄░░░░░░░",
"░░░░░░░░█░░░░░░▄░░░░░░░░░░░░░█░░░░░░░",
"░░░░░░░░█░░░░░░░░░░░░▄█▄▄░░▄░░░█░▄▄▄░░░",
"░▄▄▄▄▄░░█░░░░░░░░░░▀█░░▀▄░░░░░█▀▀░██░░",
"██▄▀██▄█░░░░░░░░░██░░░░▀▀▀▀▀░░░░██░░",
"░░▀██▄▀██░░░░░░░░▀░██░░░░░░░░░░░░░▀██",
"░░░░▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄░░██",
"░░░░░░░▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██░",
"░░░░░░░▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀░░",
"░░░░░░█▀▀█████████▀▀▀▀████████████▀░░░░",
"░░░░░░████▀░░███▀░░░░░░▀███░░▀██▀░░░░░░",
"░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░"
" ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ",
" ▄▀░░░░░░░░░░░░░░░░░░░▀▄ ",
" █░░▄░░░░▄░░░░░░░░░░░░░░",
" █░░░░░░░░░░░░▄█▄▄░░░░░█ ▄▄▄ ",
"▄▄▄▄▄ █░░░░░░░░░░▀█░░▄░░░░░█▀▀░██ ",
"██▄▀██▄█░░░░░░░░░░██░░░░▀▀▀▀▀░░░░██ ",
"██▄▀██░░░░░░░░░██░░░░░░░░░░░░░██",
" ▀████░░░░░░░░██░░░▄█░░░░▄░▄█░░██",
" ▀█░░░░▄░░░░░██░░░░░░░▄░░░██",
" ▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀ ",
" █▀▀█████████▀▀▀▀████████████▀ ",
" ████▀ ███▀ ▀███ ▀██▀ ",
}
return opts
end,
@@ -47,7 +45,7 @@ return {
visible = false,
show_hidden_count = true,
hide_dotfiles = false,
hide_gitignored = true,
hide_gitignored = false,
hide_by_name = {
},
never_show = {
@@ -99,9 +97,12 @@ return {
require "plugins.configs.which-key" (plugin, opts)
-- Add bindings which show up as group name
local wk = require "which-key"
wk.register({
b = { name = "Buffer" },
}, { mode = "n", prefix = "<leader>" })
wk.register(
{
b = { name = "Buffer" },
},
{ mode = "n", prefix = "<leader>" }
)
end,
},
}

View File

@@ -1,5 +1,6 @@
-- customize mason plugins
return { -- use mason-lspconfig to configure LSP installations
return {
-- use mason-lspconfig to configure LSP installations
{
"williamboman/mason-lspconfig.nvim",
-- overrides `require("mason-lspconfig").setup(...)`
@@ -8,7 +9,9 @@ return { -- use mason-lspconfig to configure LSP installations
"diagnosticls",
},
},
}, -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
},
-- use mason-null-ls to configure Formatters/Linter
-- installation for null-ls sources
{
"jay-babu/mason-null-ls.nvim",
-- overrides `require("mason-null-ls").setup(...)`

View File

@@ -21,6 +21,14 @@ have ansible && {
x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
}
# brew configuration
have brew && {
FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
autoload -Uz compinit
compinit
}
# composer, https://getcomposer.org/
have composer && {
export COMPOSER_HOME="$XDG_STATE_HOME/composer"

View File

@@ -1240,6 +1240,8 @@
<real>0.59999999999999998</real>
<key>TabStyleWithAutomaticOption</key>
<integer>5</integer>
<key>TmuxUnpauseAutomatically</key>
<true/>
<key>VisualIndicatorForEsc</key>
<false/>
<key>kCPKSelectionViewPreferredModeKey</key>