From 287cef0bab96049d2460e1a13866d346516493c5 Mon Sep 17 00:00:00 2001 From: Sijmen Schoon Date: Wed, 4 Mar 2020 16:56:12 +0100 Subject: [PATCH] Merge desktop config --- config/i3/backlight.fish | 6 +++++- config/i3/icons.py | 4 +++- config/nvim/init.vim | 9 ++++++--- config/sway/config | 28 ++++++++++++++++++++++------ config/termite/config | 2 +- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/config/i3/backlight.fish b/config/i3/backlight.fish index ce72c8a..8fc82f1 100755 --- a/config/i3/backlight.fish +++ b/config/i3/backlight.fish @@ -1,5 +1,7 @@ #!/usr/bin/fish -xbacklight $argv[1..-1] +if pidof ddcutil + exit 1 +end set brightness (cat /sys/class/backlight/intel_backlight/brightness) set bar (seq -s "─" 0 (math $brightness / 42) | tr -d '[:digit:]') @@ -18,3 +20,5 @@ else echo $id > "$file" chmod 600 "$file" end + +ddcutil setvcp 10 $brightness diff --git a/config/i3/icons.py b/config/i3/icons.py index a04b230..8dc2d63 100644 --- a/config/i3/icons.py +++ b/config/i3/icons.py @@ -31,7 +31,7 @@ FA_FIREFOX = "\uF269" FA_PICTURE_O = "\uF03E" FA_SPOTIFY = "\uF1BC" FA_TERMINAL = "\uF120" -FA_TELEGRAM = "\uF3FE" +FA_TELEGRAM = "\uE217" FA_CUBE = "\uF1B2" FA_PAINT_BRUSH = "\uF1FC" FA_BOOK = "\uF02D" @@ -45,6 +45,8 @@ FA_COMMENT_ALT = "\uF27A" XORG_ICONS = { "Blender": FA_CUBE, + "Cadence": FA_VOLUME_UP, + "Carla2": FA_VOLUME_UP, "chromium": FA_CHROME, "code": FA_CODE, "code-oss": FA_CODE, diff --git a/config/nvim/init.vim b/config/nvim/init.vim index e8e8496..3434a10 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -8,6 +8,7 @@ Plug 'tweekmonster/startuptime.vim' " UI "Plug 'airblade/vim-gitgutter' " currently broken :( Plug 'Asheq/close-buffers.vim' +Plug 'ctrlpvim/ctrlp.vim' Plug 'haya14busa/incsearch.vim' Plug 'mhinz/vim-startify' Plug 'ryanoasis/vim-devicons' @@ -43,9 +44,6 @@ Plug 'tpope/vim-speeddating' Plug 'tpope/vim-surround' " Language support -"Plug 'landaire/deoplete-swift' -"Plug 'mitsuhiko/vim-jinja' -"Plug 'ryanolsonx/vim-lsp-swift' Plug 'artur-shaik/vim-javacomplete2' Plug 'cespare/vim-toml' Plug 'coc-extensions/coc-svelte' @@ -60,6 +58,7 @@ Plug 'lervag/vimtex' Plug 'martinda/Jenkinsfile-vim-syntax' Plug 'MaxMEllon/vim-jsx-pretty' Plug 'othree/yajs.vim' +Plug 'mitsuhiko/vim-jinja' Plug 'peitalin/vim-jsx-typescript' Plug 'plasticboy/vim-markdown' Plug 'posva/vim-vue' @@ -284,3 +283,7 @@ sunmap ge let g:tex_conceal = 'adgms' set path=$PWD/** + +set wrap linebreak showbreak=↳\ " keep whitespace +set breakindent breakindentopt=shift:4 +let g:ctrlp_map = '' diff --git a/config/sway/config b/config/sway/config index aeca3da..8dd9797 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,16 +1,15 @@ # i3 config file (v4) # # Please see http://i3wm.org/docs/userguide.html for a complete reference! -output * bg /home/sijmen/Pictures/Bureaubladachtergronden/ia4x8geen2z31.jpg fill - # Laptop display output 'Unknown 0x06D7 0x00000000' { scale 2 pos 0 0 subpixel rgb + bg /home/sijmen/Pictures/Bureaubladachtergronden/ia4x8geen2z31.jpg fill } -# Default HDMI to right-of +# Default laptop HDMI to right-of output HDMI-A-2 pos 1920 0 # Screens at parents' @@ -35,11 +34,25 @@ output 'Philips Consumer Electronics Company PHL 272B8Q UK01947014710' { subpixel rgb } +# Home left +output 'Goldstar Company Ltd LG Ultra HD 0x00008520' { + scale 1.3 + position 0 0 + subpixel rgb + bg /home/sijmen/Pictures/malta.jpg fill +} +# Home right +output 'Samsung Electric Company SyncMaster HMAS909662' { + position 2954 700 + subpixel rgb + bg /home/sijmen/Pictures/malta.jpg fill +} + set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Ubuntu, Icons 11 +font pango:Ubuntu, Ubuntu Nerd Font 11 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -175,6 +188,9 @@ bindsym XF86MonBrightnessDown exec --no-startup-id ~/.config/i3/backlight. bindsym Shift+XF86MonBrightnessUp exec --no-startup-id ~/.config/i3/backlight.fish -inc 2 bindsym Shift+XF86MonBrightnessDown exec --no-startup-id ~/.config/i3/backlight.fish -dec 2 +bindsym $mod+Alt+Up exec --no-startup-id ~/.config/i3/backlight.fish +20 +bindsym $mod+Alt+Down exec --no-startup-id ~/.config/i3/backlight.fish -20 + bindsym XF86AudioRaiseVolume exec --no-startup-id ~/.config/i3/volume.fish -i 5 bindsym XF86AudioLowerVolume exec --no-startup-id ~/.config/i3/volume.fish -d 5 bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id ~/.config/i3/volume.fish -i 2 @@ -189,6 +205,7 @@ bindsym XF86Calculator exec --no-startup-id gnome-calculator bindsym Print exec --no-startup-id grim -g "$(slurp)" - | wl-copy && notify-send --urgency=low "Screenshot taken" bindsym Ctrl+Print exec --no-startup-id grim - | wl-copy && notify-send --urgency=low "Screenshot taken" bindsym Shift+Print exec --no-startup-id grim -g "$(slurp)" /tmp/screenshot.png && wl-copy "/tmp/screenshot.png" && notify-send --urgency=low "Screenshot taken" +bindsym $mod+Shift+s exec --no-startup-id grim -g "$(slurp)" - | wl-copy && notify-send --urgency=low "Screenshot taken" bindsym $mod+Print exec --no-startup-id $HOME/.config/i3/screenrecord.sh for_window [class="^jetbrains-toolbox$"] floating enable @@ -264,10 +281,9 @@ bar { for_window [class="^.*"] border pixel 2 gaps inner 0 -#output * bg /home/sijmen/Pictures/malta.jpg fill exec --no-startup-id sh -c "PYTHONUNBUFFERED=1 python $HOME/.config/i3/icons.py 2>&1 > /tmp/icons.log" focus_follows_mouse no -#exec --no-startup-id redshift -l 52.37:4.889 -t 6500:3000 +exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 input "1739:0:Synaptics_TM3276-031" { dwt disabled diff --git a/config/termite/config b/config/termite/config index be327e5..77e79a2 100644 --- a/config/termite/config +++ b/config/termite/config @@ -1,5 +1,5 @@ [options] -font = Ubuntu Mono 11 +font = Ubuntu Mono 14 [colors] background = #2f343f