diff --git a/.gitmodules b/.gitmodules index 4c4b785..5fdfb21 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "scripts"] path = scripts url = git@github.com:Legrems/scripts.git +[submodule "scripts-hidden"] + path = scripts-hidden + url = git@github.com:Legrems/scripts-hidden.git +[submodule "neovim-config"] + path = neovim-config + url = git@github.com:Legrems/neovim-config.git diff --git a/create_symlinks.sh b/create_symlinks.sh index e9439e0..f905d65 100755 --- a/create_symlinks.sh +++ b/create_symlinks.sh @@ -10,7 +10,7 @@ dir=/home/legrems/Documents/dotfiles # dotfiles directory olddir=~/dotfiles_old # old dotfiles backup directory -files="vim vimrc zsh zshrc tmux.conf zpreztorc gitconfig gitignore_global Xresources xprofile zprofile xinitrc" # list of files/folders to symlink in homedir +files="vim zsh zshrc tmux.conf zpreztorc gitconfig gitignore_global Xresources xprofile zprofile xinitrc" # list of files/folders to symlink in homedir configdirs="i3 keepassxc nvim rofi trizen polybar" diff --git a/gitconfig b/gitconfig index 91ed2ae..1a289fe 100644 --- a/gitconfig +++ b/gitconfig @@ -37,3 +37,5 @@ utmostDiscretion = 1 [branch] sort = -committerdate +[submodule] + recurse = true diff --git a/gitignore_global b/gitignore_global index 4ea46f4..4a8ff76 100644 --- a/gitignore_global +++ b/gitignore_global @@ -24,6 +24,12 @@ returner-consumer-stdout.log celery-exporter .gitlab.nvim +.prettierrc + +*.sqlite3 arcanite_gestion/lib/ dependencies.html + +shadow_script.py +flower_db* diff --git a/install_script.sh b/install_script.sh index f85b7b7..c22d363 100644 --- a/install_script.sh +++ b/install_script.sh @@ -1,28 +1,35 @@ +# Trizen +cd ~ + +git clone https://aur.archlinux.org/trizen.git +cd trizen +makepkg -si + # Generic -sudo apt install zsh neovim silversearcher-ag fzf nnn vifm thefuck ripgrep +trizen -S neovim zsh fzf nnn vifm thefuck ripgrep zoxide cargo locate # SSH Key ssh-keygen -t ed25519 -C "flamelegrems@gmail.com" -# DotFiles -git clone git@github.com:Legrems/dotfiles.git ~/Documents/dotfiles -mkdir .config/nvim -~/Documents/dotfiles/create_symlinks.sh -ln -s /home/legrems/Documents/dotfiles/vim/colors /home/legrems/.config/nvim/colors -ln -s /home/legrems/.vimrc /home/legrems/.config/nvim/init.vim - # Zprezto git clone --recursive git@github.com:Legrems/zpresto.git ~/.zprezto - chsh -s /bin/zsh +# DotFiles +git clone git@github.com:Legrems/dotfiles.git ~/Documents/dotfiles --recurse-submodules +mkdir .config/nvim +~/Documents/dotfiles/create_symlinks.sh + +ln -s /home/legrems/Documents/dotfiles/neovim /home/legrems/.config/nvim +ln -s /home/legrems/Documents/dotfiles/prompt_sorin_setup /home/legrems/.zprezto/modules/prompt/functions/ + +# Cdwe +cargo install cdwe +cdwe init zsh + +source <(fzf --zsh) + # MiniConda wget -O miniconda-latest-install.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh # wget -O miniconda-latest-install.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pyp3-Linux-aarch64.sh bash miniconda-latest-install.sh - -# MiniForge for Rpi -wget -O - -# AutoEnv -git clone git://github.com/inishchith/autoenv.git ~/.autoenv diff --git a/monitors.py b/monitors.py index ae95912..d25ff0a 100644 --- a/monitors.py +++ b/monitors.py @@ -5,7 +5,7 @@ import json def i3_command(command, *args, **kwargs): try: return json.loads(sh.i3_msg(command, *args, **kwargs).stdout) - except: + except Exception: return [] @@ -18,5 +18,6 @@ def get_output(): def test(): pass -print(get_workspaces()) -print(get_output()) +if __name__ == "__main__": + print(get_workspaces()) + print(get_output()) diff --git a/neovim-config b/neovim-config new file mode 160000 index 0000000..8762db9 --- /dev/null +++ b/neovim-config @@ -0,0 +1 @@ +Subproject commit 8762db974385fa2de392dec5053c0143f770d887 diff --git a/scripts-hidden b/scripts-hidden new file mode 160000 index 0000000..92ba9d1 --- /dev/null +++ b/scripts-hidden @@ -0,0 +1 @@ +Subproject commit 92ba9d1c4b5d8eee6c747db119fa60b40fc2b64f diff --git a/tmux.conf b/tmux.conf index c3e209a..485059c 100644 --- a/tmux.conf +++ b/tmux.conf @@ -64,6 +64,8 @@ set -s escape-time 0 set-option -g default-terminal "screen-256color" bind-key -r f run-shell "tmux neww /home/legrems/miniconda3/bin/python ~/Documents/dotfiles/scripts/tmux_sessionizer.py" +bind-key -r g run-shell "tmux neww /home/legrems/miniconda3/bin/python ~/Documents/dotfiles/scripts/tmux_select_session.py" +bind-key -r h run-shell "tmux neww /home/legrems/miniconda3/bin/python ~/Documents/dotfiles/scripts/tmux_select_pane.py" bind-key -r m run-shell "tmux neww /home/legrems/miniconda3/bin/python ~/Documents/dotfiles/scripts/tmux_ssh_group.py" bind-key -r j run-shell "tmux neww /home/legrems/miniconda3/bin/python ~/Documents/dotfiles/scripts/tmux_multi_ssh.py" bind-key -r i set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized, #[bg=red]!! ON !!,OFF}"