From 34346743e33328ba51b5d952ca67026f60ceaabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sat, 8 Jan 2022 16:34:39 +0100 Subject: [PATCH] heeee --- .../host_vars/curacao.geoffrey.frogeye.fr | 8 ++++++-- .../roles/vim/templates/plugins/feline.j2 | 10 +++++----- .../roles/vim/templates/plugins/telescope.j2 | 14 +++++++++++++- config/shell/shrc | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr b/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr index abdf287..4b2fadf 100644 --- a/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr +++ b/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr @@ -15,6 +15,10 @@ extensions: - g - gh x11_screens: - - HDMI-0 - - eDP-1-1 +# nvidia + # - HDMI-0 + # - eDP-1-1 +# nouveau + - HDMI-1-3 + - eDP1 max_video_height: 1440 diff --git a/config/automatrop/roles/vim/templates/plugins/feline.j2 b/config/automatrop/roles/vim/templates/plugins/feline.j2 index 58799e8..aa49c02 100644 --- a/config/automatrop/roles/vim/templates/plugins/feline.j2 +++ b/config/automatrop/roles/vim/templates/plugins/feline.j2 @@ -9,7 +9,7 @@ local lsp = require('feline.providers.lsp') require('feline').setup({ default_bg = 'base01', default_fg = 'base04', - colors = { + theme = { base00 = base16_colors.base00, base01 = base16_colors.base01, base02 = base16_colors.base02, @@ -109,25 +109,25 @@ require('feline').setup({ }, { provider = 'diagnostic_errors', - enabled = function() return lsp.diagnostics_exist('Error') end, + enabled = function() return lsp.diagnostics_exist(vim.diagnostic.severity.ERROR) end, hl = { fg = 'red', bg = 'base03', }, left_sep = '█', }, { provider = 'diagnostic_warnings', - enabled = function() return lsp.diagnostics_exist('Warning') end, + enabled = function() return lsp.diagnostics_exist(vim.diagnostic.severity.WARN) end, hl = { fg = 'yellow', bg = 'base03', }, left_sep = '█', }, { provider = 'diagnostic_hints', - enabled = function() return lsp.diagnostics_exist('Hint') end, + enabled = function() return lsp.diagnostics_exist(vim.diagnostic.severity.HINT) end, hl = { fg = 'cyan', bg = 'base03', }, left_sep = '█', }, { provider = 'diagnostic_info', - enabled = function() return lsp.diagnostics_exist('Information') end, + enabled = function() return lsp.diagnostics_exist(vim.diagnostic.severity.INFO) end, hl = { fg = 'skyblue', bg = 'base03', }, left_sep = '█', }, diff --git a/config/automatrop/roles/vim/templates/plugins/telescope.j2 b/config/automatrop/roles/vim/templates/plugins/telescope.j2 index 9caa37b..ef9eadc 100644 --- a/config/automatrop/roles/vim/templates/plugins/telescope.j2 +++ b/config/automatrop/roles/vim/templates/plugins/telescope.j2 @@ -2,6 +2,8 @@ {# Dependencies #} {{ add_source('nvim-lua/popup.nvim') -}} {{ add_source('nvim-lua/plenary.nvim') -}} +{# Extensions #} +{{ add_source('nvim-telescope/telescope-fzf-native.nvim', {'do': 'make'}) -}} noremap gF Telescope find_files noremap gf Telescope git_files @@ -14,7 +16,7 @@ noremap gm Telescope marks noremap gh Telescope oldfiles noremap gH Telescope command_history noremap gS Telescope search_history -noremap gc Telescope commands +noremap gC Telescope commands noremap gr Telescope lsp_references noremap ga Telescope lsp_code_actions vnoremap ga Telescope lsp_range_code_actions @@ -34,6 +36,16 @@ require('telescope').setup{ '--column', '--smart-case' }, + }, + extensions = { + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + } } } +require('telescope').load_extension('fzf') EOF diff --git a/config/shell/shrc b/config/shell/shrc index b405670..e0bc1dd 100644 --- a/config/shell/shrc +++ b/config/shell/shrc @@ -33,7 +33,7 @@ alias la="ls -la" alias s='sudo -s -E' alias n='alacritty & disown' alias x='startx $HOME/.config/xinitrc; logout' -alias nx='nvidia-xrun $HOME/.config/xinitrc; logout' +alias nx='nvidia-xrun $HOME/.config/xinitrc; sudo systemctl start nvidia-xrun-pm; logout' # For programs that think $HOME is a reasonable place to put their junk # and don't allow the user to change those questionable choices