Browse Source

speling is difikult

main
Cian Butler 2 months ago
parent
commit
40d9e2aac0
Signed by: butlerx GPG Key ID: B37CA765BAA89170
20 changed files with 340 additions and 39 deletions
  1. +18
    -0
      config/autorandr/docked/config
  2. +50
    -0
      config/autorandr/docked/postswitch
  3. +3
    -0
      config/autorandr/docked/setup
  4. +14
    -0
      config/autorandr/home/config
  5. +51
    -0
      config/autorandr/home/postswitch
  6. +2
    -0
      config/autorandr/home/setup
  7. +11
    -0
      config/autorandr/mobile/config
  8. +42
    -0
      config/autorandr/mobile/postswitch
  9. +1
    -0
      config/autorandr/mobile/setup
  10. +14
    -0
      config/autorandr/standing-desk/config
  11. +51
    -0
      config/autorandr/standing-desk/postswitch
  12. +2
    -0
      config/autorandr/standing-desk/setup
  13. +29
    -0
      config/nvim/autoload/plugins.vim
  14. +0
    -5
      config/nvim/filetype.vim
  15. +5
    -0
      config/nvim/ftdetect/markdown.vim
  16. +0
    -2
      config/nvim/init.lua
  17. +11
    -31
      config/nvim/lua/plugins.lua
  18. +34
    -0
      config/nvim/plugin/git.lua
  19. +1
    -1
      powerlevel9k
  20. +1
    -0
      tmux.conf

+ 18
- 0
config/autorandr/docked/config View File

@@ -0,0 +1,18 @@
output HDMI-1
off
output DP-1
crtc 1
mode 2560x1440
pos 0x0
rate 59.95
rotate left
output DP-2
crtc 2
mode 3840x2160
pos 1440x284
rate 60.00
output eDP-1
crtc 0
mode 1920x1080
pos 5280x824
rate 60.05

+ 50
- 0
config/autorandr/docked/postswitch View File

@@ -0,0 +1,50 @@
#!/usr/bin/env bash

if [[ $DEBUG == 'true' ]]; then
set -euxo pipefail
else
set -euo pipefail
fi
IFS=$'\n\t'

kill_polybar() {
pkill polybar || true
# Wait until the processes have been shut down
while pgrep -x polybar >/dev/null; do sleep 1; done
}

move_ws() {
WORKSPACE=$1
DIRECTION=$2
i3-msg workspace "$WORKSPACE"
i3-msg move workspace to output "$DIRECTION"
}

start_bar() {
export MONITOR=$1
BAR=$2
polybar --reload "$BAR" </dev/null >"/var/tmp/polybar-$MONITOR.log" 2>&1 &
}

set_wallpaper() {
SCREEN=$1
MODE=$2
IMAGE=$3
nitrogen --head="$SCREEN" --set-"$MODE" --save ~/pictures/wallpapers/"$IMAGE"
}

postswitch() {
kill_polybar
set_wallpaper 0 scaled IMG_20190901_161515-PANO.jpg
set_wallpaper 1 auto IMG_20190903_163002-EFFECTS.jpg
set_wallpaper 2 zoom-fill IMG_20190730_155936-PANO.jpg
(
flock 200
start_bar eDP-1 1080p
start_bar DP-2 4k
) 200>/var/tmp/polybar-launch.lock

move_ws 2 left
}

postswitch

+ 3
- 0
config/autorandr/docked/setup View File

@@ -0,0 +1,3 @@
DP-1 00ffffffffffff0010ac9c41574c4541041d0104a53c22783eee95a3544c99260f5054a54b00714f8180a940d1c00101010101010101565e00a0a0a029503020350055502100001a000000ff00483531584b53320a2020202020000000fc0044454c4c20553237313944430a000000fd00384c1e5a19010a202020202020013502031cf14f90050403020716010611121513141f23097f0783010000023a801871382d40582c450055502100001e7e3900a080381f4030203a0055502100001a011d007251d01e206e28550055502100001ebf1600a08038134030203a0055502100001a00000000000000000000000000000000000000000000000000000012
DP-2 00ffffffffffff0010acef4049313830031c0103803e2278ea08a5a2574fa2280f5054a54b00d1c0a94081808100714fe1000101010108e80030f2705a80b0588a006d552100001e000000ff004a34324d43383149303831490a000000fc0044454c4c205332383137510a20000000fd001d4b1f8c3c000a202020202020011102033bf15561605f5e5d101f200514041312110302161507060123090707830100006d030c001000003c20006001020367d85dc40178c003e20f0304740030f2705a80b0588a006d552100001e4d6c80a070703e8030203a006d552100001a565e00a0a0a02950302035006d552100001a00000000000000000000000000001f
eDP-1 00ffffffffffff0006af3d3100000000001a0104a51f1178028d15a156529d280a505400000001010101010101010101010101010101143780b87038244010103e0035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30332e31200a003b

+ 14
- 0
config/autorandr/home/config View File

@@ -0,0 +1,14 @@
output HDMI-1
off
output DP-2
off
output DP-1
crtc 1
mode 2560x1440
pos 0x0
rate 59.95
output eDP-1
crtc 0
mode 1920x1080
pos 2560x360
rate 60.05

+ 51
- 0
config/autorandr/home/postswitch View File

@@ -0,0 +1,51 @@
#!/usr/bin/env bash

if [[ $DEBUG == 'true' ]]; then
set -euxo pipefail
else
set -euo pipefail
fi
IFS=$'\n\t'

move_ws() {
WORKSPACE=$1
DIRECTION=$2
i3-msg workspace "$WORKSPACE"
i3-msg move workspace to output "$DIRECTION"
}

kill_polybar() {
pkill polybar || true
# Wait until the processes have been shut down
while pgrep -x polybar >/dev/null; do sleep 1; done
}

start_bar() {
export MONITOR=$1
BAR=$2
polybar --reload "$BAR" </dev/null >"/var/tmp/polybar-$MONITOR.log" 2>&1 &
}

set_wallpaper() {
SCREEN=$1
MODE=$2
IMAGE=$3
nitrogen --head="$SCREEN" --set-"$MODE" --save ~/pictures/wallpapers/"$IMAGE"
}

postswitch() {
kill_polybar
set_wallpaper 1 scaled IMG_20190901_161515-PANO.jpg
set_wallpaper 0 auto EFFECTS.jpg
(
flock 200
start_bar DP-1 1080p
start_bar eDP-1 1080p
) 200>/var/tmp/polybar-launch.lock

move_ws 1 left
move_ws 2 left
move_ws 3 left
}

postswitch

+ 2
- 0
config/autorandr/home/setup View File

@@ -0,0 +1,2 @@
DP-1 00ffffffffffff0010ac9c41574c4541041d0104a53c22783eee95a3544c99260f5054a54b00714f8180a940d1c00101010101010101565e00a0a0a029503020350055502100001a000000ff00483531584b53320a2020202020000000fc0044454c4c20553237313944430a000000fd00384c1e5a19010a202020202020013502031cf14f90050403020716010611121513141f23097f0783010000023a801871382d40582c450055502100001e7e3900a080381f4030203a0055502100001a011d007251d01e206e28550055502100001ebf1600a08038134030203a0055502100001a00000000000000000000000000000000000000000000000000000012
eDP-1 00ffffffffffff0006af3d3100000000001a0104a51f1178028d15a156529d280a505400000001010101010101010101010101010101143780b87038244010103e0035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30332e31200a003b

+ 11
- 0
config/autorandr/mobile/config View File

@@ -0,0 +1,11 @@
output HDMI-1
off
output DP-1
off
output DP-2
off
output eDP-1
crtc 0
mode 1920x1080
pos 5280x824
rate 60.05

+ 42
- 0
config/autorandr/mobile/postswitch View File

@@ -0,0 +1,42 @@
#!/usr/bin/env bash

if [[ $DEBUG == 'true' ]]; then
set -euxo pipefail
else
set -euo pipefail
fi
IFS=$'\n\t'

kill_polybar() {
pkill polybar || true
# Wait until the processes have been shut down
while pgrep -x polybar >/dev/null; do sleep 1; done
}

set_wallpaper() {
SCREEN=$1
MODE=$2
IMAGE=$3
nitrogen --head="$SCREEN" --set-"$MODE" --save ~/pictures/wallpapers/"$IMAGE"
}

start_bar() {
export MONITOR=$1
BAR=$2
polybar --reload "$BAR" </dev/null >"/var/tmp/polybar-$MONITOR.log" 2>&1 &
}

status_bar() {
kill_polybar
(
flock 200
start_bar eDP-1 1080p
) 200>/var/tmp/polybar-launch.lock
}

postswitch() {
set_wallpaper 0 auto EFFECTS.jpg
status_bar
}

postswitch

+ 1
- 0
config/autorandr/mobile/setup View File

@@ -0,0 +1 @@
eDP-1 00ffffffffffff0006af3d3100000000001a0104a51f1178028d15a156529d280a505400000001010101010101010101010101010101143780b87038244010103e0035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30332e31200a003b

+ 14
- 0
config/autorandr/standing-desk/config View File

@@ -0,0 +1,14 @@
output eDP-1
off
output DP-1
off
output DP-2
crtc 2
mode 2560x1440
pos 0x0
rate 59.95
output HDMI-1
crtc 0
mode 1680x1050
pos 2560x0
rate 59.95

+ 51
- 0
config/autorandr/standing-desk/postswitch View File

@@ -0,0 +1,51 @@
#!/usr/bin/env bash

if [[ $DEBUG == 'true' ]]; then
set -euxo pipefail
else
set -euo pipefail
fi
IFS=$'\n\t'

move_ws() {
WORKSPACE=$1
DIRECTION=$2
i3-msg workspace "$WORKSPACE"
i3-msg move workspace to output "$DIRECTION"
}

kill_polybar() {
pkill polybar || true
# Wait until the processes have been shut down
while pgrep -x polybar >/dev/null; do sleep 1; done
}

start_bar() {
export MONITOR=$1
BAR=$2
polybar --reload "$BAR" </dev/null >"/var/tmp/polybar-$MONITOR.log" 2>&1 &
}

set_wallpaper() {
SCREEN=$1
MODE=$2
IMAGE=$3
nitrogen --head="$SCREEN" --set-"$MODE" --save ~/pictures/wallpapers/"$IMAGE"
}

postswitch() {
kill_polybar
set_wallpaper 1 scaled IMG_20190901_161515-PANO.jpg
set_wallpaper 0 auto EFFECTS.jpg
(
flock 200
start_bar DP-2 1080p
start_bar HDMI-1 1080p
) 200>/var/tmp/polybar-launch.lock

move_ws 1 left
move_ws 2 left
move_ws 3 left
}

postswitch

+ 2
- 0
config/autorandr/standing-desk/setup View File

@@ -0,0 +1,2 @@
DP-2 00ffffffffffff0010ac9c41574c4541041d0104a53c22783eee95a3544c99260f5054a54b00714f8180a940d1c00101010101010101565e00a0a0a029503020350055502100001a000000ff00483531584b53320a2020202020000000fc0044454c4c20553237313944430a000000fd00384c1e5a19010a202020202020013502031cf14f90050403020716010611121513141f23097f0783010000023a801871382d40582c450055502100001e7e3900a080381f4030203a0055502100001a011d007251d01e206e28550055502100001ebf1600a08038134030203a0055502100001a00000000000000000000000000000000000000000000000000000012
HDMI-1 00ffffffffffff001d6522000800000032140103802b1b78ea37a0a655489a26125054afcf00b30095008bc081807140714a8140814a21399030621a274068b03600dac41000001a000000ff0030303030303030380a20202020000000fd00384c1f5011000a202020202020000000fc0053574d32320a20202020202020001e

+ 29
- 0
config/nvim/autoload/plugins.vim View File

@@ -0,0 +1,29 @@
" load vim-plug if it does not exist in the dotfiles
function! plugins#PlugLoad()
let plugFile = stdpath('data') . '/site/autoload/plug.vim'
if empty(glob(plugFile))
if executable('curl')
echom 'Installing vim-plug at ' . plugFile
let plugURL = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
if v:shell_error
echom "Error downloading vim-plug. Please install it manually.\n"
exit
endif
silent execute '!curl -fLo ' . plugFile . ' --create-dirs ' . plugURL
augroup pluginstall
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
augroup END
else
echom "vim-plug not installed. Please install it manually or install curl.\n"
exit
endif
endif
endfunction

augroup autoinstallplugins
autocmd!
autocmd VimEnter *
\ if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
\| PlugInstall --sync | q
\| endif
augroup END

+ 0
- 5
config/nvim/filetype.vim View File

@@ -148,11 +148,6 @@ augroup filetypedetect
\ Makefile
\,makefile
\ setfiletype make
" Markdown files
autocmd BufNewFile,BufRead
\ ?*.markdown
\,?*.md
\ setfiletype markdown
" Mutt configuration files
autocmd BufNewFile,BufRead
\ Muttrc


+ 5
- 0
config/nvim/ftdetect/markdown.vim View File

@@ -0,0 +1,5 @@
" Markdown files
autocmd BufNewFile,BufRead
\ ?*.markdown
\,?*.md
\ setfiletype markdown

+ 0
- 2
config/nvim/init.lua View File

@@ -116,7 +116,6 @@ set.ttimeoutlen = 10000
-- Keep undo files, hopefully in a dedicated directory
if fn.has "persistent_undo" then
set.undofile = true
set.undodir:append { "~/.vim/cache/undo//" }
end

-- Number of undo levels
@@ -147,7 +146,6 @@ set.showcmd = true
set.showmatch = true -- Highlight matching brace
set.smartcase = true -- Enable smart-case search
vim.cmd [[set termencoding=utf-8]]
set.textwidth = 100 -- Line wrap (number of cols)
set.visualbell = true -- Use visual bell (no beeping)

-- Delete Selected word from whole file


+ 11
- 31
config/nvim/lua/plugins.lua View File

@@ -1,63 +1,42 @@
vim.cmd [[
let plugpath = '~/.local/share/nvim/site/autoload/plug.vim'
if empty(glob(plugpath))
if executable('curl')
echom "Installing vim-plug at " . plugpath
let plugurl = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
call system('curl -fLo ' . shellescape(plugpath) . ' --create-dirs ' . plugurl)
if v:shell_error
echom "Error downloading vim-plug. Please install it manually.\n"
exit
endif
augroup Plugins
au!
au VimEnter * PlugInstall | source $MYVIMRC
else
echom "vim-plug not installed. Please install it manually or install curl.\n"
exit
endif
endif
]]

local Plug = vim.fn["plug#"]

vim.call "plugins#PlugLoad"
vim.call("plug#begin", "~/.local/share/nvim")

Plug "Xuyuanp/nerdtree-git-plugin"
Plug "Yggdroot/indentLine"
Plug("cespare/vim-toml", { ["for"] = "toml" })
Plug("chrisbra/csv.vim", { ["for"] = "csv" })
Plug "christoomey/vim-tmux-navigator"
Plug "dense-analysis/ale"
Plug "nathanmsmith/nvim-ale-diagnostic"
Plug("ekalinin/Dockerfile.vim", { ["for"] = [['Dockerfile', 'docker-compose']] })
Plug "elzr/vim-json"
Plug("fatih/vim-go", { ["do"] = ":GoInstallBinaries", ["for"] = [['go', 'gohtmltmpl']] })
Plug "godlygeek/tabular"
Plug "plasticboy/vim-markdown"
Plug "google/vim-jsonnet"
Plug "gregsexton/gitv"
Plug "hashivim/vim-terraform"
Plug "hrsh7th/cmp-buffer"
Plug "hrsh7th/nvim-cmp"
Plug "hrsh7th/vim-vsnip"
Plug "hrsh7th/cmp-buffer"
Plug("leafgarland/typescript-vim", {
["for"] = [['typescript.tsx', 'typescriptreact', 'typescript',
'vue']],
})
Plug "mhinz/vim-signify"
Plug "kabouzeid/nvim-lspinstall"
Plug("leafgarland/typescript-vim", { ["for"] = [['typescript.tsx', 'typescriptreact', 'typescript', 'vue']] })
Plug "lewis6991/gitsigns.nvim"
Plug "mhinz/vim-startify"
Plug "moll/vim-node"
Plug "nathanmsmith/nvim-ale-diagnostic"
Plug "neovim/nvim-lspconfig"
Plug "kabouzeid/nvim-lspinstall"
Plug "nvim-lua/plenary.nvim"
Plug("nvim-treesitter/nvim-treesitter", { ["branch"] = "0.5-compat", ["do"] = ":TSUpdate" })
Plug 'nvim-treesitter/nvim-treesitter-refactor'
Plug("pangloss/vim-javascript", { ["for"] = [['typescript.tsx', 'typescriptreact', 'javascript', 'vue']] })
Plug "plasticboy/vim-markdown"
Plug("racer-rust/vim-racer", { ["for"] = "rust" })
Plug "rodjek/vim-puppet"
Plug("rust-lang/rust.vim", { ["for"] = "rust" })
Plug "ryanoasis/vim-devicons"
Plug "scrooloose/nerdcommenter"
Plug "scrooloose/nerdtree"
Plug "Xuyuanp/nerdtree-git-plugin"
Plug "sheerun/vim-polyglot"
Plug "sickill/vim-monokai"
Plug "tpope/vim-fugitive"


+ 34
- 0
config/nvim/plugin/git.lua View File

@@ -0,0 +1,34 @@
require("gitsigns").setup {
signs = {
add = {
hl = "GitSignsAdd",
text = "+",
numhl = "GitSignsAddNr",
linehl = "GitSignsAddLn",
},
change = {
hl = "GitSignsChange",
text = "!",
numhl = "GitSignsChangeNr",
linehl = "GitSignsChangeLn",
},
delete = {
hl = "GitSignsDelete",
text = "_",
numhl = "GitSignsDeleteNr",
linehl = "GitSignsDeleteLn",
},
topdelete = {
hl = "GitSignsDelete",
text = "‾",
numhl = "GitSignsDeleteNr",
linehl = "GitSignsDeleteLn",
},
changedelete = {
hl = "GitSignsChange",
text = "~",
numhl = "GitSignsChangeNr",
linehl = "GitSignsChangeLn",
},
},
}

+ 1
- 1
powerlevel9k

@@ -1 +1 @@
Subproject commit 8d1daa4e6340b1689bf951730489bc64c52220c7
Subproject commit 7a72acf5635cfc09aa544bfb70e13ad46faa432b

+ 1
- 0
tmux.conf View File

@@ -104,6 +104,7 @@ set-window-option -g automatic-rename

# color
set -g default-terminal "screen-256color"
set-option -sa terminal-overrides ',256:RGB'

# Reload vim
set -g @resurrect-strategy-nvim 'session'


Loading…
Cancel
Save