Browse Source

Merge remote-tracking branch 'origin/master'

main
Cian Butler 5 months ago
parent
commit
23f828b10e
100 changed files with 37 additions and 80 deletions
  1. +0
    -26
      .codeclimate.yml
  2. +2
    -0
      .gitignore
  3. +0
    -0
      config/kitty/kitty.conf
  4. +0
    -0
      config/libinput-gestures.conf
  5. +0
    -0
      config/nvim/after/ftplugin/c.vim
  6. +0
    -0
      config/nvim/after/ftplugin/cpp.vim
  7. +0
    -0
      config/nvim/after/ftplugin/diff.vim
  8. +0
    -0
      config/nvim/after/ftplugin/diff/prune.vim
  9. +0
    -0
      config/nvim/after/ftplugin/gitcommit.vim
  10. +0
    -0
      config/nvim/after/ftplugin/help.vim
  11. +0
    -0
      config/nvim/after/ftplugin/html.vim
  12. +0
    -0
      config/nvim/after/ftplugin/mail.vim
  13. +0
    -0
      config/nvim/after/ftplugin/make.vim
  14. +0
    -0
      config/nvim/after/ftplugin/make/target.vim
  15. +0
    -0
      config/nvim/after/ftplugin/markdown.vim
  16. +0
    -0
      config/nvim/after/ftplugin/perl.vim
  17. +0
    -0
      config/nvim/after/ftplugin/perl/version_bump.vim
  18. +0
    -0
      config/nvim/after/ftplugin/php.vim
  19. +0
    -0
      config/nvim/after/ftplugin/sh.vim
  20. +0
    -0
      config/nvim/after/ftplugin/text.vim
  21. +0
    -0
      config/nvim/after/ftplugin/vim.vim
  22. +0
    -0
      config/nvim/after/ftplugin/zsh.vim
  23. +0
    -0
      config/nvim/after/indent/html.vim
  24. +0
    -0
      config/nvim/after/indent/vim.vim
  25. +0
    -0
      config/nvim/after/syntax/bindzone.vim
  26. +0
    -0
      config/nvim/after/syntax/gitcommit.vim
  27. +0
    -0
      config/nvim/after/syntax/messages.vim
  28. +0
    -0
      config/nvim/after/syntax/sh.vim
  29. +0
    -0
      config/nvim/autoload/colon_operator.vim
  30. +0
    -0
      config/nvim/autoload/diff.vim
  31. +0
    -0
      config/nvim/autoload/diff/prune.vim
  32. +0
    -0
      config/nvim/autoload/digraph_search.vim
  33. +0
    -0
      config/nvim/autoload/gitcommit.vim
  34. +0
    -0
      config/nvim/autoload/html.vim
  35. +0
    -0
      config/nvim/autoload/mail.vim
  36. +0
    -0
      config/nvim/autoload/make/target.vim
  37. +0
    -0
      config/nvim/autoload/perl.vim
  38. +0
    -0
      config/nvim/autoload/perl/version/bump.vim
  39. +0
    -0
      config/nvim/autoload/put_blank_lines.vim
  40. +0
    -0
      config/nvim/autoload/quote.vim
  41. +0
    -0
      config/nvim/autoload/repeat.vim
  42. +0
    -0
      config/nvim/autoload/replace_operator.vim
  43. +0
    -0
      config/nvim/autoload/shebang_create_exec.vim
  44. +0
    -0
      config/nvim/autoload/squeeze_repeat_blanks.vim
  45. +0
    -0
      config/nvim/autoload/vertical_region.vim
  46. +0
    -0
      config/nvim/autoload/vimrc.vim
  47. +0
    -0
      config/nvim/compiler/bash.vim
  48. +0
    -0
      config/nvim/compiler/ksh.vim
  49. +0
    -0
      config/nvim/compiler/perlcritic.vim
  50. +0
    -0
      config/nvim/compiler/php.vim
  51. +0
    -0
      config/nvim/compiler/sh.vim
  52. +0
    -0
      config/nvim/compiler/shellcheck.vim
  53. +0
    -0
      config/nvim/compiler/vint.vim
  54. +0
    -0
      config/nvim/compiler/zsh.vim
  55. +0
    -0
      config/nvim/filetype.vim
  56. +0
    -0
      config/nvim/ftdetect/javascript.vim
  57. +0
    -0
      config/nvim/ftdetect/viml.vim
  58. +0
    -0
      config/nvim/ftdetect/xresources.vim
  59. +0
    -0
      config/nvim/ftdetect/yaml.vim
  60. +0
    -0
      config/nvim/ftdetect/zsh.vim
  61. +0
    -0
      config/nvim/ftplugin/apache.vim
  62. +0
    -0
      config/nvim/ftplugin/awk.vim
  63. +0
    -0
      config/nvim/ftplugin/csv.vim
  64. +0
    -0
      config/nvim/ftplugin/javascript/config.vim
  65. +0
    -0
      config/nvim/ftplugin/javascript/lebab.vim
  66. +0
    -0
      config/nvim/ftplugin/json.vim
  67. +0
    -0
      config/nvim/ftplugin/markdown.vim
  68. +0
    -0
      config/nvim/ftplugin/password.vim
  69. +0
    -0
      config/nvim/ftplugin/sed.vim
  70. +0
    -0
      config/nvim/ftplugin/terraform.vim
  71. +0
    -0
      config/nvim/ftplugin/tmux.vim
  72. +0
    -0
      config/nvim/ftplugin/tsv.vim
  73. +0
    -0
      config/nvim/indent/csv.vim
  74. +0
    -0
      config/nvim/indent/html.vim
  75. +0
    -0
      config/nvim/indent/password.vim
  76. +0
    -0
      config/nvim/indent/tsv.vim
  77. +0
    -0
      config/nvim/init.vim
  78. +0
    -0
      config/nvim/plug.vim
  79. +0
    -0
      config/nvim/plugin/airline.vim
  80. +11
    -0
      config/nvim/plugin/ale.vim
  81. +0
    -0
      config/nvim/plugin/completion.vim
  82. +0
    -0
      config/nvim/plugin/findRm.vim
  83. +0
    -0
      config/nvim/plugin/hipster.vim
  84. +0
    -0
      config/nvim/plugin/indent.vim
  85. +0
    -0
      config/nvim/plugin/nerdtree.vim
  86. +0
    -0
      config/nvim/plugin/shebang_create_exec.vim
  87. +0
    -0
      config/nvim/plugin/whitespace.vim
  88. +0
    -0
      config/nvim/plugin/wiki.vim
  89. +0
    -0
      config/nvim/scripts.vim
  90. +0
    -0
      config/nvim/system.vim
  91. +0
    -0
      config/nvim/veonim.vim
  92. +0
    -0
      config/polybar/config
  93. +0
    -0
      config/systemd/user/screenlock.service
  94. +2
    -0
      gitconfig
  95. +1
    -1
      powerlevel9k
  96. +0
    -49
      setup.sh
  97. +19
    -2
      ssh/config
  98. +0
    -0
      tmux.conf
  99. +1
    -1
      tmux/plugins/tmux-continuum
  100. +1
    -1
      tmux/plugins/tmux-resurrect

+ 0
- 26
.codeclimate.yml View File

@@ -1,26 +0,0 @@
engines:
fixme:
enabled: true
pep8:
enabled: true
checks:
E501:
enabled: false
E302:
enabled: false
radon:
enabled: true
checks:
Complexity:
enabled: false
shellcheck:
enabled: true
vint:
enabled: true
ratings:
paths:
- "**.zsh"
- "**.py"
- "**.sh"
- "**.vim"
exclude_paths: ["./weechat", "./nvm", "./powerlevel9k"]

+ 2
- 0
.gitignore View File

@@ -232,3 +232,5 @@ Session.vim
# auto-generated tag files
tags
tmux/resurrect
# Ignore ssh private keys
ssh/id_*

kitty.conf → config/kitty/kitty.conf View File


libinput-gestures.conf → config/libinput-gestures.conf View File


vimrc.d/after/ftplugin/c.vim → config/nvim/after/ftplugin/c.vim View File


vimrc.d/after/ftplugin/cpp.vim → config/nvim/after/ftplugin/cpp.vim View File


vimrc.d/after/ftplugin/diff.vim → config/nvim/after/ftplugin/diff.vim View File


vimrc.d/after/ftplugin/diff/prune.vim → config/nvim/after/ftplugin/diff/prune.vim View File


vimrc.d/after/ftplugin/gitcommit.vim → config/nvim/after/ftplugin/gitcommit.vim View File


vimrc.d/after/ftplugin/help.vim → config/nvim/after/ftplugin/help.vim View File


vimrc.d/after/ftplugin/html.vim → config/nvim/after/ftplugin/html.vim View File


vimrc.d/after/ftplugin/mail.vim → config/nvim/after/ftplugin/mail.vim View File


vimrc.d/after/ftplugin/make.vim → config/nvim/after/ftplugin/make.vim View File


vimrc.d/after/ftplugin/make/target.vim → config/nvim/after/ftplugin/make/target.vim View File


vimrc.d/after/ftplugin/markdown.vim → config/nvim/after/ftplugin/markdown.vim View File


vimrc.d/after/ftplugin/perl.vim → config/nvim/after/ftplugin/perl.vim View File


vimrc.d/after/ftplugin/perl/version_bump.vim → config/nvim/after/ftplugin/perl/version_bump.vim View File


vimrc.d/after/ftplugin/php.vim → config/nvim/after/ftplugin/php.vim View File


vimrc.d/after/ftplugin/sh.vim → config/nvim/after/ftplugin/sh.vim View File


vimrc.d/after/ftplugin/text.vim → config/nvim/after/ftplugin/text.vim View File


vimrc.d/after/ftplugin/vim.vim → config/nvim/after/ftplugin/vim.vim View File


vimrc.d/after/ftplugin/zsh.vim → config/nvim/after/ftplugin/zsh.vim View File


vimrc.d/after/indent/html.vim → config/nvim/after/indent/html.vim View File


vimrc.d/after/indent/vim.vim → config/nvim/after/indent/vim.vim View File


vimrc.d/after/syntax/bindzone.vim → config/nvim/after/syntax/bindzone.vim View File


vimrc.d/after/syntax/gitcommit.vim → config/nvim/after/syntax/gitcommit.vim View File


vimrc.d/after/syntax/messages.vim → config/nvim/after/syntax/messages.vim View File


vimrc.d/after/syntax/sh.vim → config/nvim/after/syntax/sh.vim View File


vimrc.d/autoload/colon_operator.vim → config/nvim/autoload/colon_operator.vim View File


vimrc.d/autoload/diff.vim → config/nvim/autoload/diff.vim View File


vimrc.d/autoload/diff/prune.vim → config/nvim/autoload/diff/prune.vim View File


vimrc.d/autoload/digraph_search.vim → config/nvim/autoload/digraph_search.vim View File


vimrc.d/autoload/gitcommit.vim → config/nvim/autoload/gitcommit.vim View File


vimrc.d/autoload/html.vim → config/nvim/autoload/html.vim View File


vimrc.d/autoload/mail.vim → config/nvim/autoload/mail.vim View File


vimrc.d/autoload/make/target.vim → config/nvim/autoload/make/target.vim View File


vimrc.d/autoload/perl.vim → config/nvim/autoload/perl.vim View File


vimrc.d/autoload/perl/version/bump.vim → config/nvim/autoload/perl/version/bump.vim View File


vimrc.d/autoload/put_blank_lines.vim → config/nvim/autoload/put_blank_lines.vim View File


vimrc.d/autoload/quote.vim → config/nvim/autoload/quote.vim View File


vimrc.d/autoload/repeat.vim → config/nvim/autoload/repeat.vim View File


vimrc.d/autoload/replace_operator.vim → config/nvim/autoload/replace_operator.vim View File


vimrc.d/autoload/shebang_create_exec.vim → config/nvim/autoload/shebang_create_exec.vim View File


vimrc.d/autoload/squeeze_repeat_blanks.vim → config/nvim/autoload/squeeze_repeat_blanks.vim View File


vimrc.d/autoload/vertical_region.vim → config/nvim/autoload/vertical_region.vim View File


vimrc.d/autoload/vimrc.vim → config/nvim/autoload/vimrc.vim View File


vimrc.d/compiler/bash.vim → config/nvim/compiler/bash.vim View File


vimrc.d/compiler/ksh.vim → config/nvim/compiler/ksh.vim View File


vimrc.d/compiler/perlcritic.vim → config/nvim/compiler/perlcritic.vim View File


vimrc.d/compiler/php.vim → config/nvim/compiler/php.vim View File


vimrc.d/compiler/sh.vim → config/nvim/compiler/sh.vim View File


vimrc.d/compiler/shellcheck.vim → config/nvim/compiler/shellcheck.vim View File


vimrc.d/compiler/vint.vim → config/nvim/compiler/vint.vim View File


vimrc.d/compiler/zsh.vim → config/nvim/compiler/zsh.vim View File


vimrc.d/filetype.vim → config/nvim/filetype.vim View File


vimrc.d/ftdetect/javascript.vim → config/nvim/ftdetect/javascript.vim View File


vimrc.d/ftdetect/viml.vim → config/nvim/ftdetect/viml.vim View File


vimrc.d/ftdetect/xresources.vim → config/nvim/ftdetect/xresources.vim View File


vimrc.d/ftdetect/yaml.vim → config/nvim/ftdetect/yaml.vim View File


vimrc.d/ftdetect/zsh.vim → config/nvim/ftdetect/zsh.vim View File


vimrc.d/ftplugin/apache.vim → config/nvim/ftplugin/apache.vim View File


vimrc.d/ftplugin/awk.vim → config/nvim/ftplugin/awk.vim View File


vimrc.d/ftplugin/csv.vim → config/nvim/ftplugin/csv.vim View File


vimrc.d/ftplugin/javascript/config.vim → config/nvim/ftplugin/javascript/config.vim View File


vimrc.d/ftplugin/javascript/lebab.vim → config/nvim/ftplugin/javascript/lebab.vim View File


vimrc.d/ftplugin/json.vim → config/nvim/ftplugin/json.vim View File


vimrc.d/ftplugin/markdown.vim → config/nvim/ftplugin/markdown.vim View File


vimrc.d/ftplugin/password.vim → config/nvim/ftplugin/password.vim View File


vimrc.d/ftplugin/sed.vim → config/nvim/ftplugin/sed.vim View File


vimrc.d/ftplugin/terraform.vim → config/nvim/ftplugin/terraform.vim View File


vimrc.d/ftplugin/tmux.vim → config/nvim/ftplugin/tmux.vim View File


vimrc.d/ftplugin/tsv.vim → config/nvim/ftplugin/tsv.vim View File


vimrc.d/indent/csv.vim → config/nvim/indent/csv.vim View File


vimrc.d/indent/html.vim → config/nvim/indent/html.vim View File


vimrc.d/indent/password.vim → config/nvim/indent/password.vim View File


vimrc.d/indent/tsv.vim → config/nvim/indent/tsv.vim View File


vimrc.d/init.vim → config/nvim/init.vim View File


vimrc.d/plug.vim → config/nvim/plug.vim View File


vimrc.d/plugin/airline.vim → config/nvim/plugin/airline.vim View File


vimrc.d/plugin/ale.vim → config/nvim/plugin/ale.vim View File

@@ -18,13 +18,24 @@ let g:ale_fixers = {
\ 'markdown': ['prettier'],
\ 'vimwiki': ['prettier'],
\ 'vue': ['prettier'],
\ 'ansible': ['prettier'],
\ 'puppet': ['puppetlint'],
\ 'java': ['google_java_format']}
let g:ale_fix_on_save = 1
let g:ale_go_gofmt_options = '-s'
let g:ale_go_gometalinter_options = '--enable=gosimple --enable=staticcheck'
let g:ale_rust_cargo_use_clippy = 1
let g:ale_rust_analyzer_config = {
\'rust-analyzer': {
\ 'assist': {
\ 'importMergeBehavior': 'last',
\ 'importPrefix': 'by_self',
\ },
\ 'cargo.loadOutDirsFromCheck': v:true,
\ 'procMacro.enable': v:true }}
let g:ale_linters = {
\ 'go': ['golangci-lint', 'gobuild', 'golint'],
\ 'rust': ['cargo', 'rls'],
\ 'typescript': ['tslint', 'tsserver', 'typecheck']}
let g:ale_completion_enabled = 1
let g:ale_echo_msg_error_str = 'E'

vimrc.d/plugin/completion.vim → config/nvim/plugin/completion.vim View File


vimrc.d/plugin/findRm.vim → config/nvim/plugin/findRm.vim View File


vimrc.d/plugin/hipster.vim → config/nvim/plugin/hipster.vim View File


vimrc.d/plugin/indent.vim → config/nvim/plugin/indent.vim View File


vimrc.d/plugin/nerdtree.vim → config/nvim/plugin/nerdtree.vim View File


vimrc.d/plugin/shebang_create_exec.vim → config/nvim/plugin/shebang_create_exec.vim View File


vimrc.d/plugin/whitespace.vim → config/nvim/plugin/whitespace.vim View File


vimrc.d/plugin/wiki.vim → config/nvim/plugin/wiki.vim View File


vimrc.d/scripts.vim → config/nvim/scripts.vim View File


vimrc.d/system.vim → config/nvim/system.vim View File


vimrc.d/veonim.vim → config/nvim/veonim.vim View File


polybar/config → config/polybar/config View File


screenlock.service → config/systemd/user/screenlock.service View File


+ 2
- 0
gitconfig View File

@@ -81,3 +81,5 @@
rebase = true
[url "git@github.ihs.demonware.net:"]
insteadOf = https://github.ihs.demonware.net
[init]
defaultBranch = main

+ 1
- 1
powerlevel9k

@@ -1 +1 @@
Subproject commit f6c24d2053fe7746a33791b3f366e039caa3058a
Subproject commit 8d1daa4e6340b1689bf951730489bc64c52220c7

+ 0
- 49
setup.sh View File

@@ -1,49 +0,0 @@
#!/usr/bin/env sh

set -ex

git clone https://github.com/butlerx/dotfiles.git "$HOME/.dotfiles"
# nvim or vim
which nvim
NVIM_INSTALL=$?
mkdir -p "${XDG_CONFIG_HOME:=$HOME/.config}"
if [ $NVIM_INSTALL -eq 0 ]; then
ln -s "$HOME/.dotfiles/vimrc.d" "$XDG_CONFIG_HOME/nvim"
nvim +qall
else
ln -s "$HOME/.dotfiles/vimrc.d" "$XDG_CONFIG_HOME/.vim"
ln -s "$XDG_CONFIG_HOME/.vim/init.vim" "$HOME/.vimrc"
vim +qall
fi
# zsh
ln -s "$HOME/.dotfiles/zshrc" "$HOME/.zshrc"
cd "$HOME/.dotfiles" || exit
git submodule init
git submodule update
# tmux
ln -s "$HOME/.dotfiles/tmux/tmux.conf" "$HOME/.tmux.conf"
pip install --user psutil
tmux source-file "$HOME/.tmux.conf"
# weechat
ln -s "$HOME/.dotfiles/weechat" "$HOME/.weechat"
# Git
ln -s "$HOME/.dotfiles/gitconfig" "$HOME/.gitconfig"
echo "Enter Github username: "
read -r GITHUB_USER
echo "Enter Github email: "
read -r GITHUB_EMAIL
git config --global user.name "$GITHUB_USER"
git config --global github.user "$GITHUB_USER"
git config --global user.name "$GITHUB_EMAIL"
# X11
echo "Do you use i3? (y/N)"
read -r answer
if echo "$answer" | grep -iq "^y"; then
ln -s "$HOME/.dotfiles/xinitrc" "$HOME/.xinitrc"
ln -s "$HOME/.dotfiles/i3" "$HOME/.i3"
ln -s "$HOME/.dotfiles/polybar" "$HOME/.config/polybar/config"
git clone https://github.com/butlerx/bash-bin.git "$HOME/bin"
echo "This setup uses rofi, polybar, nautalis and feh which youll need to setup with your package manager"
else
echo "To each there own"
fi

sshconfig → ssh/config View File

@@ -1,3 +1,7 @@
Host *
ServerAliveInterval 30
ServerAliveCountMax 2

Host pyg
HostName pyg.redbrick.dcu.ie
user butlerx
@@ -72,7 +76,7 @@ Host gobut.me
HostName login.gobut.me
user butlerx

Host *.demonware.net
Host *.las.demonware.net
User cbutler
IdentityFile ~/.ssh/id_rsa.dw

@@ -80,10 +84,23 @@ Host las*
User cbutler
IdentityFile ~/.ssh/id_rsa.dw

Host tat*
Host 10.8.*.* *.gcp.demonware.net
User ext_cbutler_demonware_net
IdentityFile ~/.ssh/id_rsa.dw
StrictHostKeyChecking no
ServerAliveInterval 60
ForwardAgent yes

Host *.sha.demonware.net
User cbutler
IdentityFile ~/.ssh/id_rsa.dw

Host sha*
User cbutler
IdentityFile ~/.ssh/id_rsa.dw

Host las61356
KexAlgorithms +diffie-hellman-group1-sha1

Host las44466
KexAlgorithms +diffie-hellman-group1-sha1

tmux/tmux.conf → tmux.conf View File


+ 1
- 1
tmux/plugins/tmux-continuum

@@ -1 +1 @@
Subproject commit 90f4a00c41de094864dd4e29231253bcd80d4409
Subproject commit 3845e73f94460d0e3cd4c047402777046baf9cfe

+ 1
- 1
tmux/plugins/tmux-resurrect

@@ -1 +1 @@
Subproject commit 7c77c70483b818d331e46c4cf64c716ded09a152
Subproject commit abbc4fbfc4a51948478d6b05f0c0d554111663a8

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save