Compare commits

..

6 Commits

Author SHA1 Message Date
Anton Volnuhin
f8033113e5 first version of new installation script(!) 2024-05-21 01:20:50 +03:00
Anton Volnuhin
39d3816381 micro fixes for bat and z 2024-05-21 01:20:13 +03:00
Anton Volnuhin
e66922231e treesitter fix and turn off mini.comment as it is now part of neovim 2024-05-21 01:19:22 +03:00
Anton Volnuhin
04d978e058 connected domain in tab bar on wezterm 2024-05-21 01:18:33 +03:00
Anton Volnuhin
264c7cd7a7 update tide prompt to v6 2024-05-21 01:17:29 +03:00
Anton Volnuhin
723f06f92d Plus sign on left shift and on new button on advantage 2024-05-21 01:16:03 +03:00
6 changed files with 158 additions and 85 deletions

View File

@ -58,7 +58,8 @@
{:des "+ <-> ~ on advantage" {:des "+ <-> ~ on advantage"
:rules [:adv2 [:!Requal_sign :!Rgrave_accent_and_tilde :en] :rules [:adv2 [:!Requal_sign :!Rgrave_accent_and_tilde :en]
[:!Rgrave_accent_and_tilde :!Requal_sign :en]]} [:!Rgrave_accent_and_tilde :non_us_backslash :en]
[:non_us_backslash :!Sequal_sign]]}
{:des "Alternative language switches: Lcmd->English, Rcmd->Russian, Rshift-> Russian" {:des "Alternative language switches: Lcmd->English, Rcmd->Russian, Rshift-> Russian"
@ -73,8 +74,7 @@
]} ]}
{:des "Caps->Russian, LShift->English" {:des "Caps->Russian, LShift->English"
:rules [[:##left_shift :left_shift nil {:alone {:input :en}}] :rules [[:##caps_lock ["capskey" 1] :ru {:alone {:input :en}
[:##caps_lock ["capskey" 1] :ru {:alone {:input :en}
:afterup ["capskey" 0]}] :afterup ["capskey" 0]}]
[:##caps_lock ["capskey" 1] :en {:alone {:input :ru} [:##caps_lock ["capskey" 1] :en {:alone {:input :ru}
:afterup ["capskey" 0]}] :afterup ["capskey" 0]}]
@ -144,10 +144,11 @@
:held :caps_lock}] :held :caps_lock}]
[:##right_shift :right_shift :en {:alone :comma [:##right_shift :right_shift :en {:alone :comma
:held :caps_lock}]]} :held :caps_lock}]]}
{:des "Lshift->Plus"
:rules [[:##left_shift :left_shift nil {:alone :!Sequal_sign}]]}
{:des "Rcommand -> comma, but not on advantage" {:des "Rcommand -> comma, but not on advantage"
:rules [[:##right_command :right_command [:ru :!adv2] {:alone :!R6}]]}] :rules [[:##right_command :right_command [:ru :!adv2] {:alone :!R6}]]}]
} }

View File

@ -31,7 +31,7 @@ require("lazy").setup({
-- Gruvbox colorscheme -- Gruvbox colorscheme
{ "ellisonleao/gruvbox.nvim", priority = 1000 }, { "ellisonleao/gruvbox.nvim", priority = 1000 },
-- Treesitter for better highlighting and moving -- Treesitter for better highlighting and moving
{ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }, { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" , tag="v0.9.2"},
{ "nvim-telescope/telescope.nvim", tag = "0.1.1", dependencies = { "nvim-lua/plenary.nvim" } }, { "nvim-telescope/telescope.nvim", tag = "0.1.1", dependencies = { "nvim-lua/plenary.nvim" } },
{ "ojroques/nvim-osc52" }, { "ojroques/nvim-osc52" },
{ "nvim-tree/nvim-tree.lua" }, { "nvim-tree/nvim-tree.lua" },
@ -112,7 +112,7 @@ require("toggleterm").setup({})
require("hop").setup() require("hop").setup()
require("mini.ai").setup() require("mini.ai").setup()
require("mini.pairs").setup() require("mini.pairs").setup()
require("mini.comment").setup() -- require("mini.comment").setup()
require("mini.starter").setup() require("mini.starter").setup()
require("mini.statusline").setup() require("mini.statusline").setup()
require("mini.tabline").setup() require("mini.tabline").setup()

View File

@ -23,15 +23,14 @@ if status is-interactive
if type -q jump if type -q jump
# initialize jump cd # initialize jump cd
jump shell fish | source jump shell fish --bind=z | source
end end
end end
# aliases # aliases
alias b "bat -p --pager=never" alias b "bat -p"
alias l "ls -la" alias l "ls -la"
alias lll "ls -latr" alias lll "ls -latr"
alias lg "lazygit" alias lg "lazygit"
alias z j
# abbreviations # abbreviations
abbr lsn littlesnitch abbr lsn littlesnitch

View File

@ -3,7 +3,6 @@ jorgebucaran/nvm.fish
laughedelic/pisces laughedelic/pisces
jorgebucaran/replay.fish jorgebucaran/replay.fish
z11i/github-copilot-cli.fish z11i/github-copilot-cli.fish
ilancosman/tide@v5
gazorby/fish-abbreviation-tips gazorby/fish-abbreviation-tips
franciscolourenco/done franciscolourenco/done
nickeb96/puffer-fish nickeb96/puffer-fish
@ -11,3 +10,4 @@ patrickf1/colored_man_pages.fish
jhillyerd/plugin-git jhillyerd/plugin-git
patrickf1/fzf.fish patrickf1/fzf.fish
lilyball/nix-env.fish lilyball/nix-env.fish
ilancosman/tide@v6

View File

@ -220,5 +220,19 @@ wezterm.on(
end end
) )
wezterm.on('update-right-status', function(window, pane)
local domain = pane:get_domain_name()
if (domain == "local") then
domain = ""
end
-- Make it italic and underlined
window:set_right_status(wezterm.format {
{ Attribute = { Underline = 'None' } },
{ Attribute = { Italic = false } },
{ Text = domain },
})
end)
-- and finally, return the configuration to wezterm -- and finally, return the configuration to wezterm
return config return config

View File

@ -1,61 +1,129 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#Config
STEPS=12
PAD_LEN=4
BASE_PACKAGES="gnupg curl wget git gcc" BASE_PACKAGES="gnupg curl wget git gcc"
ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr" ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr"
USER=$(whoami)
#Colors
Green='\033[0;32m' # Green Green='\033[0;32m' # Green
Blue='\033[0;34m' # Blue
Yello='\033[0;33m' # Blue
Gray='\033[38;5;7m' # Light Gray
NC='\033[0m' # No Color NC='\033[0m' # No Color
cd ~ #Setup
TERM_WIDTH_BASE=$(tput cols)
LINES=$(tput lines)
USER=$(whoami)
STEP=1
cd
echo -e " echo -e "
$Green""###############################################################################
## ##
## Ready to install Anton Volnuhin's env ##
## ##
## Press $Yello""Enter"$Green" to continue, $Yello""Ctrl-C"$Green" to abort ##
## email: anton@volnuhin.com ##
## ##
###############################################################################$NC
$Green############################################################################### "
## ## read
## Update caches and upgrade packages ##
## ## print_block
###############################################################################$NC"
get_line ()
{
IFS='[;' read -p $'\e[6n' -d R -a pos -rs || echo "failed with error: $? ; ${pos[*]}"
echo ${pos[1]}
}
print_block ()
{
local ln=$(get_line)
if [[ "$ln" -lt "$(($LINES - $STEPS))" ]];then
tput csr 0 $LINES
tput cup $(($LINES - $STEPS - 2)) 0
else
ln=$(($LINES - $STEPS - 1))
fi
echo "..........................................................."
for i in $(seq 1 12)
do
echo -n " >"
tput el
echo
done
tput cup $(($ln - 3)) 0
}
new_line () {
# move cursor to current step's line
local ln=$(get_line)
tput csr 0 $LINES
tput cup $(($LINES - $STEPS - 2 + $STEP)) 0
echo -e "==> "$Green$1$NC
STEP=$(($STEP + 1))
tput csr 0 $(($LINES - $STEPS - 3))
tput cup $(($ln - 1)) 0
echo -e "\n--> "$Blue$1$NC
tput el
}
pad() {
local PADDING=$(printf "%${PAD_LEN}s") # 4 spaces of padding
local TERM_WIDTH=$(($TERM_WIDTH_BASE - $PAD_LEN))
while IFS= read -r line; do
echo -e $Gray$line$NC | fold -s -w $TERM_WIDTH | sed "s/^/$PADDING/"
done
}
new_line "Update caches and upgrade packages"
{{ if eq .chezmoi.os "darwin" -}} {{ if eq .chezmoi.os "darwin" -}}
if ! type brew; then if ! type brew; then
bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" 2>&1|pad
fi fi
brew update brew update 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "fedora" -}} {{ else if eq .chezmoi.osRelease.id "fedora" -}}
sudo dnf update -y sudo dnf update -y 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
sudo apt-get update sudo apt-get update 2>&1|pad
sudo DEBIAN_FRONTEND=noninteractive apt-get -o "Dpkg::Options::=--force-confold" -o "Dpkg::Options::=--force-confdef" upgrade -y --allow-downgrades --allow-remove-essential --allow-change-held-packages sudo DEBIAN_FRONTEND=noninteractive apt-get -o "Dpkg::Options::=--force-confold" -o "Dpkg::Options::=--force-confdef" upgrade -y --allow-downgrades --allow-remove-essential --allow-change-held-packages 2>&1|pad
sudo apt-get install software-properties-common -y sudo apt-get install software-properties-common -y 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "arch" -}} {{ else if eq .chezmoi.osRelease.id "arch" -}}
sudo pacman -Syu --noconfirm sudo pacman -Syu --noconfirm 2>&1|pad
{{ end -}} {{ end -}}
echo -e " new_line "Install base packages"
$Green###############################################################################
## ##
## Install base packages ##
## ##
###############################################################################$NC"
{{ if eq .chezmoi.os "darwin" -}} {{ if eq .chezmoi.os "darwin" -}}
brew install -q $BASE_PACKAGES python difftastic brew install -q $BASE_PACKAGES python difftastic 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "fedora" -}} {{ else if eq .chezmoi.osRelease.id "fedora" -}}
sudo dnf install $BASE_PACKAGES difftastic kitty-terminfo util-linux-user python3-pip -y sudo dnf install $BASE_PACKAGES difftastic kitty-terminfo util-linux-user python3-pip -y 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
sudo apt install $BASE_PACKAGES kitty-terminfo direnv python3-pip -y sudo apt install $BASE_PACKAGES kitty-terminfo direnv python3-pip -y 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "arch" -}} {{ else if eq .chezmoi.osRelease.id "arch" -}}
sudo pacman -Sy --noconfirm $BASE_PACKAGES difftastic kitty-terminfo python3-pip sudo pacman -Sy --noconfirm $BASE_PACKAGES difftastic kitty-terminfo python3-pip 2>&1|pad
{{ end -}} {{ end -}}
@ -65,15 +133,8 @@ $Green##########################################################################
{{ if eq .chezmoi.os "linux" -}} {{ if eq .chezmoi.os "linux" -}}
if ! type nix &> /dev/null if ! type nix &> /dev/null
then then
echo -e " new_line "Install nix packet manager (single user)"
bash <(curl -L https://nixos.org/nix/install) --no-daemon 2>&1|pad
$Green###############################################################################
## ##
## Install nix packet manager (single user) ##
## ##
###############################################################################$NC"
bash <(curl -L https://nixos.org/nix/install) --no-daemon
. ~/.nix-profile/etc/profile.d/nix.sh . ~/.nix-profile/etc/profile.d/nix.sh
fi fi
@ -82,86 +143,84 @@ fi
################################################################################ ################################################################################
{{ if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} {{ if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
echo -e "
$Green################################################################################
## ##
## Subscribe to PPA for fish, lazygit, neovim in ubuntu/debian ##
## ##
################################################################################$NC"
{{ if eq .chezmoi.osRelease.id "debian" -}} {{ if eq .chezmoi.osRelease.id "debian" -}}
new_line "Subscribe to PPA for fish"
## Setup fish repo in debian ## Setup fish repo in debian
VERS={{ .chezmoi.osRelease.versionID }} VERS={{ .chezmoi.osRelease.versionID }}
echo "deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_$VERS/ /" | sudo tee /etc/apt/sources.list.d/shells:fish:release:3.list echo "deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_$VERS/ /" | sudo tee /etc/apt/sources.list.d/shells:fish:release:3.list
curl -fsSL "https://download.opensuse.org/repositories/shells:fish:release:3/Debian_$VERS/Release.key" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null curl -fsSL "https://download.opensuse.org/repositories/shells:fish:release:3/Debian_$VERS/Release.key" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null
{{ else -}} {{ else -}}
new_line "Subscribe to PPA for fish"
## Setup fish repo in ubuntu ## Setup fish repo in ubuntu
sudo apt-add-repository ppa:fish-shell/release-3 -y sudo apt-add-repository ppa:fish-shell/release-3 -y 2>&1|pad
new_line "Subscribe to PPA for neovim"
## Neovim ppa ## Neovim ppa
sudo add-apt-repository ppa:neovim-ppa/unstable -y sudo add-apt-repository ppa:neovim-ppa/unstable -y 2>&1|pad
{{ end -}} {{ end -}}
sudo apt-get update sudo apt-get update 2>&1|pad
{{ end -}} {{ end -}}
{{ end -}} {{ end -}}
echo -e "
$Green###############################################################################
## ##
## Install neovim, fish, fisher, atuin, jump, and the rest of packages ##
## ##
###############################################################################$NC"
sleep 3
new_line "Install neovim, fish, atuin, jump and the rest"
{{ if eq .chezmoi.os "darwin" -}} {{ if eq .chezmoi.os "darwin" -}}
brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk dust lazygit brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk dust lazygit 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "fedora" -}} {{ else if eq .chezmoi.osRelease.id "fedora" -}}
sudo dnf install neovim fish $ACT_PACKAGES fd-find skim pam_ssh_agent_auth -y new_line "via DNF"
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit sudo dnf install neovim fish $ACT_PACKAGES fd-find skim pam_ssh_agent_auth -y 2>&1|pad
new_line "via NIX"
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "arch" -}} {{ else if eq .chezmoi.osRelease.id "arch" -}}
sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
nix-env -iA nixpkgs.jump nixpkgs.du-dust nix-env -iA nixpkgs.jump nixpkgs.du-dust 2>&1|pad
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
sudo apt install fish neovim $ACT_PACKAGES libpam-ssh-agent-auth -y sudo apt install fish neovim $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*') LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" curl --silent -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" 2>&1|pad
tar xf lazygit.tar.gz lazygit tar xf lazygit.tar.gz lazygit 2>&1|pad
sudo install lazygit /usr/local/bin sudo install lazygit /usr/local/bin 2>&1|pad
nix-env -iA nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin nix-env -iA nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad
{{ end -}} {{ end -}}
## Install shell-gpt new_line "Installing shell-gpt"
echo pipx install shell-gpt 2>&1|pad
echo -e "$Green""Installing shell-gpt$NC"
pip install shell-gpt -q --break-system-packages
new_line "Install fisher plugin manager for fish"
## Install fisher plugin manager for fish, so that we may update in after plugin list sync by chezmoi ## Install fisher plugin manager for fish, so that we may update in after plugin list sync by chezmoi
if ! fish -c fisher &>/dev/null if ! fish -c fisher &>/dev/null
then then
fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher" fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher" 2>&1|pad
fi fi
new_line "Installing and configuring tide prompt for fish"
fish -c "fisher install ilancosman/tide@v6" 2>&1|pad
fish -c "tide configure --auto --style=Classic --prompt_colors='True color' --classic_prompt_color=Dark --show_time='24-hour format' --classic_prompt_separators=Slanted --powerline_prompt_heads=Slanted --powerline_prompt_tails=Round --powerline_prompt_style='Two lines, frame' --prompt_connection=Disconnected --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Sparse --icons='Few icons' --transient=No" >/dev/null
fish -c "set -Ux tide_context_always_display true"
new_line "Change default shell to fish for user $USER"
## Change default shell to fish ## Change default shell to fish
if [ "$(basename $SHELL)" != "fish" ] if [ "$(basename $SHELL)" != "fish" ]
then then
echo
echo
echo "Changing shell to fish for user $USER"
sudo chsh -s $(command -v fish) $USER sudo chsh -s $(command -v fish) $USER
fi fi
tput csr 0 $LINES
tput cup $LINES 0
echo