From 1b9e34b141ca7a15dd6b62f5815544c2a1c1daf1 Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Sat, 18 Feb 2023 14:35:56 +0200 Subject: [PATCH] use just --- .ignore | 1 - .stowrc | 1 - README.md | 50 +++++++++++++------ .../fish/conf.d/doas.fish | 0 .../fish/conf.d/fnm.fish | 0 .../fish/conf.d/ls_colors.fish | 0 .../fish/conf.d/starship.fish | 0 .../fish/conf.d/zoxide.fish | 0 fish/{.config => dot-config}/fish/config.fish | 0 .../fish/fish_variables | 0 git/{.config => dot-config}/git/config | 0 justfile | 14 ++++++ .../{.config => dot-config}/kitty/kitty.conf | 0 .../nvim/after/plugin/alpha-nvim.lua | 0 .../nvim/after/plugin/catppuccin.lua | 0 .../nvim/after/plugin/gitsigns.lua | 0 .../nvim/after/plugin/indent-blankline.lua | 0 .../nvim/after/plugin/lspconfig.lua | 0 .../nvim/after/plugin/lualine.lua | 0 .../nvim/after/plugin/nvim-autopairs.lua | 0 .../nvim/after/plugin/nvim-cmp.lua | 0 .../nvim/after/plugin/telescope.lua | 0 .../nvim/after/plugin/treesitter.lua | 0 .../nvim/after/plugin/zk.lua | 0 nvim/{.config => dot-config}/nvim/init.lua | 0 .../nvim/lua/my/keymaps.lua | 0 .../nvim/lua/my/options.lua | 0 .../nvim/lua/my/plugins.lua | 0 .../nvim/lua/my/resize.lua | 0 .../nvim/lua/my/tab.lua | 0 .../nvim/lua/my/utils.lua | 0 .../{.config => dot-config}/starship.toml | 0 tmux/{.config => dot-config}/tmux/tmux.conf | 0 wezterm/dot-config/wezterm/wezterm.lua | 6 +++ 34 files changed, 56 insertions(+), 16 deletions(-) delete mode 100644 .ignore delete mode 100644 .stowrc rename fish/{.config => dot-config}/fish/conf.d/doas.fish (100%) rename fish/{.config => dot-config}/fish/conf.d/fnm.fish (100%) rename fish/{.config => dot-config}/fish/conf.d/ls_colors.fish (100%) rename fish/{.config => dot-config}/fish/conf.d/starship.fish (100%) rename fish/{.config => dot-config}/fish/conf.d/zoxide.fish (100%) rename fish/{.config => dot-config}/fish/config.fish (100%) rename fish/{.config => dot-config}/fish/fish_variables (100%) rename git/{.config => dot-config}/git/config (100%) create mode 100644 justfile rename kitty/{.config => dot-config}/kitty/kitty.conf (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/alpha-nvim.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/catppuccin.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/gitsigns.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/indent-blankline.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/lspconfig.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/lualine.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/nvim-autopairs.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/nvim-cmp.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/telescope.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/treesitter.lua (100%) rename nvim/{.config => dot-config}/nvim/after/plugin/zk.lua (100%) rename nvim/{.config => dot-config}/nvim/init.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/keymaps.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/options.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/plugins.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/resize.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/tab.lua (100%) rename nvim/{.config => dot-config}/nvim/lua/my/utils.lua (100%) rename starship/{.config => dot-config}/starship.toml (100%) rename tmux/{.config => dot-config}/tmux/tmux.conf (100%) create mode 100644 wezterm/dot-config/wezterm/wezterm.lua diff --git a/.ignore b/.ignore deleted file mode 100644 index 7cde0a1..0000000 --- a/.ignore +++ /dev/null @@ -1 +0,0 @@ -!.config/ diff --git a/.stowrc b/.stowrc deleted file mode 100644 index cfd7f3f..0000000 --- a/.stowrc +++ /dev/null @@ -1 +0,0 @@ -target=~/ diff --git a/README.md b/README.md index 61e0987..c6dc18e 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,42 @@ -### Configurations +## Configurations - [Neovim Nightly](https://github.com/neovim/neovim) -- [Kitty](https://github.com/kovidgoyal/kitty) +- ~[Kitty](https://github.com/kovidgoyal/kitty)~ Replaced by wezterm +- [Wezterm](https://github.com/wez/wezterm) - [Fish Shell](https://github.com/fish-shell/fish-shell) -- [tmux](https://github.com/tmux/tmux) +- More -### Recommended -- [ripgrep (rg)](https://github.com/BurntSushi/ripgrep) -- [exa](https://github.com/ogham/exa) -- [zoxide](https://github.com/ajeetdsouza/zoxide) -- [starship](https://github.com/starship/starship) +## Fonts -**Usage:** +You will have to install the fonts I use in these dotfiles separately -- Use [stow](https://www.gnu.org/software/stow/) to manage your symlinks. -- `git clone https://github.com/esprssoo/dotfiles.git && cd dotfiles` -- Run `stow {package}` to enable the configuration for any package you - like, where `{package}` is one of the directories in the git repository. -- Run `stow -D {package}` to disable the package. +- [ttf-jetbrains-mono-nerd](https://github.com/ryanoasis/nerd-fonts) + +## Programs used + +- [ripgrep](https://github.com/BurntSushi/ripgrep) (used by nvim) +- [exa](https://github.com/ogham/exa) (ls replacement used by fish) + +## Usage + +- Clone the repository (e.g into `~/.dotfiles`) +``` +git clone https://git.papadakis.xyz/dotfiles/ ~/.dotfiles +cd ~/dotfiles +``` + +- For automated dotfile linking use [just](https://github.com/casey/just) + +``` +just add fish +just add nvim +just add wezterm +``` + +- Or, manually link the directory you need + +``` +ln -s ~/.dotfiles/fish ~/.config/fish +ln -s ~/.dotfiles/nvim ~/.config/nvim +ln -s ~/.dotfiles/wezterm ~/.config/wezterm +``` diff --git a/fish/.config/fish/conf.d/doas.fish b/fish/dot-config/fish/conf.d/doas.fish similarity index 100% rename from fish/.config/fish/conf.d/doas.fish rename to fish/dot-config/fish/conf.d/doas.fish diff --git a/fish/.config/fish/conf.d/fnm.fish b/fish/dot-config/fish/conf.d/fnm.fish similarity index 100% rename from fish/.config/fish/conf.d/fnm.fish rename to fish/dot-config/fish/conf.d/fnm.fish diff --git a/fish/.config/fish/conf.d/ls_colors.fish b/fish/dot-config/fish/conf.d/ls_colors.fish similarity index 100% rename from fish/.config/fish/conf.d/ls_colors.fish rename to fish/dot-config/fish/conf.d/ls_colors.fish diff --git a/fish/.config/fish/conf.d/starship.fish b/fish/dot-config/fish/conf.d/starship.fish similarity index 100% rename from fish/.config/fish/conf.d/starship.fish rename to fish/dot-config/fish/conf.d/starship.fish diff --git a/fish/.config/fish/conf.d/zoxide.fish b/fish/dot-config/fish/conf.d/zoxide.fish similarity index 100% rename from fish/.config/fish/conf.d/zoxide.fish rename to fish/dot-config/fish/conf.d/zoxide.fish diff --git a/fish/.config/fish/config.fish b/fish/dot-config/fish/config.fish similarity index 100% rename from fish/.config/fish/config.fish rename to fish/dot-config/fish/config.fish diff --git a/fish/.config/fish/fish_variables b/fish/dot-config/fish/fish_variables similarity index 100% rename from fish/.config/fish/fish_variables rename to fish/dot-config/fish/fish_variables diff --git a/git/.config/git/config b/git/dot-config/git/config similarity index 100% rename from git/.config/git/config rename to git/dot-config/git/config diff --git a/justfile b/justfile new file mode 100644 index 0000000..3b5ae9d --- /dev/null +++ b/justfile @@ -0,0 +1,14 @@ +add target: + #!/bin/env sh + target={{trim_end_matches(target, '/')}} + find $target -mindepth 1 | while read p + do + t=~/`echo -n $p | sed "s/^$target\///" | sed s/dot-/./g` + s="{{justfile_directory()}}/$p" + if ( ! test -e $t ); then + echo "Linking $t -> $s" + ln -s $s $t + fi + done + +# vim: set ft=sh : diff --git a/kitty/.config/kitty/kitty.conf b/kitty/dot-config/kitty/kitty.conf similarity index 100% rename from kitty/.config/kitty/kitty.conf rename to kitty/dot-config/kitty/kitty.conf diff --git a/nvim/.config/nvim/after/plugin/alpha-nvim.lua b/nvim/dot-config/nvim/after/plugin/alpha-nvim.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/alpha-nvim.lua rename to nvim/dot-config/nvim/after/plugin/alpha-nvim.lua diff --git a/nvim/.config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/catppuccin.lua rename to nvim/dot-config/nvim/after/plugin/catppuccin.lua diff --git a/nvim/.config/nvim/after/plugin/gitsigns.lua b/nvim/dot-config/nvim/after/plugin/gitsigns.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/gitsigns.lua rename to nvim/dot-config/nvim/after/plugin/gitsigns.lua diff --git a/nvim/.config/nvim/after/plugin/indent-blankline.lua b/nvim/dot-config/nvim/after/plugin/indent-blankline.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/indent-blankline.lua rename to nvim/dot-config/nvim/after/plugin/indent-blankline.lua diff --git a/nvim/.config/nvim/after/plugin/lspconfig.lua b/nvim/dot-config/nvim/after/plugin/lspconfig.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/lspconfig.lua rename to nvim/dot-config/nvim/after/plugin/lspconfig.lua diff --git a/nvim/.config/nvim/after/plugin/lualine.lua b/nvim/dot-config/nvim/after/plugin/lualine.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/lualine.lua rename to nvim/dot-config/nvim/after/plugin/lualine.lua diff --git a/nvim/.config/nvim/after/plugin/nvim-autopairs.lua b/nvim/dot-config/nvim/after/plugin/nvim-autopairs.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/nvim-autopairs.lua rename to nvim/dot-config/nvim/after/plugin/nvim-autopairs.lua diff --git a/nvim/.config/nvim/after/plugin/nvim-cmp.lua b/nvim/dot-config/nvim/after/plugin/nvim-cmp.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/nvim-cmp.lua rename to nvim/dot-config/nvim/after/plugin/nvim-cmp.lua diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/dot-config/nvim/after/plugin/telescope.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/telescope.lua rename to nvim/dot-config/nvim/after/plugin/telescope.lua diff --git a/nvim/.config/nvim/after/plugin/treesitter.lua b/nvim/dot-config/nvim/after/plugin/treesitter.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/treesitter.lua rename to nvim/dot-config/nvim/after/plugin/treesitter.lua diff --git a/nvim/.config/nvim/after/plugin/zk.lua b/nvim/dot-config/nvim/after/plugin/zk.lua similarity index 100% rename from nvim/.config/nvim/after/plugin/zk.lua rename to nvim/dot-config/nvim/after/plugin/zk.lua 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/lua/my/keymaps.lua b/nvim/dot-config/nvim/lua/my/keymaps.lua similarity index 100% rename from nvim/.config/nvim/lua/my/keymaps.lua rename to nvim/dot-config/nvim/lua/my/keymaps.lua diff --git a/nvim/.config/nvim/lua/my/options.lua b/nvim/dot-config/nvim/lua/my/options.lua similarity index 100% rename from nvim/.config/nvim/lua/my/options.lua rename to nvim/dot-config/nvim/lua/my/options.lua diff --git a/nvim/.config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua similarity index 100% rename from nvim/.config/nvim/lua/my/plugins.lua rename to nvim/dot-config/nvim/lua/my/plugins.lua diff --git a/nvim/.config/nvim/lua/my/resize.lua b/nvim/dot-config/nvim/lua/my/resize.lua similarity index 100% rename from nvim/.config/nvim/lua/my/resize.lua rename to nvim/dot-config/nvim/lua/my/resize.lua diff --git a/nvim/.config/nvim/lua/my/tab.lua b/nvim/dot-config/nvim/lua/my/tab.lua similarity index 100% rename from nvim/.config/nvim/lua/my/tab.lua rename to nvim/dot-config/nvim/lua/my/tab.lua diff --git a/nvim/.config/nvim/lua/my/utils.lua b/nvim/dot-config/nvim/lua/my/utils.lua similarity index 100% rename from nvim/.config/nvim/lua/my/utils.lua rename to nvim/dot-config/nvim/lua/my/utils.lua diff --git a/starship/.config/starship.toml b/starship/dot-config/starship.toml similarity index 100% rename from starship/.config/starship.toml rename to starship/dot-config/starship.toml diff --git a/tmux/.config/tmux/tmux.conf b/tmux/dot-config/tmux/tmux.conf similarity index 100% rename from tmux/.config/tmux/tmux.conf rename to tmux/dot-config/tmux/tmux.conf diff --git a/wezterm/dot-config/wezterm/wezterm.lua b/wezterm/dot-config/wezterm/wezterm.lua new file mode 100644 index 0000000..7d80209 --- /dev/null +++ b/wezterm/dot-config/wezterm/wezterm.lua @@ -0,0 +1,6 @@ +local wezterm = require 'wezterm' + +return { + font = wezterm.font 'JetBrainsMono Nerd Font Mono', + color_scheme = 'Catppuccin Macchiato', +}