Merge branch 'master' of https://git.halia.dev/therbron/dotfiles

.bin/display

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+export DISPLAY=:0
+export XAUTHORITY=/home/tanguy/.Xauthority
+
+/home/tanguy/.screenlayout/base.sh
+# TODO : Configure each dock configuration with MAC addresses
+
+if [[ "$(ip a | grep 'e0:4f:43:59:98:f4' | wc -l)" == 1 ]]; then
+    /home/tanguy/.screenlayout/tegl-e0-4f.sh
+
+    i3-msg "workspace 1, move workspace to output DVI-I-1-1";
+    i3-msg "workspace 2, move workspace to output DCI-I-2-2";
+    i3-msg "workspace 3, move workspace to output eDP-1"
+    i3-msg "workspace 4, move workspace to output eDP-1"
+fi
+
+if [[ "$(ip a | grep 'f4:a8:0d:41:e1:aa' | wc -l)" == 1 ]]; then
+    /home/tanguy/.screenlayout/tegl-e1-aa.sh
+
+    i3-msg "workspace 1, move workspace to output DP-2-2";
+    i3-msg "workspace 2, move workspace to output DP-2-3";
+    i3-msg "workspace 3, move workspace to output eDP-1"
+    i3-msg "workspace 4, move workspace to output eDP-1"
+fi
+
+if [[ "$(ip a | grep '00:50:b6:f7:e5:d3' | wc -l)" == 1 ]]; then
+    /home/tanguy/.screenlayout/tegl-e5-d3.sh
+
+    i3-msg "workspace 1, move workspace to output DVI-I-2-2";
+    i3-msg "workspace 2, move workspace to output DVI-I-1-1";
+    i3-msg "workspace 3, move workspace to output eDP-1"
+    i3-msg "workspace 4, move workspace to output eDP-1"
+fi
+
+/home/tanguy/.config/polybar/launch.sh > /dev/null 2>&1

.bin/swf

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+i3-msg "workspace 2; exec /usr/bin/firefox"
+i3-msg "workspace 3; exec /usr/bin/teams"
+i3-msg "workspace 3; exec /usr/bin/slack"
+i3-msg "workspace 4; exec /usr/bin/element-desktop"
+i3-msg "workspace 1; exec /usr/bin/alacritty"
+sleep 1
+i3-msg "workspace 1; fullscreen enable"

.config/flameshot/flameshot.ini

@@ -1,7 +1,8 @@
 [General]
 disabledTrayIcon=false
 drawColor=#ff0000
-drawThickness=0
+drawThickness=3
+savePath=/home/tanguy/Images
 showStartupLaunchMessage=true
 
 [Shortcuts]

.config/i3/config

@@ -4,35 +4,6 @@
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 #
 ###############################################################################
-#
-# In this config file many values are taken from Xresources with the directive
-# set_from_resource:
-#
-# set_from_resource <i3 variable name> <Xresources key> <default value>
-#
-# This configuration file utilizes Xresource variables to change configuration
-# without having to make a copy of this config file.
-# The benefit to not copying this file is easier upgrades in the future.
-# To update a value in this config without making a copy, update the Xresource
-# value in the file ~/.config/regolith/Xresources.
-#
-# For example, to change the bar position to the top of the screen this is the
-# i3 config entry in this file:
-# set_from_resource $i3-wm.bar.position i3-wm.bar.position bottom
-#
-# So add this line to ~/.config/regolith/Xresources to change it's value:
-# i3-wm.bar.position: top
-#
-# Reload i3 after making Xresource changes.  Learn more at
-# https://regolith-linux.org/docs/howto/override-xres/
-#
-###############################################################################
-#
-# This file uses a machine-parsable format for comments. The schema is:
-# ## <Category> // <Action> // <Keybinding> ##
-# Learn more at https://github.com/regolith-linux/remontoire
-#
-###############################################################################
 
 ###############################################################################
 # Meta Key Mappings
@@ -285,7 +256,7 @@ floating_modifier $mod
 
 # Hiding borders adjacent to the screen edges.
 # The "smart" setting hides borders on workspaces with only one window visible.
-set_from_resource $i3-wm.hide.edge.borders i3-wm.hide.edge.borders smart
+set_from_resource $i3-wm.hide.edge.borders i3-wm.hide.edge.borders smart_no_gaps
 hide_edge_borders $i3-wm.hide.edge.borders
 
 ###############################################################################
@@ -301,10 +272,6 @@ bindsym $mod+$alt+q [con_id="__focused__"] exec --no-startup-id kill -9 $(xdotoo
 ## Session // Reload i3 Config // <><Shift> c ##
 bindsym $mod+Shift+c reload
 
-## Session // Refresh Session // <><Shift> r ##
-set_from_resource $i3-wm.program.refresh_ui i3-wm.program.refresh_ui /usr/bin/regolith-look refresh
-bindsym $mod+Shift+r exec --no-startup-id $i3-wm.program.refresh_ui
-
 ## Session // Restart i3 // <><Ctrl> r ##
 bindsym $mod+Ctrl+r restart
 
@@ -561,9 +528,6 @@ font $i3-wm.font
 # set_from_resource $i3-wm.bar.trayoutput i3-wm.bar.trayoutput none
 # set_from_resource $i3-wm.bar.stripworkspacenumbers i3-wm.bar.stripworkspacenumbers yes
 
-# i3xrocks config file. Override this for a custom status bar generator.
-# set_from_resource $i3-wm.bar.status_command i3-wm.bar.status_command i3xrocks -u ~/.config/regolith/i3xrocks/conf.d -d /etc/regolith/i3xrocks/conf.d
-# 
 # The bar configuration
 # bar {
 #   position $i3-wm.bar.position
@@ -586,42 +550,37 @@ font $i3-wm.font
 #   }
 # }
 
+
+###############################################################################
+# Program binding to specific workspace
+###############################################################################
+
+for_window [class="Microsoft Teams - Preview"] move to workspace $ws3
+for_window [class="Slack"] move to workspace $ws3
+for_window [class="Element"] move to workspace $ws4
+
+###############################################################################
+# Automatically make some windows sticky
+###############################################################################
+
+for_window [instance="Toolkit" class="firefox"] sticky enable
+
 ###############################################################################
 # External programs launched with i3
 ###############################################################################
 
-# Start the installed regolith-compositor
+# Keyboard shortcut daemon
-set_from_resource $i3-wm.program.compositor i3-wm.program.compositor /usr/share/regolith-compositor/init
-exec --no-startup-id $i3-wm.program.compositor
-
-# Start Rofication for notifications
-set_from_resource $i3-wm.program.notifications i3-wm.program.notifications /usr/bin/rofication-daemon
-exec --no-startup-id $i3-wm.program.notifications
-
-# Launch first time user experience script
-set_from_resource $i3-wm.program.ftui i3-wm.program.ftui /usr/bin/regolith-ftue
-exec --no-startup-id $i3-wm.program.ftui
-
-# Hide the mouse pointer if unused for a duration
-set_from_resource $i3-wm.program.unclutter i3-wm.program.unclutter /usr/bin/unclutter -b
-exec --no-startup-id $i3-wm.program.unclutter
-
-# User programs from Xresources
-# To use, define an Xresource key i3-wm.program.[1-3] with the value of the program to launch.
-# See https://regolith-linux.org/docs/howto/override-xres/ for details.
-set_from_resource $i3-wm.program.1 i3-wm.program.1 :
-exec --no-startup-id $i3-wm.program.1
-set_from_resource $i3-wm.program.2 i3-wm.program.2 :
-exec --no-startup-id $i3-wm.program.2
-set_from_resource $i3-wm.program.3 i3-wm.program.3 :
-exec --no-startup-id $i3-wm.program.3
-
-# Start polybar
-exec_always --no-startup-id ~/.config/polybar/launch.sh &
-exec_always --no-startup-id feh --bg-scale ~/Images/Wallpapers/aerial_waves.jpg
-# exec_always --no-startup-id ~/.config/picom/launch.sh &
 exec_always --no-startup-id xbindkeys --poll-rc
+
+# Floating panel daemon
 exec_always --no-startup-id eww daemon &
+
+# Drive automount deamon
 exec_always --no-startup-id udiskie &
 
-exec --no-startup-id /home/tanguy/multihead.sh
+# Execute workspace configuration routine
+exec --no-startup-id /home/tanguy/.bin/display
+exec --no-startup-id /home/tanguy/.bin/swf
+
+# Set the wallpaper last to avoid wallpaper missplacement
+exec_always --no-startup-id feh --bg-scale ~/Images/Wallpapers/aerial_waves.jpg

.config/nvim/coc-settings.json

@@ -1,5 +1,5 @@
 {
-    "suggest.noselect": false, 
+    "suggest.noselect": true, 
     "vetur.format.options.tabSize": 4, 
     "vetur.format.options.useTabs": true,
     "rust-analyzer.procMacro.enable": true,
@@ -13,7 +13,22 @@
             "command": "bash-language-server",
             "args": ["start"],
             "filetypes": ["sh", "hbs"],
-            "ignoredRootPaths": ["~"]
+            "ignoredRootPaths": ["~"],
+        "sql": {
+            "module": "~/.node_modules/lib/node_modules/sql-language-server/dist/bin/cli.js",
+            "args": ["up", "--method", "node-ipc"],
+            "filetypes": ["sql", "mysql"]
+        },
+        "terraform": {
+            "command": "terraform-ls",
+            "args": ["serve"],
+            "filetypes": ["terraform", "tf", "hcl"],
+            "initializationOptions": {}
+        },
+        "efm": {
+            "command": "efm-langserver",
+            "args": [],
+            "filetypes": ["vim"]
         }
     }
 }

.config/nvim/coc.vim

@@ -158,6 +158,8 @@ inoremap <silent><expr> <TAB>
 inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
 inoremap <silent><expr> <c-space> coc#refresh()
 
+inoremap <silent><expr> <space> coc#pum#visible() ? "<c-r>=coc#pum#confirm()\<CR> " : "\<space>"
+
 hi CocSearch ctermfg=12 guifg=#18A3FF
 hi CocMenuSel ctermbg=109 guibg=#13354A
 

.config/nvim/init.vim

@@ -13,9 +13,13 @@ Plug 'yuezk/vim-js'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
 Plug 'vim-airline/vim-airline'
-Plug 'ctrlpvim/ctrlp.vim'
 Plug 'ryanoasis/vim-devicons'
 
+" File finder and live grep
+Plug 'nvim-telescope/telescope.nvim', {'branch': '0.1.x'}
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+
 " Grep utility for whole project
 Plug 'jremmen/vim-ripgrep'
 " Git integration
@@ -58,6 +62,11 @@ Plug 'mboughaba/i3config.vim'
 Plug 'vimpostor/vim-tpipeline'
 call plug#end()
 
+" Disable integrated providers
+let g:loaded_ruby_provider = 0
+let g:loaded_perl_provider = 0
+let g:loaded_node_provider = 0
+
 " autocmd vimenter * NERDTree | wincmd w
 map <C-b> :NERDTreeToggle<CR>
 autocmd BufEnter * lcd %:p:h
@@ -89,7 +98,7 @@ set splitbelow
 " Remove the duplicate --INSERT-- information
 set noshowmode
 
-" rg smart root founder and adds git ingore loading for faster execution
+" rg smart root founder and adds git ignore loading for faster execution
 if executable('rg')
     let g:rg_derive_root="true"
 endif
@@ -98,12 +107,6 @@ endif
 
 source ~/.config/nvim/coc.vim
 
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store'
-let g:ctrlp_prompt_mappings = {
-      \ 'AcceptSelection("h")': ['<c-s>', '<c-b>'],
-      \ 'ToggleType(1)': ['<c-up'],
-      \ 'ToggleType(-1)': ['<c-down'],
-      \ }
 let mapleader = " "
 
 nnoremap <leader>h :wincmd h<CR>
@@ -111,7 +114,6 @@ nnoremap <leader>j :wincmd j<CR>
 nnoremap <leader>k :wincmd k<CR>
 nnoremap <leader>l :wincmd l<CR>
 nnoremap <leader>u :UndotreeToggle<CR>
-nnoremap <leader>ps :Rg<SPACE>
 
 nnoremap <leader>1 1gt
 nnoremap <leader>2 2gt
@@ -124,6 +126,9 @@ nnoremap <leader>8 8gt
 nnoremap <leader>9 9gt
 nnoremap <leader>0 10gt
 
+nnoremap <C-p> <cmd>Telescope find_files<cr>
+nnoremap <C-f> <cmd>Telescope live_grep<cr>
+
 " Add folding shortcuts and settings
 set foldmethod=indent
 set foldnestmax=10
@@ -189,3 +194,4 @@ augroup end
 nnoremap <leader>t :TableFormat<CR>
 
 let g:coc_disable_startup_warning = 1
+set mouse=

.tmux.conf

@@ -143,12 +143,14 @@ set -g @plugin 'jimeh/tmux-themepack'
 # Bitwarden integration in Tmux
 set -g @plugin 'Alkindi42/tmux-bitwarden'
 
-# Custom made plugin
+# Tmux copy to system clipboard
 set -g @plugin 'tmux-plugins/tmux-yank'
 
-# Custom made plugin
+# Custom powerline theme
 set -g @themepack 'powerline/default/custom'
 
+set -g focus-events on
+
 run -b '~/.tmux/plugins/tpm/tpm' 
 
 ## Plugin specific configuration