Fix, Delete and Add

- Fix nvim config
- Add scripts
- Add power setting
- Add swayidle config
- Add template system
- Clean sway config
This commit is contained in:
linarphy 2023-08-18 03:43:52 +02:00
parent 7594c06095
commit 05d466adf8
No known key found for this signature in database
GPG key ID: B914FF3FE69AA363
27 changed files with 348 additions and 17 deletions

View file

@ -0,0 +1,26 @@
{
"workspace.library": [
"/home/linarphy/.config/nvim",
"/etc/xdg/nvim",
"/home/linarphy/.local/share/nvim/site",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/fzf",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/fzf-lua",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/gv.vim",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/monokai.nvim",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-fzf",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/packer.nvim",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/vim-easy-align",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/vim-fugitive",
"/home/linarphy/.local/share/nvim/site/pack/packer/start/vim-peekaboo",
"/usr/share/nvim/site",
"/usr/share/nvim/site/pack/packer/start/packer.nvim",
"/usr/share/nvim/runtime",
"/usr/lib/nvim",
"/usr/share/vim/vimfiles",
"${3rd}/luassert/library"
]
}

View file

@ -1,7 +1,7 @@
--[[ --[[
Loads maintenance and configuration change linked mapping Loads maintenance and configuration change linked mapping
--]] --]]
local vimrc = 'C:\\Users\\DELL\\AppData\\Local\\nvim\\init.lua' -- path to local vimrc = '~/.config/nvim/init.lua' -- path to
-- init.lua /!\ to change for each OS /!\ -- init.lua /!\ to change for each OS /!\
vim.keymap.set('n', '<Leader>ie', ':tabedit ' .. vimrc .. '<CR>') -- edit it vim.keymap.set('n', '<Leader>ie', ':tabedit ' .. vimrc .. '<CR>') -- edit it

View file

@ -0,0 +1,10 @@
--[[
Loads settings for fzf-lua plugin
This file only loads others
To have a full display of the configuration structure, see the root
init.lua
--]]
require('plugins.fzf-lua.mapping') -- load key shortcut

View file

@ -0,0 +1,24 @@
--[[
Loads key shortcut for the fzf-lua plugin
--]]
vim.keymap.set(
'n' ,
'<Leader>fr' ,
'<cmd>lua require(\'fzf-lua\').oldfiles()<CR>',
{ silent = true }
) -- search in recent files
vim.keymap.set(
'n' ,
'<Leader>ff' ,
'<cmd>lua require(\'fzf-lua\').files()<CR>',
{ silent = true }
) -- search in files in path
vim.keymap.set(
'n' ,
'<Leader>fw' ,
'<cmd>lua require(\'fzf-lua\').grep()<CR>',
{ silent = true }
) -- search for a word

View file

@ -10,9 +10,11 @@ require('plugins.loader') -- install and load plugins and plugins settings
require('plugins.vim-easy-align') -- settings for vim-easy-align plugin require('plugins.vim-easy-align') -- settings for vim-easy-align plugin
require('plugins.dashboard-nvim') -- settings for dashboard-nvim plugin require('plugins.fzf-lua') -- settings for fzf-lua plugin
require('plugins.indent-blankline') -- settings for indeent-blankline require('plugins.indent-blankline') -- settings for indeent-blankline
--settings --settings
require('plugins.nvim-treesitter') -- setting for nvim-treesitter plugin require('plugins.nvim-treesitter') -- setting for nvim-treesitter plugin
require('plugins.nvim-lspconfig') -- setting for nvim-lspconfig plugin

View file

@ -13,15 +13,93 @@ return require('packer').startup(function(use)
use 'vijaymarupudi/nvim-fzf' -- link between lua and fzf use 'vijaymarupudi/nvim-fzf' -- link between lua and fzf
use { 'ibhagwan/fzf-lua', -- fzf.vim replacement with lua (only for use {
'ibhagwan/fzf-lua', -- fzf.vim replacement with lua (only for
--linux) --linux)
-- optional for icon support -- optional for icon support
requires = { 'nvim-tree/nvim-web-devicons' } requires = { 'nvim-tree/nvim-web-devicons' }
} }
use 'neovim/nvim-lspconfig' -- Language Server Protocol easy configuration
use 'tpope/vim-fugitive' -- Git plugin use 'tpope/vim-fugitive' -- Git plugin
use 'glepnir/dashboard-nvim' -- dashboard use {
'glepnir/dashboard-nvim', -- dashboard
event = 'VimEnter',
config = function()
require('dashboard').setup {
theme = 'doom',
config = {
header = {
'',
'MMMMMMMMMWkdXMMMMMMMMMMMMMWXOd:\'.. ..\':oOXWMMMMMMMMMMMMMNxkWMMMMMMMMM',
'MMMMMMMMMWo.;kNMMMMMMMMNOd:\'. .\':oONMMMMMMMMWO:.lWMMMMMMMMM',
'MMMMMMMMMWo ;kNMMMNkc\' \'ckXMMMWO:. lWMMMMMMMMM',
'MMMMMMMMMWo .;kKd\' \'oKO:. lWMMMMMMMMM',
'MMMMMMMMMWo .xO:. :Ox\' lWMMMMMMMMM',
'MMMMMMMMMWo .oKWMNk;. ;kNMMXd\' lWMMMMMMMMM',
'MMMMMMMMMWo..oKWMMMMMNk;. ;kNMMMMMMXd\'.lWMMMMMMMMM',
'MMMMMMMMMWOdKWMMMMMMMMMNk;. ;kNMMMMMMMMMWXxOWMMMMMMMMM',
'MMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMM',
'MMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMM',
'MMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMM',
'MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM',
'MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. .;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM',
'XWMMMMMMMW0doooooooooooooooooooooooddddooooooooooooooooooooooooo0WMMMMMMMMX',
',oKWMMMMMWd. ;kNMNk; oWMMMMMMXo\'',
'. .oKWMMMMk. ;kNMMMMMNk; .kMMMMMXd\' ',
'\' .oXWMMX; ;kNMMMMMMMMMNk; ;KMMWXd\' .',
'c .oXWWx. ;kNMMMMMMMMMMMMMNk; .xWWXd\' :',
'O. .oXNo ;kNMMMMMMMMMMMMMMMMMNk; lXXd\' .k',
'No .oOc ;kNMMMMMMMMMMMMMMMMMMMMMNk; cOd\' lN',
'MX: \'c;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMNk; .;c\' ;KM',
'MM0; ... ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; ... ,0MM',
'MMM0; .:kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk:. ,0MMM',
'MMMMKc ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; :KMMMM',
'MMMMMNd. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; .oXMMMMM',
'MMMMMMW0:. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; ;OWMMMMMM',
'MMMMMMMMNl\'lXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMXl\'lXMMMMMMMM',
'',
},
center = {
{
icon = '' ,
desc = 'Fichiers récents',
key = 'o',
keymap = ', f r',
action = 'lua require(\'fzf-lua\').oldfiles()',
},
{
icon = '',
desc = 'Rechercher un fichier',
key = 'r',
keymap = ', f f',
action = 'lua require(\'fzf-lua\').files()',
},
{
icon = '',
desc = 'Rechercher un mot',
key = 'm',
keymap = ', f w',
action = 'lua require(\'fzf-lua\').grep()',
},
{
icon = '',
desc = 'Ouvrir des fichiers de configuration',
key = 'c',
keymap = ', i e',
action = 'lua vim.cmd( \'e ~/.config/nvim/init.lua\')',
},
},
footer = {}
}
}
end,
requires = {
'nvim-tree/nvim-web-devicons'
}
}
use 'lukas-reineke/indent-blankline.nvim' -- add indentation guides use 'lukas-reineke/indent-blankline.nvim' -- add indentation guides
--to all lines --to all lines

View file

@ -0,0 +1,10 @@
--[[
Loads settings for nvim-lspconfig
This file only loads others
To have a full display of the configuration structure, see the root
init.lua
--]]
require('plugins.nvim-lspconfig.lua_config')

View file

@ -0,0 +1,26 @@
--[[
Load server configuration for lua lsp
--]]
require'lspconfig'.lua_ls.setup {
settings = {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT',
},
diagnostics = {
-- Get the language server to recognize the `vim` global
globals = {'vim'},
},
workspace = {
-- Make the server aware of Neovim runtime files
library = vim.api.nvim_get_runtime_file("", true),
},
-- Do not send telemetry data containing a randomized but unique identifier
telemetry = {
enable = false,
},
},
},
}

View file

@ -75,8 +75,11 @@ time([[try_loadstring definition]], false)
time([[Defining packer_plugins]], true) time([[Defining packer_plugins]], true)
_G.packer_plugins = { _G.packer_plugins = {
["dashboard-nvim"] = { ["dashboard-nvim"] = {
loaded = true, config = { "\27LJ\2\nË\20\0\0\6\0\14\0\0236\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\5\0005\4\4\0=\4\6\0034\4\5\0005\5\a\0>\5\1\0045\5\b\0>\5\2\0045\5\t\0>\5\3\0045\5\n\0>\5\4\4=\4\v\0034\4\0\0=\4\f\3=\3\r\2B\0\2\1K\0\1\0\vconfig\vfooter\vcenter\1\0\5\tdesc)Ouvrir des fichiers de configuration\ticon\t \vaction.lua vim.cmd( 'e ~/.config/nvim/init.lua')\vkeymap\n, i e\bkey\6c\1\0\5\tdesc\22Rechercher un mot\ticon\tî­¾ \vaction\"lua require('fzf-lua').grep()\vkeymap\n, f w\bkey\6m\1\0\5\tdesc\26Rechercher un fichier\ticon\tî©» \vaction#lua require('fzf-lua').files()\vkeymap\n, f f\bkey\6r\1\0\5\tdesc\22Fichiers récents\ticon\n \vaction&lua require('fzf-lua').oldfiles()\vkeymap\n, f r\bkey\6o\vheader\1\0\0\1\30\0\0\5PMMMMMMMMMWkdXMMMMMMMMMMMMMWXOd:'.. ..':oOXWMMMMMMMMMMMMMNxkWMMMMMMMMMPMMMMMMMMMWo.;kNMMMMMMMMNOd:'. .':oONMMMMMMMMWO:.lWMMMMMMMMMPMMMMMMMMMWo ;kNMMMNkc' 'ckXMMMWO:. lWMMMMMMMMMPMMMMMMMMMWo .;kKd' 'oKO:. lWMMMMMMMMMPMMMMMMMMMWo .xO:. :Ox' lWMMMMMMMMMPMMMMMMMMMWo .oKWMNk;. ;kNMMXd' lWMMMMMMMMMPMMMMMMMMMWo..oKWMMMMMNk;. ;kNMMMMMMXd'.lWMMMMMMMMMPMMMMMMMMMWOdKWMMMMMMMMMNk;. ;kNMMMMMMMMMWXxOWMMMMMMMMMPMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMPMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMPMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMPMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMPMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk;. .;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMPXWMMMMMMMW0doooooooooooooooooooooooddddooooooooooooooooooooooooo0WMMMMMMMMXP,oKWMMMMMWd. ;kNMNk; oWMMMMMMXo'P. .oKWMMMMk. ;kNMMMMMNk; .kMMMMMXd' P' .oXWMMX; ;kNMMMMMMMMMNk; ;KMMWXd' .Pc .oXWWx. ;kNMMMMMMMMMMMMMNk; .xWWXd' :PO. .oXNo ;kNMMMMMMMMMMMMMMMMMNk; lXXd' .kPNo .oOc ;kNMMMMMMMMMMMMMMMMMMMMMNk; cOd' lNPMX: 'c;. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMNk; .;c' ;KMPMM0; ... ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; ... ,0MMPMMM0; .:kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk:. ,0MMMPMMMMKc ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; :KMMMMPMMMMMNd. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; .oXMMMMMPMMMMMMW0:. ;kNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNk; ;OWMMMMMMPMMMMMMMMNl'lXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMXl'lXMMMMMMMM\5\1\0\1\ntheme\tdoom\nsetup\14dashboard\frequire\0" },
path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/dashboard-nvim", loaded = false,
needs_bufread = false,
only_cond = false,
path = "/home/linarphy/.local/share/nvim/site/pack/packer/opt/dashboard-nvim",
url = "https://github.com/glepnir/dashboard-nvim" url = "https://github.com/glepnir/dashboard-nvim"
}, },
fzf = { fzf = {
@ -109,6 +112,11 @@ _G.packer_plugins = {
path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-fzf", path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-fzf",
url = "https://github.com/vijaymarupudi/nvim-fzf" url = "https://github.com/vijaymarupudi/nvim-fzf"
}, },
["nvim-lspconfig"] = {
loaded = true,
path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
url = "https://github.com/neovim/nvim-lspconfig"
},
["nvim-treesitter"] = { ["nvim-treesitter"] = {
loaded = true, loaded = true,
path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-treesitter", path = "/home/linarphy/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
@ -142,6 +150,13 @@ _G.packer_plugins = {
} }
time([[Defining packer_plugins]], false) time([[Defining packer_plugins]], false)
vim.cmd [[augroup packer_load_aucmds]]
vim.cmd [[au!]]
-- Event lazy-loads
time([[Defining lazy-load event autocommands]], true)
vim.cmd [[au VimEnter * ++once lua require("packer.load")({'dashboard-nvim'}, { event = "VimEnter *" }, _G.packer_plugins)]]
time([[Defining lazy-load event autocommands]], false)
vim.cmd("augroup END")
_G._packer.inside_compile = false _G._packer.inside_compile = false
if _G._packer.needs_bufread == true then if _G._packer.needs_bufread == true then

View file

@ -0,0 +1,3 @@
#! /bin/sh
exec cliphist list | fzf | cliphist decode | wl-copy

View file

@ -0,0 +1,3 @@
#! /bin/sh
cliphist list | fzf | cliphist delete

View file

@ -0,0 +1,3 @@
#!/bin/sh
exec swaymsg -q "exec --no-startup-id $(compgen -c | fzf )"

View file

@ -0,0 +1,9 @@
#! /bin/bash
string="$1"
while read from to; do
string="${string//\$\{$from\}/$to}"
done < "$2"
tee $3 <<<"$string"

View file

@ -1,8 +1,18 @@
#! /bin/sh #! /bin/sh
awk '{print "set $"$1, $2}' ~/.config/settings/colors.conf | tee ~/.config/sway/config.d/display/colors.conf # sway
~/.config/scripts/sway_set ~/.config/settings/colors.conf | tee ~/.config/sway/config.d/display/colors.conf
~/.config/scripts/sway_set ~/.config/settings/power.conf | tee ~/.config/swayidle/config.d/general/var.conf
# swayidle
.config/scripts/fill_template "$(cat .config/swayidle/template)" .config/settings/power.conf .config/swayidle/config
# swaylock
.config/scripts/fill_template "$(cat .config/swaylock/template)" .config/settings/colors.conf .config/swaylock/config
# alacritty
echo "[colors] echo "[colors]
[colors.primary] [colors.primary]
background = \"$(grep dark_main ~/.config/settings/colors.conf | cut -d ' ' -f 2)\" background = \"$(~/.config/scripts/get_color dark main)\"
foreground = \"$(grep light_main ~/.config/settings/colors.conf | cut -d ' ' -f 2 )\"" | tee ~/.config/alacritty/colors.toml foreground = \"$(~/.config/scripts/get_color light main)\"" | tee ~/.config/alacritty/colors.toml

View file

@ -0,0 +1,3 @@
#! /bin/sh
awk '/^[^#]/ {print "set $"$1, $2}' $1 | tee $2

View file

@ -0,0 +1,11 @@
# Power settings configuration
# every time is in second
# time before minimum brightness
idle 300
# time before locking screen
lock 400
# time before turning off the display
screen 500
# time before sleep
sleep 900

View file

@ -0,0 +1,12 @@
# General display config
# GTK config
set $schema "org.gnome.desktop.interface"
exec_always {
gsettings set $schema gtk-theme Breeze
gsettings set $schema icon-theme breeze_dark
gsettings set $schema cursor-theme breeze_cursors
gsettings set $schema gtk-application-prefer-dark-theme true
}

View file

@ -11,3 +11,7 @@ font pango:monospace 0
titlebar_border_thickness 0 titlebar_border_thickness 0
gaps inner 5 gaps inner 5
for_window [app_id="org.keepassxc.KeePassXC"] floating enable
for_window [title="menu"] floating enable
for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable

View file

@ -1,5 +1,5 @@
# Launch command at start # Launch command at start
exec keepassxc exec keepassxc
exec copyq
exec nextcloud exec nextcloud
exec $clipboard

View file

@ -5,7 +5,7 @@ set $mod Mod4
# Variant key to change effect of a shorctut # Variant key to change effect of a shorctut
set $variant Shift set $variant Shift
set $left l set $left h
set $right h set $right l
set $top k set $top k
set $down j set $down j

View file

@ -7,10 +7,18 @@ bindsym $mod+Return exec $terminal
bindsym $mod+$variant+q kill bindsym $mod+$variant+q kill
# start app launcher # start app launcher
bindsym $mod+d exec $menu bindsym $mod+d exec $app_menu
# start browsing clipboard history
bindsym $mod+c exec $clip_menu
bindsym $mod+$variant+y exec $clip_del
# reload configuration file # reload configuration file
bindsym $mod+$variant+c reload bindsym $mod+$variant+c reload
# exit sway # exit sway
bindsym $mod+$variant+e exec swaynag -t warning -m 'Voulez-vous vraiment quitter sway? Cela arrêtera votre session Wayland.' -B 'Oui, quitter sway' 'swaymsg exit' bindsym $mod+$variant+e exec swaynag -t warning -m 'Voulez-vous vraiment quitter sway? Cela arrêtera votre session Wayland.' -B 'Oui, quitter sway' 'swaymsg exit'
# lock screen
bindsym $mod+g exec $lock

View file

@ -2,6 +2,14 @@
set $terminal alacritty set $terminal alacritty
set $list fzf set $small_term $terminal --config-file ~/.config/alacritty/small.toml -e
set $menu dmenu_path | dmenu | xargs swaymsg exec -- set $app_menu $small_term ~/.config/scripts/dmenu-fzf
set $clip_menu $small_term ~/.config/scripts/dmenu-clip
set $clip_del $small_term ~/.config/scripts/dmenu-clip-del
set $clipboard wl-paste --watch cliphist store
set $lock swaylock

View file

@ -0,0 +1,13 @@
# Swayidle configuration
timeout 300 'light -O && light -S $(light -P)' resume 'light -I'
timeout 400 'exec swaylock'
timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
timeout 900 'swaymsg "output * dpms on"; systemctl suspend'
before-sleep 'playerctl pause'
before-sleep 'exec swaylock'

View file

@ -0,0 +1,13 @@
# Swayidle configuration
timeout ${idle} 'light -O && light -S $(light -P)' resume 'light -I'
timeout ${lock} 'exec swaylock'
timeout ${screen} 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
timeout ${sleep} 'swaymsg "output * dpms on"; systemctl suspend'
before-sleep 'playerctl pause'
before-sleep 'exec swaylock'

View file

@ -0,0 +1,20 @@
# Swaylock configuration
text-color=#E9E8E8
color=#20262E
inside-color=#20262E
inside-clear-color=#913175
ring-clear-color=#E9E8E8
text-clear-color=#20262E
inside-ver-color=${ligh_main}
ring-ver-color=#913175
text-ver-color=#20262E
ring-color=#CD5888
key-hl-color=#E9E8E8
line-uses-inside
show-failed-attempts
ignore-empty-password

View file

@ -0,0 +1,20 @@
# Swaylock configuration
text-color=${light_main}
color=${dark_main}
inside-color=${dark_main}
inside-clear-color=${dark_accent}
ring-clear-color=${light_main}
text-clear-color=${dark_main}
inside-ver-color=${ligh_main}
ring-ver-color=${dark_accent}
text-ver-color=${dark_main}
ring-color=${light_accent}
key-hl-color=${light_main}
line-uses-inside
show-failed-attempts
ignore-empty-password