Legrems/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'p53' into archtuf

Browse Source
This commit is contained in:
Loïc Gremaud 2023-06-06 11:34:12 +02:00
commit b2b8ef0962
No known key found for this signature in database
GPG Key ID: ACD9F65FA7E19986
13 changed files with 259 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xresources
View File

@ -53,7 +53,11 @@ URxvt.iso14755: false
URxvt.iso14755_52: false
!URxvt*font: xft:DejaVuSansMono:size=12:style=dzForPowerline
URxvt*font: xft:Courier New:size=12:style=dzForPowerline
! URxvt*font: xft:Courier New:size=12:style=dzForPowerline
URxvt*font: xft:JetBrainsMono Nerd Font:size=12
URxvt*boldFont: xft:JetBrainsMono Nerd Font:size=12
URxvt*italicFont: xft:JetBrainsMono Nerd Font:size=12
URxvt*boldItalicFont: xft:JetBrainsMono Nerd Font:size=12
URxvt.letterSpace: -1
!URxvt.keysym.Alt-Up: resize-font:bigger
!URxvt.keysym.Alt-Down: resize-font:smaller

94
config/i3/i3status.conf Normal file
View File

@ -0,0 +1,94 @@
#order += nvidia_smi
order += bluetooth
order += keyboard_layout
order += arch_updates
order += "whatismyip"
order += spotify
# order += "ipv6"
order += "wireless _first_"
order += "ethernet _first_"
order += net_rate
# order += net_iplist
order += "battery all"
order += "disk /"
order += "disk /home"
order += sysdata
# order += lm_sensors
# order += "load"
# order += "memory"
order += "tztime local"
spotify {
button_next = 4
button_play_pause = 3
button_previous = 5
format_down = ""
}
whatismyip {
# format = " {isp}\|{city}\|{countryCode} ({ip}) "
format = "{countryCode} ({ip}) "
hide_when_offline = True
url_geo = "http://ip-api.com/json"
}
battery all {
format = "%status %percentage %consumption"
low_threshold = 30
threshold_type = percentage
last_full_capacity = true
}
wireless _first_ {
format_up = " %ip (%essid)"
format_down = ""
}
ethernet _first_ {
format_up = " %ip (%speed)"
format_down = ""
on_click 1 = "exec sh /home/legrems/.screenlayout/swide.sh"
}
net_iplist {
cache_timeout = 30
format_iface = "[{ip4}]"
format = "{format_iface}"
}
net_rate {
cache_timeout = 10
format = "{total}"
}
disk "/" {
# format = "%percentage_used (%used / %free / %total)"
format = "/ %percentage_used %free"
on_click 1 = "exec nemo /"
}
disk "/home" {
# format = "%percentage_used (%used / %free / %total)"
format = "/home %percentage_used %free"
on_click 1 = "exec nemo /home/legrems/Documents"
}
tztime local {
format = "%Y-%m-%d %H:%M:%S"
timezone = "Europe/Zurich"
}
arch_updates {
format = "P:{pacman}/A:{aur}"
hide_if_zero = True
}
keyboard_layout {
layouts = ['us intl', 'us']
color_us_intl = "#ffff00"
color_us = "#ff00ff"
}
sysdata {
cache_timeout = 2
}

1
config/trizen/trizen Symbolic link
View File

@ -0,0 +1 @@
/home/legrems/Documents/dotfiles/config/trizen

1
gitconfig
View File

@ -36,6 +36,7 @@
plus-style = "syntax #012800"
minus-style = "syntax #340001"
syntax-theme = Monokai Extended
;syntax-theme = gruvbox-dark
navigate = true
side-by-side = true
[interactive]

1
gitignore_global
View File

@ -2,3 +2,4 @@
.autoenv_leave.zsh
tags
Session.vim
*.rest

4
nvim/lua/telescope/custom.lua
View File

@ -19,7 +19,7 @@ require("telescope").setup{
mappings = {
i = {
["<esc>"] = actions.close,
["<C-u>"] = false
["<C-u>"] = false,
},
},
theme = "ivy",
@ -28,7 +28,7 @@ require("telescope").setup{
git_branches = {
mappings = {
i = {
["<C-b>"] = interactive_rebase
["<C-b>"] = interactive_rebase,
},
},
},

14
scripts/tmux-cht.sh Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env bash
selected=`cat ~/.tmux-cht-languages ~/.tmux-cht-command | fzf`
if [[ -z $selected ]]; then
exit 0
fi
read -p "Enter Query: " query
if grep -qs "$selected" ~/.tmux-cht-languages; then
query=`echo $query | tr ' ' '+'`
tmux neww bash -c "echo \"curl cht.sh/$selected/$query/\" & curl cht.sh/$selected/$query & while [ : ]; do sleep 1; done"
else
tmux neww bash -c "curl -s cht.sh/$selected~$query | less"
fi

26
scripts/tmux-sessionizer Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env bash
if [[ $# -eq 1 ]]; then
selected=$1
else
selected=$(find ~/Documents/Arcanite/ ~/Documents/PolyLAN/ ~/Documents/Python ~/Documents/ -mindepth 1 -maxdepth 1 -type d | fzf)
fi
if [[ -z $selected ]]; then
exit 0
fi
selected_name=$(basename "$selected" | tr . _)
tmux_running=$(pgrep tmux)
if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then
tmux new-session -s $selected_name -c $selected
exit 0
fi
if ! tmux has-session -t=$selected_name 2> /dev/null; then
tmux new-session -ds $selected_name -c $selected
fi
tmux switch-client -t $selected_name

37
tmux-cht-command Normal file
View File

@ -0,0 +1,37 @@
find
man
tldr
sed
awk
tr
cp
ls
grep
xargs
rg
ps
mv
kill
lsof
less
head
tail
tar
cp
rm
rename
jq
cat
ssh
cargo
git
git-worktree
git-status
git-commit
git-rebase
docker
docker-compose
stow
chmod
chown
make

13
tmux-cht-languages Normal file
View File

@ -0,0 +1,13 @@
python
django-admin
golang
vim
javascript
tmux
zsh
cpp
c
lua
bash
css
html

7
tmux.conf
View File

@ -19,7 +19,9 @@ bind -n M-d select-pane -R
# reload conf
bind r source-file ~/.tmux.conf
setw -g mode-keys vi
set-window-option -g mode-keys vi
bind -T copy-mode-vi v send-keys -X begin-selection
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
# change color
#set -g pane-border-style 'fg=#660033'
@ -54,3 +56,6 @@ run -b '~/.tmux/plugins/tpm/tpm'
set -s escape-time 0
set-option -g default-terminal "screen-256color"
bind-key -r f run-shell "tmux neww ~/Documents/dotfiles/scripts/tmux-sessionizer"
bind-key -r i run-shell "tmux neww tmux-cht.sh"

72
vimrc
View File

@ -40,7 +40,7 @@ set shell=bash
" http://www.shallowsky.com/linux/noaltscreen.html
set t_ti= t_te=
" keep more context when scrolling off the end of a buffer
set scrolloff=3
set scrolloff=15
" Store temporary files in a central spot
set backup
set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
@ -79,7 +79,7 @@ augroup vimrcEx
\ endif
"for ruby, autoindent with two spaces, always expand tabs
autocmd FileType ruby,haml,eruby,yaml,html,javascript,sass,cucumber set ai sw=2 sts=2 et
autocmd FileType ruby,haml,eruby,yaml,html,htmldjango,javascript,sass,cucumber set ai sw=4 sts=4 et
autocmd FileType python set sw=4 sts=4 et
autocmd! BufRead,BufNewFile *.sass setfiletype sass
@ -118,6 +118,11 @@ imap <c-c> <esc>
" Clear the search buffer when hitting return
nnoremap <leader><leader> <c-^>
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" MISC COMMANDS
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
cmap w!! w !sudo tee % > /dev/null
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" MULTIPURPOSE TAB KEY
" Indent if we're at the beginning of a line. Else, do completion.
@ -147,31 +152,37 @@ map <leader>v :view %%
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
function! RenameFile()
let old_name = expand('%')
let new_name = input('New file name: ', expand('%'), 'file')
let new_name = input('New file name: ', expand('%:.:h') . '/')
if new_name != '' && new_name != old_name
exec ':saveas ' . new_name
exec ':silent !rm ' . old_name
redraw!
endif
endfunction
map <leader>n :call RenameFile()<cr>
map <leader>m :call RenameFile()<cr>
function! RandomHexString(...)
let random_string = system('cat /dev/urandom | tr -dc "0-9a-f" | head -c '.shellescape(a))
function! RandomHexString()
let string_length = input('String length: ')
let random_string = system('cat /dev/urandom | tr -dc "0-9a-f" | head -c '.shellescape(string_length))
call setline(line('.'), getline('.') . random_string)
return random_string
endfunction
function! RandomString(...)
let random_string = system('cat /dev/urandom | tr -dc "0-9A-z" | head -c '.shellescape(a))
function! RandomString()
let string_length = input('String length: ')
let random_string = system('cat /dev/urandom | tr -dc "0-9A-z" | head -c '.shellescape(string_length))
call setline(line('.'), getline('.') . random_string)
return random_string
endfunction
command! -range Md5 :echo system('echo '.shellescape(join(getline(<line1>, <line2>), '\n')) . '| md5sum')
map <leader>rhs :call RandomHexString()<CR>
map <leader>rs :call RandomString()<CR>
command! -nargs=1 RandomHexString :normal a<c-r>=RandomHexString(<f-args>)<cr>
command! -nargs=1 RandomString :normal a<c-r>=RandomString(<f-args>)<cr>
command! -range Sha :call append(line('.'), system('echo '.shellescape(join(getline(<line1>, <line2>), '\n')) . "| sha1sum | awk '{print $1}'"))
command! InsertTime :normal a<c-r>=strftime('%F %H:%M:%S.0 %z')<cr>
command! InsertTime :normal a<c-r>=strftime('%F %H:%M:%S %z')<cr>
""colorscheme desert
"" Status line full path for filename
@ -244,6 +255,8 @@ let g:fzf_preview_git_status_preview_command =
\ "[[ $(git diff -- {-1}) != \"\" ]] && git diff --color=always -- {-1} | delta || " .
\ g:fzf_preview_command
let g:fzf_preview_directory_files_command = "rg --files --no-ignore-vcs -g\'!.git\'"
Plug 'https://github.com/shumphrey/fugitive-gitlab.vim'
Plug 'https://tpope.io/vim/surround.git'
Plug 'https://github.com/saltstack/salt-vim'
@ -435,12 +448,16 @@ Plug 'fannheyward/telescope-coc.nvim'
Plug 'https://github.com/ludovicchabant/vim-gutentags.git'
Plug 'https://github.com/dbeniamine/cheat.sh-vim'
" API testing
"Plug 'baverman/vial'
"Plug 'baverman/vial-http'
Plug 'emaniacs/vim-rest-console'
Plug 'mbbill/undotree'
let g:vrc_output_buffer_name = '__VRC_OUTPUT.json'
let g:python3_host_prog = "/home/legrems/miniconda3/bin/python"
@ -500,16 +517,17 @@ nnoremap <C-c> :vertical topleft Git <bar> vertical resize 50<CR>
"nnoremap <C-G> :Files<CR>
" Ignore ignored files => all files
"nnoremap <C-G> :CocCommand fzf-preview.DirectoryFiles --no-ignore-vcs<CR>
nnoremap <C-G> :CocCommand fzf-preview.ProjectFiles<CR>
nnoremap <C-G> :CocCommand fzf-preview.GitFiles<CR>
" Search git file name
"nnoremap <C-X> :GFiles<CR>
"nnoremap <C-X> :CocCommand fzf-preview.DirectoryFiles<CR>
nnoremap <C-X> :CocCommand fzf-preview.GitFiles<CR>
nnoremap <C-X> :CocCommand fzf-preview.DirectoryFiles<CR>
"nnoremap <C-X> :CocCommand fzf-preview.GitFiles<CR>
" Search buffers
"nnoremap <C-B> :Buffers<CR>
" nnoremap <C-B> :Buffers<CR>
nnoremap <C-B> :CocCommand fzf-preview.Buffers<CR>
" Open Flake8 error
nnoremap <C-E> :Errors<CR>
"nnoremap <C-E> :Errors<CR>
nnoremap <C-E> :CocCommand fzf-preview.MruFiles<CR>
" Force write as unix type (/n instead of /r/n)
nnoremap <C-s> :w! ++ff=unix<CR>
" Force quit
@ -518,6 +536,22 @@ nnoremap <C-q> :q!<CR>
" nnoremap <C-d> :Gdiffsplit<CR>
nnoremap <C-d> :tab Git diff %<CR>
nnoremap <C-p> :tab Git diff<CR>
nnoremap <C-o> :UndotreeToggle<CR>
if has("persistent_undo")
let target_path = expand('~/.undodir')
" create the directory and any parent directories
" if the location does not exist.
if !isdirectory(target_path)
call mkdir(target_path, "p", 0700)
endif
let &undodir=target_path
set undofile
endif
" Using git-delta
" Buffer
@ -541,6 +575,10 @@ vnoremap <space> zf
nnoremap <leader>dl <HOME>d$
nnoremap <c-left> :bprevious<CR>
nnoremap <c-right> :bnext<CR>
"nnoremap <c-k> :bprevious<CR>
"nnoremap <c-j> :bnext<CR>
nnoremap <TAB> :bnext<CR>
nnoremap <S-TAB> :bprevious<CR>
" Goto file under location
nnoremap <leader>gf :vertical wincmd f<CR>

4
zsh/alias.sh
View File

@ -8,14 +8,16 @@ alias pm='python manage.py'
alias pmt='clear && pm test'
alias sp='python manage.py shell_plus'
alias mkmg='python manage.py makemigrations'
alias pms='pm showmigrations'
alias mg='python manage.py migrate'
alias gp='git push'
alias ga!='git commit --amend --no-edit --date now'
alias n='cd . && nvim -S'
alias v='nvim'
alias vi='nvim'
alias vim='nvim'
alias fm='vifm'
alias fm='vifm .'
rs() {python manage.py runserver 127.0.0."$1":"$2"}