Merge branch 'main' of git_opytex:lafrite/dotfiles

.gitignore

@@ -5,3 +5,4 @@ vifm/.config/vifm/vifm-help.txt
 vifm/.config/vifm/vifminfo.json
 
 nvim/.config/nvim/autoload
+nvim/.config/nvim/plugin

X/.Xdefaults

@@ -0,0 +1,100 @@
+!*.font: xft:monospace:size=9
+! URxvt*font: xft:Ubuntu Mono derivative Powerline:size=9
+! URxvt*font: xft:Hack Nerd Font:pixelsize=12,xft:UbuntuMono Nerd Font:pixelsize=12
+URxvt*font: xft:DroidSansMono Nerd Font Mono:pixelsize=14,xft:UbuntuMono Nerd Font:pixelsize=12
+URxvt*letterSpace: -1
+! URxvt*font: xft:Ubuntu Mono derivative Powerline:pixelsize=14,xft:Droid Sans Mono for Powerline:pixelsize=14,xft:DejaVu Sans Mono:pixelsize=14,xft:Droid Sans Fallback:pixelsize=14,xft:FreeSans:pixelsize=14,xft:FreeSans:pixelsize=14
+URxvt*scrollBar:        false
+
+URxvt.perl-ext-common: default,fullscreen,resize-font
+! fullscreen with F11
+URxvt.keysym.F11: perl:fullscreen:switch
+
+! `font-size` plugin
+URxvt.resize-font.smaller: C-Down
+URxvt.resize-font.bigger: C-Up
+
+
+! ! URxvt.foreground: #f6f3e8
+! ! URxvt.background: #242424
+! ! URxvt.cursorColor: #f6f3e8
+! *.foreground:   #fcfae1
+! *.background:   #404040
+! *.cursorColor:  #f595a7
+! *.color0:       #404040
+! *.color8:       #262626
+! *.color1:       #b9454b
+! *.color9:       #e75252
+! *.color2:       #bd8d46
+! *.color10:      #dea552
+! *.color3:       #f6e497
+! *.color11:      #d1c180
+! *.color4:       #f595a7
+! *.color12:      #d1a5ad
+! *.color5:       #d28e2a
+! *.color13:      #b47a24
+! *.color6:       #ebcd4f
+! *.color14:      #b9a659
+! *.color7:       #fcfae1
+! *.color15:      #f3f2e7
+! 
+!  
+! ! ! ANSI colours
+! ! ! black
+! ! URxvt.color0:               #073642
+! ! URxvt.color8:               #002636
+! ! ! red
+! ! URxvt.color1:               #dc322f
+! ! URxvt.color9:               #cb4b16
+! ! ! green
+! ! URxvt.color2:               #859900
+! ! URxvt.color10:              #586e75
+! ! ! yellow
+! ! URxvt.color3:               #b58900
+! ! URxvt.color11:              #657b83
+! ! ! blue
+! ! URxvt.color4:               #268bd2
+! ! URxvt.color12:              #839496
+! ! ! magenta
+! ! URxvt.color5:               #d33682
+! ! URxvt.color13:              #6c71c4
+! ! ! cyan
+! ! URxvt.color6:               #2aa198
+! ! URxvt.color14:              #93a1a1
+! ! ! white
+! ! URxvt.color7:               #eee8d5
+! ! URxvt.color15:              #fdf6e3
+! 
+! ! Colored man
+! URxvt.colorIT:      #87af5f
+! URxvt.colorBD:      #d7d7d7
+! URxvt.colorUL:      #87afd7
+
+! hard contrast: *background: #1d2021
+*background: #282828
+! soft contrast: *background: #32302f
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0:  #282828
+*color8:  #928374
+! DarkRed + Red
+*color1:  #cc241d
+*color9:  #fb4934
+! DarkGreen + Green
+*color2:  #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3:  #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4:  #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5:  #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6:  #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7:  #a89984
+*color15: #ebdbb2

nvim/.config/nvim/lua/completion.lua

@@ -41,7 +41,7 @@ local lsp_symbols = {
 local cmp = require'cmp'
 cmp.setup{
     completion = {
-        completeopt =  "menuone,noinsert,noselect",
+        completeopt =  'menuone,noselect',
     },
     formatting = {
         format = function(entry, vim_item)
@@ -86,9 +86,9 @@ cmp.setup{
             end
         end, { "i", "s" }),
     },
-    source = {
-        { name = 'buffer' },
+    sources = {
         { name = 'vsnip' },
+        { name = 'buffer' },
         { name = 'path' },
         { name = 'spell' },
     }

nvim/.config/nvim/lua/lsp.lua

@@ -51,7 +51,7 @@ for _, lsp in ipairs(servers) do
     on_attach = on_attach,
     flags = {
       debounce_text_changes = 150,
-    }
+    },
   }
 end
 

nvim/.config/nvim/lua/lualine_.lua

@@ -0,0 +1,31 @@
+require('lualine').setup{
+	options = {
+		icons_enabled = true,
+		theme = 'gruvbox',
+		component_separators = {'', ''},
+		section_separators = {'', ''},
+		disabled_filetypes = {}
+	},
+	sections = {
+		lualine_a = {'mode'},
+		lualine_b = {'branch'},
+		lualine_c = {'filename'},
+		lualine_x = {
+			{ 'diagnostics', sources = {"nvim_lsp"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} },
+			'encoding',
+			'filetype'
+		},
+		lualine_y = {'progress'},
+		lualine_z = {'location'}
+	},
+	inactive_sections = {
+		lualine_a = {},
+		lualine_b = {},
+		lualine_c = {'filename'},
+		lualine_x = {'location'},
+		lualine_y = {},
+		lualine_z = {}
+	},
+	tabline = {},
+	extensions = {}
+}

nvim/.config/nvim/lua/mappings.lua

@@ -20,3 +20,4 @@ map('n', '<leader>e', '<cmd>Telescope find_files<cr>', {})
 map('n', '<leader>g', '<cmd>Telescope live_grep<cr>', {})
 map('n', '<leader>b', '<cmd>Telescope buffers<cr>', {})
 map('n', '<leader>h', '<cmd>Telescope help_tags<cr>', {})
+

nvim/.config/nvim/lua/plugins.lua

@@ -48,22 +48,28 @@ return require('packer').startup(function()
     use 'tpope/vim-surround'
     use 'tpope/vim-repeat'
 
-    use 'neovim/nvim-lspconfig'
     use {
-        "hrsh7th/nvim-cmp",
+        'neovim/nvim-lspconfig',
+        requires = {
+            "hrsh7th/cmp-nvim-lsp"
+        }
+    }
+    use {
+        'hrsh7th/nvim-cmp',
         event = 'InsertEnter',
         config = [[require('completion')]],
         requires = {
             -- 'hrsh7th/vim-vsnip-integ',
+            'hrsh7th/vim-vsnip',
             'rafamadriz/friendly-snippets',
         },
     }
-    use {"hrsh7th/vim-vsnip", after = "nvim-cmp"}
-    use {"hrsh7th/cmp-vsnip", after = "nvim-cmp"}
-    use {"hrsh7th/cmp-buffer", after = "nvim-cmp"}
-    use {'hrsh7th/cmp-path', after = "nvim-cmp"}
-    use {"hrsh7th/cmp-nvim-lsp", after = "nvim-cmp"}
-    use {'f3fora/cmp-spell', after = "nvim-cmp"}
+    use {'hrsh7th/cmp-vsnip', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-buffer', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-path', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp'}
+    use {'f3fora/cmp-spell', after = 'nvim-cmp'}
+
 
     use 'nvim-lua/popup.nvim'
     use {

nvim/.config/nvim/lua/settings.lua

@@ -26,7 +26,7 @@ opt.cursorline = true             -- highlight current line
 opt.ignorecase = true             -- Ignore case on search
 opt.smartcase = true             -- ignore lowercse for the whoel pattern
 
--- opt.completeopt = 'menu,noselect,noinsert' -- completion options
+opt.completeopt = 'menuone,noselect,noinsert' -- completion options
 
 opt.spell = true
 opt.spelllang = {'fr', 'en'}