Merge branch 'p53' into home

This commit is contained in:
Loïc Gremaud 2023-04-16 00:22:58 +02:00
commit 88c283b2e9
Signed by: Legrems
GPG Key ID: D4620E6DF3E0121D
16 changed files with 285 additions and 69 deletions

View File

@ -40,7 +40,7 @@ URxvt*background: black
URxvt*transparent: true
URxvt*shading: 40
URxvt*shading: 10
Xft.antialias: true
Xft.hinting: true

View File

@ -53,14 +53,14 @@ default_floating_border none
# class border backgr. text indicator child_border
client.focused #ffffff #888888 #000000 #ffffff #888888
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #ff0000 #040404 #888888 #444444 #444444
client.urgent #2f343a #900000 #ffffff #900000 #900000
client.unfocused #a000ff #040404 #888888 #444444 #444444
client.urgent #2f343a #600099 #ffffff #600099 #600099
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #000000
# Use pactl to adjust volume in PulseAudio.
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +7%
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +8%
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -7%
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
@ -88,9 +88,11 @@ bindsym $mod+w kill
#bindsym $mod+r exec --no-startup-id ~/.config/rofi/bin/menu_powermenu
bindsym $mod+r exec --no-startup-id ~/rofi/files/powermenu/type-2/powermenu.sh
# start rofi
bindsym $mod+p exec rofi -show run
bindsym $mod+p exec "rofi -modes combi -show combi run,window"
# switch rofi
bindsym $mod+q exec rofi -show window
# rofi fb
bindsym $mod+g exec rofi -show file-browser-extended
# ssh rofi
#bindsym $mod+c exec rofi -show ssh
bindsym $mod+c exec --no-startup-id ~/.config/rofi/bin/menu_time
@ -245,34 +247,34 @@ bindsym $mod+Shift+c reload
bindsym $mod+Shift+r restart
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
#
#resize window (you can also use the mouse for that)
mode "resize" {
# These bindings trigger as soon as you enter the resize mode
# resize window (you can also use the mouse for that)
# mode "resize" {
# # These bindings trigger as soon as you enter the resize mode
#
# # Pressing left will shrink the windows width.
# # Pressing right will grow the windows width.
# # Pressing up will shrink the windows height.
# # Pressing down will grow the windows height.
# bindsym j resize shrink width 10 px or 10 ppt
# bindsym k resize grow height 10 px or 10 ppt
# bindsym l resize shrink height 10 px or 10 ppt
# bindsym semicolon resize grow width 10 px or 10 ppt
#
# # same bindings, but for the arrow keys
# bindsym Left resize shrink width 10 px or 10 ppt
# bindsym Down resize grow height 10 px or 10 ppt
# bindsym Up resize shrink height 10 px or 10 ppt
# bindsym Right resize grow width 10 px or 10 ppt
#
# # back to normal: Enter or Escape or $mod+r
# bindsym Return mode "default"
# bindsym Escape mode "default"
# bindsym $mod+r mode "default"
# }
# Pressing left will shrink the windows width.
# Pressing right will grow the windows width.
# Pressing up will shrink the windows height.
# Pressing down will grow the windows height.
bindsym j resize shrink width 10 px or 10 ppt
bindsym k resize grow height 10 px or 10 ppt
bindsym l resize shrink height 10 px or 10 ppt
bindsym semicolon resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
bindsym Left resize shrink width 10 px or 10 ppt
bindsym Down resize grow height 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt
bindsym Right resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym $mod+r mode "default"
}
#
# Supposed to kill with center button
bindsym --release button2 kill
bindsym --release button2 killa
# Custom config window
for_window [class="vlc"] floating enable
@ -286,7 +288,7 @@ assign [class="Telegram"] 9
assign [class="Mailspring"] 7
assign [class="MineTime"] 7
# bindsym $mod+r mode "resize"
#bindsym $mod+Return mode "resize"
# Workspace config
#workspace 1 output DisplayPort-2
@ -305,21 +307,21 @@ bar {
colors {
background #000000
statusline #ffffff
statusline #a000ff
separator #aaaaaa
# Default conf
# focused_workspace #4c7899 #285577 #ffffff
focused_workspace #ffffff #888888 #000000
active_workspace #888888 #444444 #ffffff
inactive_workspace #888888 #444444 #ff0000
urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff
inactive_workspace #888888 #000000 #a000ff
urgent_workspace #2f343a #600099 #ffffff
binding_mode #2f343a #600099 #ffffff
}
separator_symbol "ʃ"
#separator_symbol "❰"
#separator_symbol " "
#separator_symbol "❱"
#separator_symbol " ▷ "
#separator_symbol " ∠ "
#separator_symbol "|"

View File

@ -1,10 +1,10 @@
# order += nvidia_smi
order += bluetooth
#order += nvidia_smi
order += bluetooth
order += keyboard_layout
order += arch_updates
order += "whatismyip"
order += spotify
order += "ipv6"
# order += "ipv6"
order += "wireless _first_"
order += "ethernet _first_"
order += net_rate
@ -22,17 +22,21 @@ spotify {
button_next = 4
button_play_pause = 3
button_previous = 5
format_down = ""
}
whatismyip {
# format = " {isp}\|{city}\|{countryCode} ({ip}) "
format = " {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_ {

View File

@ -5,6 +5,9 @@ ConfigVersion=2
CustomProxyLocation=
Enabled=true
[FdoSecrets]
Enabled=false
[GUI]
ApplicationTheme=dark
TrayIconAppearance=monochrome-light
@ -14,5 +17,8 @@ AdditionalChars=
ExcludedChars=
Length=32
[SSHAgent]
Enabled=false
[Security]
LockDatabaseScreenLock=false

1
config/nvim/lua Symbolic link
View File

@ -0,0 +1 @@
/home/legrems/Documents/dotfiles/nvim/lua

View File

@ -4,6 +4,8 @@
;signingkey = 8B2741BF148B1059065A71EEE81E8B180465D116 ;540
signingkey = BAE2CD06F0A3753A0F8D0A21D4620E6DF3E0121D ;539
;signingkey = 4F78275C96E34F56920CF7B5CACB2A128E557EFD ;W
;signingkey = C6424C524F8B4D0B0C6F9380ACD9F65FA7E19986;USB-C
token = REPLACE HERE TOKEN
[commit]
gpgSign = true
[gpg]
@ -18,6 +20,7 @@
d = difftool
adog = log --all --decorate --oneline --graph
dog = log --decorate --oneline --graph
count-lines = "! git log --author=\"$1\" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\\n\", add, subs, loc }' #"
[push]
default = current
[core]

View File

@ -1,2 +1,3 @@
.autoenv.zsh
.autoenv_leave.zsh
tags

20
monitors.py Normal file
View File

@ -0,0 +1,20 @@
import sh
import json
def i3_command(command, *args, **kwargs):
try:
return json.loads(sh.i3_msg(command, *args, **kwargs).stdout)
except:
return []
def get_workspaces():
return i3_command("-t", "get_workspaces")
def get_outputs():
return i3_command("-t", "get_outputs")
print(get_workspaces())
print(get_outputs())

View File

@ -0,0 +1,99 @@
local actions = require("telescope.actions")
local action_state = require "telescope.actions.state"
local interactive_rebase = function(prompt_bufnr)
local selection = action_state.get_selected_entry()
-- Use vim-fugitive for the rebase
vim.cmd('Git rebase -i ' .. selection.name)
end
require("telescope").setup{
extensions = {
coc = {
theme = 'ivy',
prefer_locations = true, -- always use Telescope locations to preview definitions/declarations/implementations etc
}
},
defaults = {
mappings = {
i = {
["<esc>"] = actions.close,
["<C-u>"] = false
},
},
theme = "ivy",
},
pickers = {
git_branches = {
mappings = {
i = {
["<C-b>"] = interactive_rebase
},
},
},
},
}
-- Implement delta as previewer for diffs
local previewers = require('telescope.previewers')
local builtin = require('telescope.builtin')
local conf = require('telescope.config')
local E = {}
local delta = previewers.new_termopen_previewer {
get_command = function(entry)
-- this is for status
-- You can get the AM things in entry.status. So we are displaying file if entry.status == '??' or 'A '
-- just do an if and return a different command
if entry.status == '??' or 'A ' then
return { 'git', '-c', 'core.pager=delta', '-c', 'delta.side-by-side=false', 'diff', entry.value }
end
-- note we can't use pipes
-- this command is for git_commits and git_bcommits
return { 'git', '-c', 'core.pager=delta', '-c', 'delta.side-by-side=false', 'diff', entry.value .. '^!' }
end
}
E.my_git_commits = function(opts)
opts = opts or {}
opts.previewer = delta
builtin.git_commits(opts)
end
E.my_git_bcommits = function(opts)
opts = opts or {}
opts.previewer = delta
builtin.git_bcommits(opts)
end
E.my_git_status = function(opts)
opts = opts or {}
opts.previewer = delta
builtin.git_status(opts)
end
E.my_git_branches = function(opts)
opts = opts or {}
opts.previewer = delta
builtin.git_branches(opts)
end
E.project_files = function()
local opts = {} -- define here if you want to define something
vim.fn.system('git rev-parse --is-inside-work-tree')
if vim.v.shell_error == 0 then
require"telescope.builtin".git_files(opts)
else
require"telescope.builtin".find_files(opts)
end
end
return E

7
p53_screen.sh Executable file
View File

@ -0,0 +1,7 @@
xrandr --output eDP1 --auto
xrandr --output DP-1-0.2 --off
xrandr --output DP-1-0.3 --off
sleep 2
xrandr --output eDP1 --mode 2560x1440 --scale 1x1 --primary

View File

@ -24,15 +24,15 @@ setw -g mode-keys vi
# change color
#set -g pane-border-style 'fg=#660033'
#set -g pane-active-border-style 'fg=#990033 bg=default'
set -g pane-border-style 'fg=#990000'
set -g pane-active-border-style 'fg=#ff0000'
set -g pane-border-style 'fg=#000055'
set -g pane-active-border-style 'fg=#6a00aa'
# status bar
set -g status-position bottom
set -g status-position top
set -g status-justify left
#set -g status-style 'fg=#660033 bg=#202020'
set -g status-style 'fg=#990000 bg=#330000'
set -g status-style 'fg=#a000ff bg=#202020'
# native xterm scrolling
set -g mouse on
@ -41,7 +41,12 @@ set -g history-file ~/.tmux_history
# List of plugins
#set -g @plugin 'tmux-plugins/tpm'
#set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @resurrect-capture-pane-contents 'on'
set -g @resurrect-strategy-vim 'session'
set -g @resurrect-strategy-nvim 'session'
set -g @resurrect-processes 'ssh vim nvim django-run "~manage.py"'
set -g @plugin 'tmux-plugins/tmux-yank'
run -b '~/.tmux/plugins/tpm/tpm'

97
vimrc
View File

@ -116,7 +116,6 @@ imap <c-l> <space>=><space>
" Can't be bothered to understand ESC vs <c-c> in insert mode
imap <c-c> <esc>
" Clear the search buffer when hitting return
:nnoremap <CR> :nohlsearch<cr>
nnoremap <leader><leader> <c-^>
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@ -185,6 +184,8 @@ function LightlineFilename()
return expand('%')
endfunction
"set statusline+=%{gutentags#statusline()}
" Bootstrap autoreload
if empty(glob('~/.vim/autoload/plug.vim'))
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
@ -194,6 +195,9 @@ endif
call plug#begin('~/.vim/plugged')
Plug 'liuchengxu/space-vim-dark'
Plug 'kyoz/purify', { 'rtp': 'vim' }
Plug 'https://github.com/preservim/nerdtree'
Plug 'https://github.com/Xuyuanp/nerdtree-git-plugin.git'
Plug 'https://github.com/tiagofumo/vim-nerdtree-syntax-highlight'
@ -258,7 +262,7 @@ let g:lightline = {
\ 'left': [ [ 'filename', 'gitversion' ] ],
\ },
\ 'component_function': {
\ 'gitbranch': 'fugitive#head',
\ 'gitbranch': 'FugitiveHead',
\ 'filename': 'LightlineFilename',
\ },
\ 'component_expand': {
@ -288,8 +292,8 @@ let g:NERDTrimTrailingWhitespace = 1
" Enable NERDCommenterToggle to check all selected lines is commented or not
let g:NERDToggleCheckAllLines = 1
Plug 'https://github.com/mcchrish/nnn.vim'
nnoremap <leader>nn :NnnPicker -de '%:p:h'<CR>
"Plug 'https://github.com/mcchrish/nnn.vim'
"nnoremap <leader>nn :NnnPicker -de '%:p:h'<CR>
let g:nnn#action = {
\ '<c-t>': 'tab-split',
@ -355,7 +359,10 @@ let g:mkdp_open_ip = ''
" specify browser to open preview page
" default: ''
let g:mkdp_browser = ''
function OpenMarkdownPreview (url)
execute "silent ! firefox --new-window " . a:url
endfunction
let g:mkdp_browserfunc = 'OpenMarkdownPreview'
" set to 1, echo preview page url in command line when open preview page
" default is 0
@ -419,11 +426,29 @@ Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown'
"Plug 'pwntester/octo.vim'
"Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " We recommend updating the parsers on update
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " We recommend updating the parsers on update
Plug 'nvim-lua/popup.nvim'
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim'
Plug 'fannheyward/telescope-coc.nvim'
Plug 'https://github.com/ludovicchabant/vim-gutentags.git'
" API testing
"Plug 'baverman/vial'
"Plug 'baverman/vial-http'
Plug 'emaniacs/vim-rest-console'
let g:vrc_output_buffer_name = '__VRC_OUTPUT.json'
let g:python3_host_prog = "/home/legrems/miniconda3/bin/python"
let g:vial_python = 'python3'
set hidden
filetype plugin on
call plug#end()
@ -496,14 +521,18 @@ nnoremap <C-p> :tab Git diff<CR>
" Using git-delta
" Buffer
" Bind a command to exclude some file extensions in the Ag search
" command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, '--ignore="*.js,*html"', fzf#vim#with_preview(), <bang>0)
"" F1-12 Shortcuts
nnoremap <F1> :tabprevious<CR>
nnoremap <F2> :tabnext<CR>
nnoremap <F3> :GV<CR>
nnoremap <F4> :tab Git show -
nnoremap <F5> :Git rebase -i HEAD~
nnoremap <F7> :SyntasticCheck<CR>
nnoremap <F8> :SyntasticReset<CR>
nnoremap <leader>gp :Git pull<CR>
nnoremap <leader>gnb :Git checkout -b
" Fold / unfold with space
nnoremap <space> za
@ -513,22 +542,35 @@ nnoremap <leader>dl <HOME>d$
nnoremap <c-left> :bprevious<CR>
nnoremap <c-right> :bnext<CR>
" Goto file under location
nnoremap <leader>gf :vertical wincmd f<CR>
nnoremap <Return> o<ESC>
nnoremap <BS> O<ESC>
nnoremap <leader>/ <cmd>Telescope search_history<CR>
"nnoremap <leader>ch <cmd>Telescope command_history<CR>
nnoremap <leader>ch <cmd>CocCommand fzf-preview.CommandPalette<CR>
"nnoremap <leader>gc <cmd>Telescope git_commits<CR>
nnoremap <leader>gc <cmd>CocCommand fzf-preview.GitLogs<CR>
"nnoremap <leader>gb <cmd>Telescope git_branches<CR>
nnoremap <leader>gb <cmd>CocCommand fzf-preview.GitBranches<CR>
"nnoremap <leader>gss <cmd>Telescope git_status<CR>
nnoremap <leader>gss <cmd>CocCommand fzf-preview.GitStatus<CR>
"nnoremap <leader>gsc <cmd>Telescope git_stash<CR>
nnoremap <leader>gsc <cmd>CocCommand fzf-preview.GitStashes<CR>
"nnoremap <leader>ra <cmd>CocCommand rest-client.request<CR>
nnoremap <leader>ra <cmd>call VrcQuery()<CR>
nnoremap <leader>iss <cmd>! glab issue list<CR>
nnoremap <leader>rr <cmd>source $MYVIMRC<CR>
nnoremap <leader>ww <cmd>Telescope coc commands<CR>
nnoremap <leader>/ <cmd>Telescope search_history<CR>
nnoremap <leader>ch <cmd>Telescope command_history<CR>
"nnoremap <leader>ch <cmd>CocCommand fzf-preview.CommandPalette<CR>
nnoremap <leader>gk <cmd>CocCommand fzf-preview.GitActions<CR>
"nnoremap <leader>gc <cmd>Telescope git_commits<CR>
nnoremap <leader>gc <cmd>lua require('telescope.custom').my_git_commits()<CR>
"nnoremap <leader>gc <cmd>CocCommand fzf-preview.GitLogs<CR>
nnoremap <leader>gbb <cmd>Telescope git_branches<CR>
nnoremap <leader>gbc <cmd>lua require('telescope.custom').my_git_bcommits()<CR>
"nnoremap <leader>gb <cmd>CocCommand fzf-preview.GitBranches<CR>
"nnoremap <leader>gss <cmd>Telescope git_status<CR>
nnoremap <leader>gss <cmd>lua require('telescope.custom').my_git_status()<CR>
"nnoremap <leader>gss <cmd>CocCommand fzf-preview.GitStatus<CR>
nnoremap <leader>gsh <cmd>Telescope git_stash<CR>
"nnoremap <leader>gsc <cmd>CocCommand fzf-preview.GitStashes<CR>
"nnoremap <leader>iss <cmd>! glab issue list<CR>
" Copy into temp file
vmap <leader>y :w! /tmp/vimtmp<CR>
@ -540,3 +582,18 @@ nmap <leader>oo :call setreg('+', expand("%:h") . "/" . expand("%:t") . "#L" . l
nmap <leader>xx :%!xxd<CR>
nnoremap <Leader>n :noh<CR>
colorscheme space-vim-dark
hi Normal ctermbg=NONE guibg=NONE
hi LineNr ctermbg=NONE guibg=NONE
hi SignColumn ctermbg=NONE guibg=NONE
hi Comment guifg=#5C6370 ctermfg=59
" Load custom telescope modification
lua require('telescope.custom')
" Load telescope-coc extension
lua require('telescope').load_extension('coc')

View File

@ -41,9 +41,8 @@ fi
# exec xterm -geometry 80x66+0+0 -name login
xrandr --setprovideroutputsource modesetting NVIDIA-0
xrandr --auto
$HOME/.config/xrandr-magic.sh $MONITOR
$HOME/.config/manipulate_monitors.sh $MONITOR rtl
#xrandr --auto
xrandr --output eDP1 --mode 2560x1440 --scale 1x1 --primary
xinput --set-prop "pointer:Razer Razer DeathAdder V2" 'libinput Accel Speed' -0.1
@ -56,6 +55,8 @@ setxkbmap -option caps:swapescape
# Set background
feh --bg-fill ~/Downloads/wp4473722-5120x1440-wallpapers.jpg
xfsettingsd --sm-client-disable &
# Launch i3
exec i3
/usr/bin/prime-offload

View File

@ -40,6 +40,8 @@ make_venv() {
echo $(basename $(pwd) | awk '{print "conda deactivate "}') > $(pwd | awk '{print $1"/.autoenv_leave.zsh"}')
}
alias activate_venv_gestion="cda arcanite-gestion39 && cd /home/legrems/Documents/Arcanite/arcanite-gestion/arcanite_gestion/"
alias cls="ls -lha --color=always -F --group-directories-first |awk '{k=0;s=0;for(i=0;i<=8;i++){;k+=((substr(\$1,i+2,1)~/[rwxst]/)*2^(8-i));};j=4;for(i=4;i<=10;i+=3){;s+=((substr(\$1,i,1)~/[stST]/)*j);j/=2;};if(k){;printf(\"%0o%0o \",s,k);};print;}'"
alias lcs="ls -lhaS --color=always -F --group-directories-first |awk '{k=0;s=0;for(i=0;i<=8;i++){;k+=((substr(\$1,i+2,1)~/[rwxst]/)*2^(8-i));};j=4;for(i=4;i<=10;i+=3){;s+=((substr(\$1,i,1)~/[stST]/)*j);j/=2;};if(k){;printf(\"%0o%0o \",s,k);};print;}'"

View File

@ -29,7 +29,7 @@ export PATH=$HOME/custom_commands:$PATH
export NB_MINIONS=4
export VAGRANT_TYPE='abacus-abahost'
export NB_HAPROXY=2
export NB_PROXMOXS=1
export NB_PROXMOXS=2
export VAGRANT_ABACUS_BOX="ubuntu/focal64"
export VISUAL=nvim
export EDITOR=nvim

8
zshrc
View File

@ -27,3 +27,11 @@ fi
unset __conda_setup
# <<< conda initialize <<<
# PM functions
source /home/legrems/.pm/pm.zsh
alias pma="pm add"
alias pmg="pm go"
alias pmrm="pm remove"
alias pml="pm list"
# end PM