From c32d6353788cefa4b6b699fe9548e24d0fc9b37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Tue, 28 May 2024 01:10:02 +0200 Subject: [PATCH 1/8] Update scripts to master --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index 2a4ba5e..5c5d2c4 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 2a4ba5ed9226846579d7557a0d6cfa96df4df080 +Subproject commit 5c5d2c4927d207ea31ed88fd54e2b873350c06f2 From 6c408487f50a0a275bf165053bca342c49f33d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Sun, 9 Jun 2024 03:15:02 +0200 Subject: [PATCH 2/8] Add tmux session select shortcuts + scripts --- scripts | 2 +- tmux.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts b/scripts index 5c5d2c4..953b9a7 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 5c5d2c4927d207ea31ed88fd54e2b873350c06f2 +Subproject commit 953b9a791c8ef9f2bf62253ce18dccd837519be0 diff --git a/tmux.conf b/tmux.conf index c3e209a..e782c5b 100644 --- a/tmux.conf +++ b/tmux.conf @@ -64,6 +64,7 @@ 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 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}" From f5034cee38906efeaeea9bb79fab56f03fd03ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Mon, 10 Jun 2024 16:44:43 +0200 Subject: [PATCH 3/8] Add tmux-pane-selection scripts + add keybinds (leader + h) --- scripts | 2 +- tmux.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts b/scripts index 953b9a7..c2b6eaa 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 953b9a791c8ef9f2bf62253ce18dccd837519be0 +Subproject commit c2b6eaa87ac90e4c06d380c7640d141bb9753dbd diff --git a/tmux.conf b/tmux.conf index e782c5b..485059c 100644 --- a/tmux.conf +++ b/tmux.conf @@ -65,6 +65,7 @@ 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}" From 49420ede7eaff4e99fc0fecd2e7cabac2df89f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Thu, 13 Jun 2024 22:32:21 +0200 Subject: [PATCH 4/8] Update scripts + gitignore global --- gitignore_global | 2 ++ scripts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gitignore_global b/gitignore_global index 4ea46f4..ac1224f 100644 --- a/gitignore_global +++ b/gitignore_global @@ -27,3 +27,5 @@ celery-exporter arcanite_gestion/lib/ dependencies.html + +shadow_script.py diff --git a/scripts b/scripts index c2b6eaa..6b1d53f 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit c2b6eaa87ac90e4c06d380c7640d141bb9753dbd +Subproject commit 6b1d53f65dc5f2b1967489fd9e5d81d8064a1569 From b1adc518b9fbd4539e6a505bf7c146f001145716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Wed, 19 Jun 2024 18:12:48 +0200 Subject: [PATCH 5/8] Update install script --- create_symlinks.sh | 2 +- gitconfig | 2 ++ gitignore_global | 1 + install_script.sh | 36 +++++++++++++++++++++--------------- zsh/generic.sh | 8 ++++---- 5 files changed, 29 insertions(+), 20 deletions(-) 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 a808a36..cf8ec80 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 ac1224f..a2647c4 100644 --- a/gitignore_global +++ b/gitignore_global @@ -29,3 +29,4 @@ arcanite_gestion/lib/ dependencies.html shadow_script.py +flower_db* diff --git a/install_script.sh b/install_script.sh index f85b7b7..e459145 100644 --- a/install_script.sh +++ b/install_script.sh @@ -1,28 +1,34 @@ +# 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 + +# 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/zsh/generic.sh b/zsh/generic.sh index 894517c..2aa9c7e 100644 --- a/zsh/generic.sh +++ b/zsh/generic.sh @@ -36,9 +36,9 @@ export NB_PROXMOXS=2 export VAGRANT_ABACUS_BOX="ubuntu/focal64" export VISUAL=nvim export EDITOR=nvim -export AUTOENV_ENV_FILENAME='.autoenv.zsh' -export AUTOENV_ENV_LEAVE_FILENAME='.autoenv_leave.zsh' -export AUTOENV_ENABLE_LEAVE='yes' +#export AUTOENV_ENV_FILENAME='.autoenv.zsh' +#export AUTOENV_ENV_LEAVE_FILENAME='.autoenv_leave.zsh' +#export AUTOENV_ENABLE_LEAVE='yes' #export PS1='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%F "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} ' # export PS1='%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} ' @@ -49,4 +49,4 @@ export AUTOENV_ENABLE_LEAVE='yes' eval $(thefuck --alias) -source ~/.autoenv/activate.sh +#source ~/.autoenv/activate.sh From 784f2d6ca36c6e078a262ede815a711959bdc9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Wed, 19 Jun 2024 18:14:17 +0200 Subject: [PATCH 6/8] Update prompt sorin --- install_script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_script.sh b/install_script.sh index e459145..c22d363 100644 --- a/install_script.sh +++ b/install_script.sh @@ -21,6 +21,7 @@ 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 From 7a6130cb81117a9b866e5d82b18a703b0e76dc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Thu, 15 Aug 2024 16:12:35 +0200 Subject: [PATCH 7/8] Update 15.08.2024 --- .gitmodules | 3 +++ config/i3/scripts/i3_autostart | 2 +- gitignore_global | 3 +++ monitors.py | 7 ++++--- neovim | 2 +- scripts | 2 +- scripts-hidden | 1 + 7 files changed, 14 insertions(+), 6 deletions(-) create mode 160000 scripts-hidden diff --git a/.gitmodules b/.gitmodules index 4c4b785..4b483d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [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 diff --git a/config/i3/scripts/i3_autostart b/config/i3/scripts/i3_autostart index f07fe30..d7a7e31 100755 --- a/config/i3/scripts/i3_autostart +++ b/config/i3/scripts/i3_autostart @@ -49,4 +49,4 @@ xsetroot -cursor_name left_ptr "$idir"/scripts/i3_comp # Start mpd -exec mpd & +# exec mpd & diff --git a/gitignore_global b/gitignore_global index a2647c4..4a8ff76 100644 --- a/gitignore_global +++ b/gitignore_global @@ -24,6 +24,9 @@ returner-consumer-stdout.log celery-exporter .gitlab.nvim +.prettierrc + +*.sqlite3 arcanite_gestion/lib/ dependencies.html 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 b/neovim index 3f08c78..822b092 160000 --- a/neovim +++ b/neovim @@ -1 +1 @@ -Subproject commit 3f08c78c134c6c577b64d6b4161999ff459bd394 +Subproject commit 822b092d1533065a0f347f2bb7cc685f605a2f2b diff --git a/scripts b/scripts index 6b1d53f..78ce7da 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 6b1d53f65dc5f2b1967489fd9e5d81d8064a1569 +Subproject commit 78ce7dac4855c6b32c5c8023c6fdb442fb5e9ab8 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 From 9d84415002bd0cb75914bc543f8a2192ba69f529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Thu, 15 Aug 2024 16:13:54 +0200 Subject: [PATCH 8/8] Add new neovim config submodules --- .gitmodules | 3 +++ neovim-config | 1 + 2 files changed, 4 insertions(+) create mode 160000 neovim-config diff --git a/.gitmodules b/.gitmodules index 4b483d1..5fdfb21 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [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/neovim-config b/neovim-config new file mode 160000 index 0000000..8762db9 --- /dev/null +++ b/neovim-config @@ -0,0 +1 @@ +Subproject commit 8762db974385fa2de392dec5053c0143f770d887