From f8b0256b9e8bfbd1f90e27bb49c5822aec71734b Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Fri, 25 Jun 2021 21:48:00 +0200 Subject: [PATCH 01/23] BATTERY: change battery number --- .profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.profile b/.profile index 078b3b7..fbae8a8 100644 --- a/.profile +++ b/.profile @@ -15,7 +15,7 @@ for term in kitty termite qterminal urxvt rxvt-unicode sakura gnome-terminal; do done # Pour la batterie des ordinateurs portables (~/bin/battery) -#export BATPATH="/sys/class/power_supply/BAT0" +export BATPATH="/sys/class/power_supply/BAT0" # Permit DBUS to be launched if [ "$0" = "/usr/sbin/lightdm-session" -a "$DESKTOP_SESSION" = "i3" ]; then From 0502e6945e799badc33742fded245ccc1c106d5a Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 14 Nov 2024 20:22:07 +0100 Subject: [PATCH 02/23] fix(ZSH): Launch sway by default in ZSH profile --- .config/zsh/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 4e8f538..8028907 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -6,5 +6,5 @@ eval "$(pyenv init --path)" # Start X automatically if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then - exec startx + exec sway fi From 402a0f86ba13ddbea43dcfd1673dfcdb085f77c6 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 14 Nov 2024 23:28:14 +0100 Subject: [PATCH 03/23] feat(Sway): Change HiDPI scale for tom laptop --- .config/sway/config.d/30-visuel.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/sway/config.d/30-visuel.conf b/.config/sway/config.d/30-visuel.conf index 4b51eb6..ab1232a 100644 --- a/.config/sway/config.d/30-visuel.conf +++ b/.config/sway/config.d/30-visuel.conf @@ -14,3 +14,6 @@ titlebar_padding 0 # Enlever le titre aux fenêtres default_border none default_floating_border none + +# Écran HiDPI +output eDP-1 scale 1.6 From 1ac8d8d91ff183e983b4df701dbbfce12d40f4ed Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 20 Nov 2024 20:13:58 +0100 Subject: [PATCH 04/23] fix(Wayland): systemd - add new variables for Electron and QT apps --- .config/environment.d/envvars.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf index 058986d..71a1084 100644 --- a/.config/environment.d/envvars.conf +++ b/.config/environment.d/envvars.conf @@ -2,3 +2,8 @@ MOZ_ENABLE_WAYLAND=1 # Modifie le comportement JAVA pour PHPStorm _JAVA_AWT_WM_NONREPARENTING=1 +# Demandé par les applications QT (notamment Slack) +QT_QPA_PLATFORM=wayland +# Pour les applications utilisant Electron +# Cf. https://www.electronjs.org/docs/latest/api/environment-variables +ELECTRON_OZONE_PLATFORM_HINT=wayland From cb70a715c067d00b983742f401a51bad75811063 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 20 Nov 2024 20:46:50 +0100 Subject: [PATCH 05/23] feat(systemd): env. var. - add some for SDL VIDEO --- .config/environment.d/envvars.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf index 71a1084..de16303 100644 --- a/.config/environment.d/envvars.conf +++ b/.config/environment.d/envvars.conf @@ -7,3 +7,5 @@ QT_QPA_PLATFORM=wayland # Pour les applications utilisant Electron # Cf. https://www.electronjs.org/docs/latest/api/environment-variables ELECTRON_OZONE_PLATFORM_HINT=wayland +# Pour wayland +SDL_VIDEODRIVER=wayland From fe9efd13a828079ed63c752e12d9d9b304b1f83e Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 20 Nov 2024 20:55:43 +0100 Subject: [PATCH 06/23] fix(Sway): Missing variables for gammastep-indicator --- .config/environment.d/envvars.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf index de16303..0d81002 100644 --- a/.config/environment.d/envvars.conf +++ b/.config/environment.d/envvars.conf @@ -9,3 +9,7 @@ QT_QPA_PLATFORM=wayland ELECTRON_OZONE_PLATFORM_HINT=wayland # Pour wayland SDL_VIDEODRIVER=wayland +# Session +export XDG_SESSION_TYPE=wayland +export XDG_SESSION_DESKTOP=sway +export XDG_CURRENT_DESKTOP=sway # for gammastep-indicator From 5aa7592a022be1ec9ac3cda73e3746611fd75fd1 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 20 Nov 2024 22:34:43 +0100 Subject: [PATCH 07/23] chore(screen): Add .icm color for laptop screen --- .color/icc/BOE_CQ_______NE135FBM_N41_03.icc | Bin 0 -> 9932 bytes .config/sway/config.d/30-visuel.conf | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .color/icc/BOE_CQ_______NE135FBM_N41_03.icc diff --git a/.color/icc/BOE_CQ_______NE135FBM_N41_03.icc b/.color/icc/BOE_CQ_______NE135FBM_N41_03.icc new file mode 100644 index 0000000000000000000000000000000000000000..e067230fb68346d9d9c9cdfc6575d97067e9e589 GIT binary patch literal 9932 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 literal 0 HcmV?d00001 diff --git a/.config/sway/config.d/30-visuel.conf b/.config/sway/config.d/30-visuel.conf index ab1232a..5fb32a6 100644 --- a/.config/sway/config.d/30-visuel.conf +++ b/.config/sway/config.d/30-visuel.conf @@ -16,4 +16,6 @@ default_border none default_floating_border none # Écran HiDPI -output eDP-1 scale 1.6 +set $screen_output eDP-1 +output $screen_output scale 1.6 +output $screen_output color_profile icc icc/$screen_output.icm From 05fab7dd81e8d34251d2e96e6ee8ddaf77dfd022 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 20 Nov 2024 22:51:37 +0100 Subject: [PATCH 08/23] fix(battery): Use correct battery name ; BAT1 --- .profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.profile b/.profile index fbae8a8..41286cb 100644 --- a/.profile +++ b/.profile @@ -15,7 +15,7 @@ for term in kitty termite qterminal urxvt rxvt-unicode sakura gnome-terminal; do done # Pour la batterie des ordinateurs portables (~/bin/battery) -export BATPATH="/sys/class/power_supply/BAT0" +export BATPATH="/sys/class/power_supply/BAT1" # Permit DBUS to be launched if [ "$0" = "/usr/sbin/lightdm-session" -a "$DESKTOP_SESSION" = "i3" ]; then From e12aeb390364f69e4b97f8268039fe05fa9194c8 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Sun, 29 Dec 2024 15:24:38 +0100 Subject: [PATCH 09/23] fix(sway): icc - directory missing. Add it. --- .config/sway/icc/eDP-1.icm | 1 + 1 file changed, 1 insertion(+) create mode 120000 .config/sway/icc/eDP-1.icm diff --git a/.config/sway/icc/eDP-1.icm b/.config/sway/icc/eDP-1.icm new file mode 120000 index 0000000..0f33076 --- /dev/null +++ b/.config/sway/icc/eDP-1.icm @@ -0,0 +1 @@ +/home/od/.color/icc/BOE_CQ_______NE135FBM_N41_03.icc \ No newline at end of file From 7a37c9ba6f2778803e623db8b773cbe371622d6f Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Mon, 30 Dec 2024 14:39:09 +0100 Subject: [PATCH 10/23] feat(nvim): Initial configuration --- .config/nvim/init.lua | 970 ++++++++++++++++++++++++++++++++++++ .config/nvim/lazy-lock.json | 27 + 2 files changed, 997 insertions(+) create mode 100644 .config/nvim/init.lua create mode 100644 .config/nvim/lazy-lock.json diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..08717d5 --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,970 @@ +--[[ + +===================================================================== +==================== READ THIS BEFORE CONTINUING ==================== +===================================================================== +======== .-----. ======== +======== .----------------------. | === | ======== +======== |.-""""""""""""""""""-.| |-----| ======== +======== || || | === | ======== +======== || KICKSTART.NVIM || |-----| ======== +======== || || | === | ======== +======== || || |-----| ======== +======== ||:Tutor || |:::::| ======== +======== |'-..................-'| |____o| ======== +======== `"")----------------(""` ___________ ======== +======== /::::::::::| |::::::::::\ \ no mouse \ ======== +======== /:::========| |==hjkl==:::\ \ required \ ======== +======== '""""""""""""' '""""""""""""' '""""""""""' ======== +======== ======== +===================================================================== +===================================================================== + +What is Kickstart? + + Kickstart.nvim is *not* a distribution. + + Kickstart.nvim is a starting point for your own configuration. + The goal is that you can read every line of code, top-to-bottom, understand + what your configuration is doing, and modify it to suit your needs. + + Once you've done that, you can start exploring, configuring and tinkering to + make Neovim your own! That might mean leaving Kickstart just the way it is for a while + or immediately breaking it into modular pieces. It's up to you! + + If you don't know anything about Lua, I recommend taking some time to read through + a guide. One possible example which will only take 10-15 minutes: + - https://learnxinyminutes.com/docs/lua/ + + After understanding a bit more about Lua, you can use `:help lua-guide` as a + reference for how Neovim integrates Lua. + - :help lua-guide + - (or HTML version): https://neovim.io/doc/user/lua-guide.html + +Kickstart Guide: + + TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. + + If you don't know what this means, type the following: + - + - : + - Tutor + - + + (If you already know the Neovim basics, you can skip this step.) + + Once you've completed that, you can continue working through **AND READING** the rest + of the kickstart init.lua. + + Next, run AND READ `:help`. + This will open up a help window with some basic information + about reading, navigating and searching the builtin help documentation. + + This should be the first place you go to look when you're stuck or confused + with something. It's one of my favorite Neovim features. + + MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, + which is very useful when you're not exactly sure of what you're looking for. + + I have left several `:help X` comments throughout the init.lua + These are hints about where to find more information about the relevant settings, + plugins or Neovim features used in Kickstart. + + NOTE: Look for lines like this + + Throughout the file. These are for you, the reader, to help you understand what is happening. + Feel free to delete them once you know what you're doing, but they should serve as a guide + for when you are first encountering a few different constructs in your Neovim config. + +If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. + +I hope you enjoy your Neovim journey, +- TJ + +P.S. You can delete this when you're done too. It's your config now! :) +--]] + +-- Set as the leader key +-- See `:help mapleader` +-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +-- Set to true if you have a Nerd Font installed and selected in the terminal +vim.g.have_nerd_font = false + +-- [[ Setting options ]] +-- See `:help vim.opt` +-- NOTE: You can change these options as you wish! +-- For more options, you can see `:help option-list` + +-- Make line numbers default +vim.opt.number = true +-- You can also add relative line numbers, to help with jumping. +-- Experiment for yourself to see if you like it! +-- vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Sync clipboard between OS and Neovim. +-- Schedule the setting after `UiEnter` because it can increase startup-time. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +vim.schedule(function() + vim.opt.clipboard = 'unnamedplus' +end) + +-- Enable break indent +vim.opt.breakindent = true + +-- Save undo history +vim.opt.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Keep signcolumn on by default +vim.opt.signcolumn = 'yes' + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Preview substitutions live, as you type! +vim.opt.inccommand = 'split' + +-- Show which line your cursor is on +vim.opt.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 + +-- [[ Basic Keymaps ]] +-- See `:help vim.keymap.set()` + +-- Clear highlights on search when pressing in normal mode +-- See `:help hlsearch` +vim.keymap.set('n', '', 'nohlsearch') + +-- Diagnostic keymaps +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- for people to discover. Otherwise, you normally need to press , which +-- is not what someone will guess without a bit more experience. +-- +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- TIP: Disable arrow keys in normal mode +-- vim.keymap.set('n', '', 'echo "Use h to move!!"') +-- vim.keymap.set('n', '', 'echo "Use l to move!!"') +-- vim.keymap.set('n', '', 'echo "Use k to move!!"') +-- vim.keymap.set('n', '', 'echo "Use j to move!!"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + +-- [[ Basic Autocommands ]] +-- See `:help lua-guide-autocommands` + +-- Highlight when yanking (copying) text +-- Try it with `yap` in normal mode +-- See `:help vim.highlight.on_yank()` +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() + vim.highlight.on_yank() + end, +}) + +-- [[ Install `lazy.nvim` plugin manager ]] +-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info +local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = 'https://github.com/folke/lazy.nvim.git' + local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } + if vim.v.shell_error ~= 0 then + error('Error cloning lazy.nvim:\n' .. out) + end +end ---@diagnostic disable-next-line: undefined-field +vim.opt.rtp:prepend(lazypath) + +-- [[ Configure and install plugins ]] +-- +-- To check the current status of your plugins, run +-- :Lazy +-- +-- You can press `?` in this menu for help. Use `:q` to close the window +-- +-- To update plugins you can run +-- :Lazy update +-- +-- NOTE: Here is where you install your plugins. +require('lazy').setup({ + -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). + 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + + -- NOTE: Plugins can also be added by using a table, + -- with the first argument being the link and the following + -- keys can be used to configure plugin behavior/loading/etc. + -- + -- Use `opts = {}` to force a plugin to be loaded. + -- + + -- Here is a more advanced example where we pass configuration + -- options to `gitsigns.nvim`. This is equivalent to the following Lua: + -- require('gitsigns').setup({ ... }) + -- + -- See `:help gitsigns` to understand what the configuration keys do + { -- Adds git related signs to the gutter, as well as utilities for managing changes + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + }, + }, + + -- NOTE: Plugins can also be configured to run Lua code when they are loaded. + -- + -- This is often very useful to both group configuration, as well as handle + -- lazy loading plugins that don't need to be loaded immediately at startup. + -- + -- For example, in the following configuration, we use: + -- event = 'VimEnter' + -- + -- which loads which-key before all the UI elements are loaded. Events can be + -- normal autocommands events (`:help autocmd-events`). + -- + -- Then, because we use the `config` key, the configuration only runs + -- after the plugin has been loaded: + -- config = function() ... end + + { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + opts = { + icons = { + -- set icon mappings to true if you have a Nerd Font + mappings = vim.g.have_nerd_font, + -- If you are using a Nerd Font: set icons.keys to an empty table which will use the + -- default which-key.nvim defined Nerd Font icons, otherwise define a string table + keys = vim.g.have_nerd_font and {} or { + Up = ' ', + Down = ' ', + Left = ' ', + Right = ' ', + C = ' ', + M = ' ', + D = ' ', + S = ' ', + CR = ' ', + Esc = ' ', + ScrollWheelDown = ' ', + ScrollWheelUp = ' ', + NL = ' ', + BS = ' ', + Space = ' ', + Tab = ' ', + F1 = '', + F2 = '', + F3 = '', + F4 = '', + F5 = '', + F6 = '', + F7 = '', + F8 = '', + F9 = '', + F10 = '', + F11 = '', + F12 = '', + }, + }, + + -- Document existing key chains + spec = { + { 'c', group = '[C]ode', mode = { 'n', 'x' } }, + { 'd', group = '[D]ocument' }, + { 'r', group = '[R]ename' }, + { 's', group = '[S]earch' }, + { 'w', group = '[W]orkspace' }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + }, + }, + }, + + -- NOTE: Plugins can specify dependencies. + -- + -- The dependencies are proper plugin specifications as well - anything + -- you do for a plugin at the top level, you can do for a dependency. + -- + -- Use the `dependencies` key to specify the dependencies of a particular plugin + + { -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + branch = '0.1.x', + dependencies = { + 'nvim-lua/plenary.nvim', + { -- If encountering errors, see telescope-fzf-native README for installation instructions + 'nvim-telescope/telescope-fzf-native.nvim', + + -- `build` is used to run some command when the plugin is installed/updated. + -- This is only run then, not every time Neovim starts up. + build = 'make', + + -- `cond` is a condition used to determine whether this plugin should be + -- installed and loaded. + cond = function() + return vim.fn.executable 'make' == 1 + end, + }, + { 'nvim-telescope/telescope-ui-select.nvim' }, + + -- Useful for getting pretty icons, but requires a Nerd Font. + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + }, + config = function() + -- Telescope is a fuzzy finder that comes with a lot of different things that + -- it can fuzzy find! It's more than just a "file finder", it can search + -- many different aspects of Neovim, your workspace, LSP, and more! + -- + -- The easiest way to use Telescope, is to start by doing something like: + -- :Telescope help_tags + -- + -- After running this command, a window will open up and you're able to + -- type in the prompt window. You'll see a list of `help_tags` options and + -- a corresponding preview of the help. + -- + -- Two important keymaps to use while in Telescope are: + -- - Insert mode: + -- - Normal mode: ? + -- + -- This opens a window that shows you all of the keymaps for the current + -- Telescope picker. This is really useful to discover what Telescope can + -- do as well as how to actually do it! + + -- [[ Configure Telescope ]] + -- See `:help telescope` and `:help telescope.setup()` + require('telescope').setup { + -- You can put your default mappings / updates / etc. in here + -- All the info you're looking for is in `:help telescope.setup()` + -- + -- defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + -- }, + -- pickers = {} + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + -- Enable Telescope extensions if they are installed + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') + + -- See `:help telescope.builtin` + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + -- Slightly advanced example of overriding default behavior and theme + vim.keymap.set('n', '/', function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { + winblend = 10, + previewer = false, + }) + end, { desc = '[/] Fuzzily search in current buffer' }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + vim.keymap.set('n', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, + }, + + -- LSP Plugins + { + -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + -- Load luvit types when the `vim.uv` word is found + { path = 'luvit-meta/library', words = { 'vim%.uv' } }, + }, + }, + }, + { 'Bilal2453/luvit-meta', lazy = true }, + { + -- Main LSP Configuration + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + 'williamboman/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', + + -- Useful status updates for LSP. + -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` + { 'j-hui/fidget.nvim', opts = {} }, + + -- Allows extra capabilities provided by nvim-cmp + 'hrsh7th/cmp-nvim-lsp', + }, + config = function() + -- Brief aside: **What is LSP?** + -- + -- LSP is an initialism you've probably heard, but might not understand what it is. + -- + -- LSP stands for Language Server Protocol. It's a protocol that helps editors + -- and language tooling communicate in a standardized fashion. + -- + -- In general, you have a "server" which is some tool built to understand a particular + -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers + -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone + -- processes that communicate with some "client" - in this case, Neovim! + -- + -- LSP provides Neovim with features like: + -- - Go to definition + -- - Find references + -- - Autocompletion + -- - Symbol Search + -- - and more! + -- + -- Thus, Language Servers are external tools that must be installed separately from + -- Neovim. This is where `mason` and related plugins come into play. + -- + -- If you're wondering about lsp vs treesitter, you can check out the wonderfully + -- and elegantly composed help section, `:help lsp-vs-treesitter` + + -- This function gets run when an LSP attaches to a particular buffer. + -- That is to say, every time a new file is opened that is associated with + -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this + -- function will be executed to configure the current buffer + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + -- NOTE: Remember that Lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Jump to the definition of the word under your cursor. + -- This is where a variable was first declared, or where a function is defined, etc. + -- To jump back, press . + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + + -- Find references for the word under your cursor. + map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + + -- Jump to the implementation of the word under your cursor. + -- Useful when your language has ways of declaring types without an actual implementation. + map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + + -- Jump to the type of the word under your cursor. + -- Useful when you're not sure what type a variable is and you want to see + -- the definition of its *type*, not where it was *defined*. + map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + end + + -- The following code creates a keymap to toggle inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then + map('th', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) + end, '[T]oggle Inlay [H]ints') + end + end, + }) + + -- Change diagnostic symbols in the sign column (gutter) + -- if vim.g.have_nerd_font then + -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' } + -- local diagnostic_signs = {} + -- for type, icon in pairs(signs) do + -- diagnostic_signs[vim.diagnostic.severity[type]] = icon + -- end + -- vim.diagnostic.config { signs = { text = diagnostic_signs } } + -- end + + -- LSP servers and clients are able to communicate to each other what features they support. + -- By default, Neovim doesn't support everything that is in the LSP specification. + -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) + + -- Enable the following language servers + -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. + -- + -- Add any additional override configuration in the following tables. Available keys are: + -- - cmd (table): Override the default command used to start the server + -- - filetypes (table): Override the default list of associated filetypes for the server + -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. + -- - settings (table): Override the default settings passed when initializing the server. + -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ + local servers = { + -- clangd = {}, + -- gopls = {}, + -- pyright = {}, + -- rust_analyzer = {}, + -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`ts_ls`) will work just fine + -- ts_ls = {}, + -- + + lua_ls = { + -- cmd = {...}, + -- filetypes = { ...}, + -- capabilities = {}, + settings = { + Lua = { + completion = { + callSnippet = 'Replace', + }, + -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings + -- diagnostics = { disable = { 'missing-fields' } }, + }, + }, + }, + } + + -- Ensure the servers and tools above are installed + -- To check the current status of installed tools and/or manually install + -- other tools, you can run + -- :Mason + -- + -- You can press `g?` for help in this menu. + require('mason').setup() + + -- You can add other tools here that you want Mason to install + -- for you, so that they are available from within Neovim. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + 'stylua', -- Used to format Lua code + }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + require('mason-lspconfig').setup { + handlers = { + function(server_name) + local server = servers[server_name] or {} + -- This handles overriding only values explicitly passed + -- by the server configuration above. Useful when disabling + -- certain features of an LSP (for example, turning off formatting for ts_ls) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, + } + end, + }, + + { -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + local lsp_format_opt + if disable_filetypes[vim.bo[bufnr].filetype] then + lsp_format_opt = 'never' + else + lsp_format_opt = 'fallback' + end + return { + timeout_ms = 500, + lsp_format = lsp_format_opt, + } + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use 'stop_after_first' to run the first available formatter from the list + -- javascript = { "prettierd", "prettier", stop_after_first = true }, + }, + }, + }, + + { -- Autocompletion + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + 'L3MON4D3/LuaSnip', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + }, + 'saadparwaiz1/cmp_luasnip', + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + }, + config = function() + -- See `:help cmp` + local cmp = require 'cmp' + local luasnip = require 'luasnip' + luasnip.config.setup {} + + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = 'menu,menuone,noinsert' }, + + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert { + -- Select the [n]ext item + [''] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [''] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [''] = cmp.mapping.confirm { select = true }, + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [''] = cmp.mapping.complete {}, + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + sources = { + { + name = 'lazydev', + -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it + group_index = 0, + }, + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + }, + } + end, + }, + + { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'folke/tokyonight.nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'tokyonight-night' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' + end, + }, + + -- Highlight todo, notes, etc in comments + { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, + + { -- Collection of various small independent plugins/modules + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [Q]uote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, + }, + { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + main = 'nvim-treesitter.configs', -- Sets main module to use for opts + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + opts = { + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = { 'ruby' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + }, + + -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the + -- init.lua. If you want these files, they are in the repository, so you can just download them and + -- place them in the correct locations. + + -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart + -- + -- Here are some example plugins that I've included in the Kickstart repository. + -- Uncomment any of the lines below to enable them (you will need to restart nvim). + -- + -- require 'kickstart.plugins.debug', + -- require 'kickstart.plugins.indent_line', + -- require 'kickstart.plugins.lint', + -- require 'kickstart.plugins.autopairs', + -- require 'kickstart.plugins.neo-tree', + -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + + -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` + -- This is the easiest way to modularize your config. + -- + -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. + -- { import = 'custom.plugins' }, + -- + -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` + -- Or use telescope! + -- In normal mode type `sh` then write `lazy.nvim-plugin` + -- you can continue same window with `sr` which resumes last telescope search +}, { + ui = { + -- If you are using a Nerd Font: set icons to an empty table which will use the + -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table + icons = vim.g.have_nerd_font and {} or { + cmd = '⌘', + config = '🛠', + event = '📅', + ft = '📂', + init = '⚙', + keys = '🗝', + plugin = '🔌', + runtime = '💻', + require = '🌙', + source = '📄', + start = '🚀', + task = '📌', + lazy = '💤 ', + }, + }, +}) + +-- The line beneath this is called `modeline`. See `:help modeline` +-- vim: ts=2 sts=2 sw=2 et diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..5664baf --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,27 @@ +{ + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, + "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, + "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "733afb94ed88d32b839a644dc137604691e46032" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-treesitter": { "branch": "master", "commit": "a295ba13d27684e8904e8e51876b84ee85135cf1" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } +} From ba32c341bf2d13f1bf302d1c334aebbb32f128f2 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 8 Jan 2025 09:58:36 +0100 Subject: [PATCH 11/23] feat(bin): Add 2 new scripts for screens * ecran_maison to activate external monitors for laptop (framework) * ecran_framework to deactivate external monitors and use laptop one (framework) --- bin/ecran_framework | 11 +++++++++++ bin/ecran_maison | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/bin/ecran_framework b/bin/ecran_framework index 220125c..f3f08d3 100755 --- a/bin/ecran_framework +++ b/bin/ecran_framework @@ -2,6 +2,7 @@ # # ecran_framework # +<<<<<<< HEAD # Désactive les écrans. N'active que celui du PC portable Framework # # Écran principal : Iiyama North America PL2474H 11669V9B05959 @@ -21,3 +22,13 @@ swaymsg output "${otherscreen}" disable # Allume l'écran du PC portable swaymsg output "${laptopscreen}" enable +======= +# Désactive les écrans. N'active que celui du laptop Framework + +# Éteint DP-9, DP-10 +wlr-randr --output DP-9 --off +wlr-randr --output DP-10 --off + +# Allume l'écran du PC portable +wlr-randr --output eDP-1 --on +>>>>>>> 120388f (feat(bin): Add 2 new scripts for screens) diff --git a/bin/ecran_maison b/bin/ecran_maison index 10c722d..fd7610f 100755 --- a/bin/ecran_maison +++ b/bin/ecran_maison @@ -3,6 +3,7 @@ # ecran_maison # # Active les 2 écrans de la maison sur le Dock Station branché. +<<<<<<< HEAD # # Écran principal : Iiyama North America PL2474H 11669V9B05959 # Écran secondaire : Iiyama North America PLX2283H 1159495081860 @@ -29,3 +30,20 @@ swaymsg output "${mainscreen}" pos 0 840 # Éteint l'écran du PC portable swaymsg output "${laptopscreen}" disable +======= + +# Active DP-10 +wlr-randr --output DP-10 --on +# Tourne l'écran de droite de 90° +wlr-randr --output DP-10 --transform 90 +# Déplace l'écran de droite à 1920px (pour rester à droite) +wlr-randr --output DP-10 --pos 1920,0 + +# Active DP-9 +wlr-randr --output DP-9 --on +# Descend l'écran principal vers le bas de 840px +wlr-randr --output DP-9 --pos 0,840 + +# Éteint l'écran du PC portable +wlr-randr --output eDP-1 --off +>>>>>>> 120388f (feat(bin): Add 2 new scripts for screens) From 6f034c3cb92f40d804034be3d2446e428625e744 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 9 Jan 2025 16:32:43 +0100 Subject: [PATCH 12/23] fix(qtpass): Add new binary for wayland compat. --- bin/qtpass-wayland | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 bin/qtpass-wayland diff --git a/bin/qtpass-wayland b/bin/qtpass-wayland new file mode 100755 index 0000000..4a70c50 --- /dev/null +++ b/bin/qtpass-wayland @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# Compatible with Wayland. Cf. https://github.com/IJHack/QtPass/issues/663 +QT_QPA_PLATFORM=xcb /usr/bin/qtpass From c20fba7799b12212adc0c684a2d6b50b94686283 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 9 Jan 2025 22:29:49 +0100 Subject: [PATCH 13/23] fix(ssh): config - change 'zou' IP --- .ssh/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ssh/config b/.ssh/config index 3713f5d..560c466 100644 --- a/.ssh/config +++ b/.ssh/config @@ -60,8 +60,8 @@ Port 22 # Perso Host zou -Hostname 192.168.1.68 -User root +Hostname 192.168.1.142 +User od Port 22 # Groupe Open (entreprise) From 6f2e18367fd9739c605d004fa9be9628e1770839 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 9 Jan 2025 22:59:17 +0100 Subject: [PATCH 14/23] fix(environment.d): envvars.conf - comment useless lines Because of sway-systemd that already do thins about XDG_CURRENT_DESKTOP, etc. --- .config/environment.d/envvars.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf index 0d81002..633417d 100644 --- a/.config/environment.d/envvars.conf +++ b/.config/environment.d/envvars.conf @@ -9,7 +9,8 @@ QT_QPA_PLATFORM=wayland ELECTRON_OZONE_PLATFORM_HINT=wayland # Pour wayland SDL_VIDEODRIVER=wayland -# Session -export XDG_SESSION_TYPE=wayland -export XDG_SESSION_DESKTOP=sway -export XDG_CURRENT_DESKTOP=sway # for gammastep-indicator +# Session : déjà fait par sway-systemd. Cf. https://github.com/alebastr/sway-systemd/blob/main/src/session.sh +#export XDG_SESSION_TYPE=wayland +#export XDG_SESSION_DESKTOP=sway +# gammastep-indicator n'est plus utilisé dans mon Wayland +#export XDG_CURRENT_DESKTOP=sway # for gammastep-indicator From b16702c28e5c19c4d49e08dceb6fa8700774a3a9 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Fri, 10 Jan 2025 18:41:18 +0100 Subject: [PATCH 15/23] fix(sway): Load .config/environment.d/envvars.conf in another way --- .config/environment.d/envvars.conf | 2 ++ .config/zsh/.zprofile | 24 ++++++++++++++-- .profile | 46 ++++++++++++++++++------------ 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf index 633417d..8166ab7 100644 --- a/.config/environment.d/envvars.conf +++ b/.config/environment.d/envvars.conf @@ -10,6 +10,8 @@ ELECTRON_OZONE_PLATFORM_HINT=wayland # Pour wayland SDL_VIDEODRIVER=wayland # Session : déjà fait par sway-systemd. Cf. https://github.com/alebastr/sway-systemd/blob/main/src/session.sh +# Regarder dans .config/sway/config, à la fin ça importe /etc/sway/config.d/ qui contient 10-systemd-session.conf qui exécute session.sh +# Ce qui import XDG_SESSION_TYPE, XDG_SESSION_DESKTOP, XDG_CURRENT_DESKTOP, etc. #export XDG_SESSION_TYPE=wayland #export XDG_SESSION_DESKTOP=sway # gammastep-indicator n'est plus utilisé dans mon Wayland diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 8028907..b3c322e 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1,10 +1,28 @@ +# .profile permet d'avoir +# 1. TERMINAL (choix d'un terminal par défaut) +# 2. BATPATH (pour la batterie) +# 3. PATH initial # TODO: vraiment nécessaire ? emulate sh -c '. ~/.profile' -export PYENV_ROOT="$HOME/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init --path)" +# TODO: vérifier si ce code commenté fonctionne +#export PYENV_ROOT="$HOME/.pyenv" +#export PATH="$PYENV_ROOT/bin:$PATH" +#eval "$(pyenv init --path)" # Start X automatically if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then + case $HOST in + roc | zou) + : # Exceptions : On ne fait rien pour ces machines qui sont sous Xorg. + ;; + *) + # Pour toutes les autres on charge le contenu de .config/environment.d + # Cf. https://wiki.archlinux.org/title/Environment_variables#Per_Wayland_session + # use systemd-environment-d-generator(8) to generate environment, and export those variables + set -o allexport + source <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator) + set +o allexport + ;; + esac exec sway fi diff --git a/.profile b/.profile index 41286cb..a38b9ed 100644 --- a/.profile +++ b/.profile @@ -17,7 +17,7 @@ done # Pour la batterie des ordinateurs portables (~/bin/battery) export BATPATH="/sys/class/power_supply/BAT1" -# Permit DBUS to be launched +# Permit DBUS to be launched on i3 if [ "$0" = "/usr/sbin/lightdm-session" -a "$DESKTOP_SESSION" = "i3" ]; then export $(gnome-keyring-daemon -s) fi @@ -27,22 +27,30 @@ export PYENV_ROOT="$HOME/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init --path)" -# Démarrage de l'environnement préféré -if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then - case $HOST in - fuz | fuztest) - variables_file="${HOME}/.config/environment.d/envvars.conf" - if [[ -f "${variables_file}" ]]; then - # charge seulement les lignes sans "#" (non commentées) - for line in `cat "${variables_file}"|grep -Ev '^#'`; do - export "$line" - done - fi - exec sway - ;; - *) - : # on ne fait rien, car c'est .xinitrc qui lance i3 - ;; - esac -fi + +## ATTENTION : ce code n'est plus nécessaire pour le moment. +## 1. C'est ZSH (.zprofile) qui va charger SWAY sur les machines Wayland +## 2. C'est le .zprofile qui charge aussi .config/environment.d/envvars.conf +## 3. Dans le cas de Xorg : on a pas besoin de .config/environment.d/envvars.conf +## 4. Dans le cas de Xorg : xinitrc lance i3 # TODO: comment xinitrc se lance ? Par qui ? + +## Démarrage de l'environnement préféré +#if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then +# case $HOST in +# fuz | fuztest) +# # Cf. https://wiki.archlinux.org/title/Environment_variables#Per_Wayland_session +# variables_file="${HOME}/.config/environment.d/envvars.conf" +# if [[ -f "${variables_file}" ]]; then +# # charge seulement les lignes sans "#" (non commentées) +# for line in `cat "${variables_file}"|grep -Ev '^#'`; do +# export "$line" +# done +# fi +# exec sway +# ;; +# *) +# : # on ne fait rien, car c'est .xinitrc qui lance i3 +# ;; +# esac +#fi # vim: ts=2 sw=2 et nu From e4f9c5306082e023b37a35c045fbf26e9edfedd2 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Fri, 10 Jan 2025 20:46:48 +0100 Subject: [PATCH 16/23] feat(bin): avoid qtpass problem on Wayland + non 0,0 position monitors * starts qtpass in Xwayland because it sucks! Cf. https://github.com/IJHack/QtPass/issues/663#issuecomment-2583291264 --- bin/qtpass-wayland | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/qtpass-wayland b/bin/qtpass-wayland index 4a70c50..3e488c0 100755 --- a/bin/qtpass-wayland +++ b/bin/qtpass-wayland @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Compatible with Wayland. Cf. https://github.com/IJHack/QtPass/issues/663 -QT_QPA_PLATFORM=xcb /usr/bin/qtpass +export QT_QPA_PLATFORM=xcb && /usr/bin/qtpass From ad7c922d6598c63502f77875a0ee51234c29e96e Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Fri, 10 Jan 2025 20:52:45 +0100 Subject: [PATCH 17/23] feat(Sway): config - Change launcher to sway-launcher-desktop + alacritty * use sway-launcher-desktop * use alacritty * use fzf --- .config/sway/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/sway/config b/.config/sway/config index 9570a0c..7875b00 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -18,7 +18,8 @@ set $term alacritty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. -set $menu wofi --show run | xargs swaymsg exec -- +for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10 +set $menu exec alacritty --class launcher -e /usr/bin/sway-launcher-desktop ### Output configuration # From f04c062c826f34068d2602b752ae6f1d72dc4ef6 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Mon, 13 Jan 2025 14:30:51 +0100 Subject: [PATCH 18/23] feat(QtPass): New .desktop file to launch it correctly --- .local/share/applications/qtpass.desktop | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 .local/share/applications/qtpass.desktop diff --git a/.local/share/applications/qtpass.desktop b/.local/share/applications/qtpass.desktop new file mode 100755 index 0000000..009ae88 --- /dev/null +++ b/.local/share/applications/qtpass.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=QtPass - Wayland +Comment=Un gestionnaire de mots de passe utilisant 'pass' +Exec=env QT_QPA_PLATFORM=xcb /usr/bin/qtpass +Icon=qtpass +Path= +Terminal=false +StartupNotify=true From 9fdfd70f250799e8aa3bce6f7d8dd93fa951c467 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 15 Jan 2025 10:06:50 +0100 Subject: [PATCH 19/23] fix(sway): config - add 12-lanceur.conf to set sway-launcher-desktop correctly --- .config/sway/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.config/sway/config b/.config/sway/config index 7875b00..9570a0c 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -18,8 +18,7 @@ set $term alacritty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. -for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10 -set $menu exec alacritty --class launcher -e /usr/bin/sway-launcher-desktop +set $menu wofi --show run | xargs swaymsg exec -- ### Output configuration # From 3922a1d3881472cf51eb64a0fa40f018e3bc1c86 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 15 Jan 2025 10:29:44 +0100 Subject: [PATCH 20/23] fix(applications): delete useless ~/bin/qtpass-wayland file Because we use .local/share/applications/qtpass.desktop instead! --- bin/qtpass-wayland | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 bin/qtpass-wayland diff --git a/bin/qtpass-wayland b/bin/qtpass-wayland deleted file mode 100755 index 3e488c0..0000000 --- a/bin/qtpass-wayland +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# Compatible with Wayland. Cf. https://github.com/IJHack/QtPass/issues/663 -export QT_QPA_PLATFORM=xcb && /usr/bin/qtpass From 45f378c73a794ee57570e8376231d4b87a18cf84 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 15 Jan 2025 10:30:47 +0100 Subject: [PATCH 21/23] fix(applications): Add different Slack desktop file to launch it on Wayland --- .local/share/applications/slack.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .local/share/applications/slack.desktop diff --git a/.local/share/applications/slack.desktop b/.local/share/applications/slack.desktop new file mode 100644 index 0000000..95333d2 --- /dev/null +++ b/.local/share/applications/slack.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Slack Wayland +StartupWMClass=Slack +Comment=Slack Desktop +GenericName=Slack Client for Linux +#Exec=/usr/bin/slack --disable-gpu-compositing --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer --enable-features=WaylandWindowDecorations --disable-features=WaylandFractionalScaleV1 -s %U +Exec=/usr/bin/slack --disable-gpu-compositing --enable-features=WebRTCPipeWireCapturer --enable-features=WaylandWindowDecorations --disable-features=WaylandFractionalScaleV1 -s %U +Icon=slack +Type=Application +StartupNotify=true +Categories=GNOME;GTK;Network;InstantMessaging; +MimeType=x-scheme-handler/slack; From 7614873866d3c5bb8a7f6ee9c1888dca9bfca89a Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 16 Jan 2025 15:28:55 +0100 Subject: [PATCH 22/23] fix(sway): FileChooser missing for xdg-desktop-portal, add GTK one --- .config/xdg-desktop-portal/sway-portals.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .config/xdg-desktop-portal/sway-portals.conf diff --git a/.config/xdg-desktop-portal/sway-portals.conf b/.config/xdg-desktop-portal/sway-portals.conf new file mode 100644 index 0000000..2df3a4a --- /dev/null +++ b/.config/xdg-desktop-portal/sway-portals.conf @@ -0,0 +1,4 @@ +[preferred] +default=wlr;gtk +#org.freedesktop.impl.portal.Screenshot=wlr +#org.freedesktop.impl.portal.Screencast=wlr From 445d03d12ff3b55319ebd467e9b398c902993048 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Tue, 25 Feb 2025 11:56:16 +0100 Subject: [PATCH 23/23] chore(config): warprc - updated --- .warprc | 13 ++++--------- bin/ecran_framework | 11 ----------- bin/ecran_maison | 18 ------------------ 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/.warprc b/.warprc index 5a50555..863ca46 100644 --- a/.warprc +++ b/.warprc @@ -1,14 +1,9 @@ -ans:/home/od/projets/buffet blog:~/projets/blog -buf:/home/od/projets/buffet cal:~/projets/effeuillage -cloud:~/freshmile/cloud fastapi:~/devu/exam_DOSSMANN/fastapi_exam_DOSSMANN graille:~/projets/graille ops:~/projets/ops -patchwork:/home/od/projets/patchwork -p:~/freshmile/pulp -ps:~/freshmile/pulp/Seed -s:~/freshmile/seed -z:~/freshmile/zest -zs:~/freshmile/zest/Seed +patchwork:~/projet/patchwork +presentation:~/projet/odtre/diapos +soutenance:~/projet/soutenance +wiki:~/projet/recueil diff --git a/bin/ecran_framework b/bin/ecran_framework index f3f08d3..220125c 100755 --- a/bin/ecran_framework +++ b/bin/ecran_framework @@ -2,7 +2,6 @@ # # ecran_framework # -<<<<<<< HEAD # Désactive les écrans. N'active que celui du PC portable Framework # # Écran principal : Iiyama North America PL2474H 11669V9B05959 @@ -22,13 +21,3 @@ swaymsg output "${otherscreen}" disable # Allume l'écran du PC portable swaymsg output "${laptopscreen}" enable -======= -# Désactive les écrans. N'active que celui du laptop Framework - -# Éteint DP-9, DP-10 -wlr-randr --output DP-9 --off -wlr-randr --output DP-10 --off - -# Allume l'écran du PC portable -wlr-randr --output eDP-1 --on ->>>>>>> 120388f (feat(bin): Add 2 new scripts for screens) diff --git a/bin/ecran_maison b/bin/ecran_maison index fd7610f..10c722d 100755 --- a/bin/ecran_maison +++ b/bin/ecran_maison @@ -3,7 +3,6 @@ # ecran_maison # # Active les 2 écrans de la maison sur le Dock Station branché. -<<<<<<< HEAD # # Écran principal : Iiyama North America PL2474H 11669V9B05959 # Écran secondaire : Iiyama North America PLX2283H 1159495081860 @@ -30,20 +29,3 @@ swaymsg output "${mainscreen}" pos 0 840 # Éteint l'écran du PC portable swaymsg output "${laptopscreen}" disable -======= - -# Active DP-10 -wlr-randr --output DP-10 --on -# Tourne l'écran de droite de 90° -wlr-randr --output DP-10 --transform 90 -# Déplace l'écran de droite à 1920px (pour rester à droite) -wlr-randr --output DP-10 --pos 1920,0 - -# Active DP-9 -wlr-randr --output DP-9 --on -# Descend l'écran principal vers le bas de 840px -wlr-randr --output DP-9 --pos 0,840 - -# Éteint l'écran du PC portable -wlr-randr --output eDP-1 --off ->>>>>>> 120388f (feat(bin): Add 2 new scripts for screens)