Add tmuxinator, description of functions, konsole profile
This commit is contained in:
parent
57cfd6d3ec
commit
0e5321ae8e
41 changed files with 164 additions and 40 deletions
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function android-cast
|
||||
function android-cast -d "Cast Android screen"
|
||||
adb shell "while true; do screenrecord --output-format=h264 -; done" | ffplay -framerate 60 -probesize 32 -sync video -
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function diff
|
||||
function diff -d "Diff tool"
|
||||
colordiff $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function fish_greeting
|
||||
function fish_greeting -d "Greetings"
|
||||
json-fortune
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitci
|
||||
function gitci -d "git commit"
|
||||
git commit -S $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitcia
|
||||
function gitcia -d "git commit all added/removed files"
|
||||
git commit -Sa $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitco
|
||||
function gitco -d "git checkout"
|
||||
git checkout $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitdiff
|
||||
function gitdiff -d "git diff"
|
||||
git diff $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitgrep
|
||||
function gitgrep -d "git grep"
|
||||
git grep $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
|
||||
function gitgrephistory
|
||||
function gitgrephistory -d "git grep in history"
|
||||
if test (count $argv) -eq 1
|
||||
git rev-list --all | xargs git grep $argv[1]
|
||||
else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitlog
|
||||
function gitlog -d "git log"
|
||||
git log --name-status $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitlstags
|
||||
function gitlstags -d "git list tags"
|
||||
git describe --tags $argv
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitpr
|
||||
function gitpr -d "git pull rebase and update modules"
|
||||
git pull --stat --progress --rebase
|
||||
git submodule update
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitprp
|
||||
function gitprp -d "git pull, rebase, update modules and push"
|
||||
git pull --stat --progress --rebase
|
||||
git submodule update
|
||||
git push
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitprst
|
||||
function gitprst -d "git stash, pull, rebase, update modules and apply stash"
|
||||
git stash
|
||||
git pull --stat --progress --rebase
|
||||
git submodule update
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitprstp
|
||||
function gitprstp -d "git stash, pull, rebase, update modules, apply stash and push"
|
||||
git stash
|
||||
git pull --stat --progress --rebase
|
||||
git submodule update
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitpull
|
||||
function gitpull -d "git pull and update submodules"
|
||||
git pull --stat --progress
|
||||
git submodule update
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitst
|
||||
function gitst -d "git status"
|
||||
git status $argv | nvimpager
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gittag
|
||||
function gittag -d "git tag"
|
||||
git tag -a $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gittree
|
||||
function gittree -d "git show tree"
|
||||
git log --graph $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function gitw
|
||||
function gitw -d "git web"
|
||||
git instaweb --httpd=webrick $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function grep
|
||||
function grep -d "grep with color"
|
||||
command grep --color $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function l
|
||||
function l -d "list files and show hidden"
|
||||
ls --color -pa $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function less
|
||||
function less -d "pager"
|
||||
nvimpager $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function lg
|
||||
function lg -d "lazygit"
|
||||
lazygit $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function ll
|
||||
function ll -d "list files"
|
||||
ls --color -pla $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function ls
|
||||
function ls -d "list files"
|
||||
command ls --color -p $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function lzd
|
||||
function lzd -d "lazydocker"
|
||||
lazydocker $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function make
|
||||
function make -d "make tool"
|
||||
colormake $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function more
|
||||
function more -d "pager"
|
||||
nvimpager $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function mpc
|
||||
function mpc -d "Music Player Client"
|
||||
command mpc -f "%title%[ - %album%]\n\r%artist%[ - %performer%]\n\r%file%" $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function nvim
|
||||
command nvim -p $argv
|
||||
end
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function pip-upgrade-venv
|
||||
function pip-upgrade-venv -d "Upgrade virtualenv"
|
||||
pip freeze | cut -d'=' -f1 | xargs -n1 pip install -U
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function pip-upgrade
|
||||
function pip-upgrade -d "Upgrade python user-installed packaged"
|
||||
pip freeze --user | cut -d'=' -f1 | xargs -n1 pip install -U --user
|
||||
end
|
||||
|
|
6
common/.config/fish/functions/txor.fish
Executable file
6
common/.config/fish/functions/txor.fish
Executable file
|
@ -0,0 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function txor -d "Tmuxinator"
|
||||
tmuxinator $argv
|
||||
end
|
|
@ -176,6 +176,7 @@ function update-homes -d "Update homes configuration"
|
|||
rm -rf ~/.config/nvim
|
||||
rm -rf ~/.config/poezio
|
||||
rm -rf ~/.config/tmux
|
||||
rm -rf ~/.config/tmuxinator
|
||||
rm -rf ~/.config/toot
|
||||
rm -rf ~/.config/vdirsyncer
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function vim
|
||||
function vim -d "Launch IDE"
|
||||
lvim -p $argv
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env fish
|
||||
#
|
||||
|
||||
function vimdiff
|
||||
function vimdiff -d "Launch IDE in diff mode"
|
||||
lvim -d -o $argv
|
||||
end
|
||||
|
|
67
common/.config/nvimpager/init.lua
Normal file
67
common/.config/nvimpager/init.lua
Normal file
|
@ -0,0 +1,67 @@
|
|||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup({
|
||||
{
|
||||
"EdenEast/nightfox.nvim",
|
||||
lazy=false,
|
||||
priority=1000
|
||||
},
|
||||
{"salkin-mada/openscad.nvim", event="BufRead"},
|
||||
{"ChiliConSql/neovim-stylus", event="BufRead"},
|
||||
{"digitaltoad/vim-pug", event="BufRead"},
|
||||
{"pirmd/gemini.vim", event="BufRead"},
|
||||
{"dpelle/vim-Grammalecte"},
|
||||
{"vigoux/LanguageTool.nvim"},
|
||||
{"chaimleib/vim-renpy", event="BufRead"}
|
||||
})
|
||||
|
||||
vim.opt.clipboard = 'unnamedplus'
|
||||
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.softtabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.expandtab = true
|
||||
|
||||
vim.opt.number = false
|
||||
vim.opt.cursorline = true
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.showmode = false
|
||||
vim.opt.textwidth=78
|
||||
vim.opt.colorcolumn = "29,30,71,72,79,80,119,120,139,140"
|
||||
|
||||
vim.opt.incsearch = true
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.ignorecase = true
|
||||
vim.opt.smartcase = true
|
||||
|
||||
vim.opt.fdm = 'indent'
|
||||
vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '␐', precedes= '␑', trail = '˽', nbsp = '⎵' }
|
||||
vim.opt.list = true
|
||||
|
||||
vim.opt.spelllang = 'fr'
|
||||
vim.g.grammalecte_cli_py = '/usr/bin/grammalecte-cli'
|
||||
vim.g.languagetool_jar = '~/.bin/languagetool-commandline.jar'
|
||||
|
||||
opts = {noremap=true, silent=true}
|
||||
vim.keymap.set('n', '<tab>', "gt", opts)
|
||||
vim.keymap.set('n', '<S-tab>', "gT", opts)
|
||||
vim.keymap.set('v', 'gl', ":'<,'>!lou_translate en-us-brf.dis,fr-bfu-comp6.utb,braille-patterns.cti<CR>", opts)
|
||||
vim.keymap.set('v', 'gL', ":'<,'>!lou_translate --backward en-us-brf.dis,fr-bfu-comp6.utb,braille-patterns.cti<CR>", opts)
|
||||
|
||||
vim.cmd 'colorscheme nightfox'
|
||||
vim.transparent_window = true
|
||||
|
||||
vim.cmd 'highlight Normal ctermbg=none guibg=none'
|
11
desktop/.config/tmuxinator/chat.yml
Normal file
11
desktop/.config/tmuxinator/chat.yml
Normal file
|
@ -0,0 +1,11 @@
|
|||
name: chat
|
||||
|
||||
windows:
|
||||
- news: TERM=xterm-256color newsboat
|
||||
- xmpp: TERM=xterm-256color poezio
|
||||
- mail1: aerc
|
||||
- mail2: neomutt
|
||||
- toot: toot tui
|
||||
- cal: ikhal
|
||||
- music: pms
|
||||
- other:
|
21
desktop/.local/share/konsole/Profile 1.profile
Normal file
21
desktop/.local/share/konsole/Profile 1.profile
Normal file
|
@ -0,0 +1,21 @@
|
|||
[Appearance]
|
||||
ColorScheme=nightfox_konsole
|
||||
Font=Hack,48,-1,5,50,0,0,0,0,0
|
||||
|
||||
[Cursor Options]
|
||||
CustomCursorColor=255,255,0
|
||||
UseCustomCursorColor=true
|
||||
|
||||
[General]
|
||||
Name=Profile 1
|
||||
Environment=TERM=konsole-direct,COLORTERM=truecolor
|
||||
Parent=FALLBACK/
|
||||
TerminalColumns=61
|
||||
TerminalRows=16
|
||||
|
||||
[Scrolling]
|
||||
HistoryMode=2
|
||||
ScrollBarPosition=2
|
||||
|
||||
[Terminal Features]
|
||||
BlinkingCursorEnabled=true
|
24
tmuxinator.fish
Normal file
24
tmuxinator.fish
Normal file
|
@ -0,0 +1,24 @@
|
|||
function __fish_tmuxinator_using_command
|
||||
set cmd (commandline -opc)
|
||||
if [ (count $cmd) -gt 1 ]
|
||||
if [ $argv[1] = $cmd[2] ]
|
||||
return 0
|
||||
end
|
||||
end
|
||||
return 1
|
||||
end
|
||||
|
||||
set __fish_tmuxinator_program_cmd (commandline -o)[1]
|
||||
|
||||
function __fish_tmuxinator_program
|
||||
eval "$__fish_tmuxinator_program_cmd $argv"
|
||||
end
|
||||
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -a '(__fish_tmuxinator_program completions start)'
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_use_subcommand' -x -a "(__fish_tmuxinator_program commands)"
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command start' -a "(__fish_tmuxinator_program completions start)"
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command open' -a "(__fish_tmuxinator_program completions open)"
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command copy' -a "(__fish_tmuxinator_program completions copy)"
|
||||
complete -f -c $__fish_tmuxinator_program_cmd -n '__fish_tmuxinator_using_command delete' -a "(__fish_tmuxinator_program completions delete)"
|
||||
|
||||
abbr --add mux "tmuxinator"
|
Loading…
Reference in a new issue