Browse Source

should work now.

main
Cian Butler 5 months ago
parent
commit
8aad93f0e1
Signed by: butlerx GPG Key ID: B37CA765BAA89170
6 changed files with 41 additions and 27 deletions
  1. +2
    -0
      gitconfig
  2. +19
    -2
      sshconfig
  3. +11
    -0
      vimrc.d/plugin/ale.vim
  4. +8
    -5
      zsh.d/aliases.zsh
  5. +0
    -19
      zsh.d/functions.zsh
  6. +1
    -1
      zshrc

+ 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

+ 19
- 2
sshconfig 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

+ 11
- 0
vimrc.d/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'


+ 8
- 5
zsh.d/aliases.zsh View File

@@ -31,11 +31,10 @@ alias lh='ls -d .*' # show hidden files/directories only
alias l='ls -al'
if [[ $IS_LINUX -eq 1 ]]; then
alias lsd='ls -aFhl'
alias ls='ls -Fh --color' # Colorize output, add file type indicator, and put sizes in human readable format
alias ll='ls -Fhl --color' # Same as above, but in long listing format
alias ll='ls -Fhl' # Same as above, but in long listing format
fi
alias ltree="ls -R | grep ":$" | sed -e 's/:$//' -e 's/[^-][^\\/]*\\//--/g' -e 's/^/ /' -e 's/-/|/'"
alias dus='du -sckx * | sort -nr' #directories sorted by size
alias dus='du -sckx * | sort -nr' #directories sorted by size

alias wordy='wc -w * | sort | tail -n10' # sort files in current directory by the number of words they contain
alias filecount='find . -type f | wc -l' # number of files (not directories)
@@ -140,6 +139,7 @@ alias adventure='emacs -batch -l dunnet' # play adventure in the console
alias ttop='top -ocpu -R -F -s 2 -n30' # fancy top
alias rm='rm -i' # make rm command (potentially) less destructive
alias cl='clear'
alias tf='terraform'

# Force tmux to use 256 colors
alias tmux='TERM=screen-256color tmux'
@@ -173,5 +173,8 @@ alias please='sudo'
# probably will break something aliasing common commands
# -------------------------------------------------------------------

alias cat='bat'
alias icat="kitty +kitten icat"
if [[ $IS_LINUX -eq 1 ]]; then
alias cat='bat'
alias icat="kitty +kitten icat"
alias ls='exa -Fh' # Colorize output, add file type indicator, and put sizes in human readable format
fi

+ 0
- 19
zsh.d/functions.zsh View File

@@ -561,25 +561,6 @@ touch.py() {
touch "$@"/__init__.py
}

vpn() {
VPN_URL="https://lassa.demonware.net/dana-na/auth/url_default/welcome.cgi"

while getopts "o" OPTION; do
case $OPTION in
o)
VPN_URL="https://lassa.demonware.net/okta"
;;
*) ;;
esac
done

sudo openconnect \
--servercert=sha256:376185de3cbbeb2f66941d339092e989d6c03fe540f5ace84353e5fd6880215f \
--authgroup="LDAP" --protocol=nc "$VPN_URL" \
--cafile='/etc/ssl/certs/ca-certificates.crt' --no-dtls \
--user=cbutler
}

abbr() {
URL_PARAM=$(echo "$@" | sed "s/ /+/g")
lynx -accept_all_cookies https://www.acronymfinder.com/"$URL_PARAM".html


+ 1
- 1
zshrc View File

@@ -6,7 +6,7 @@ done
fpath=(~/.dotfiles/zsh-completions $fpath)
source "$HOME/.zprofile"

export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$HOME/.deno/bin:$PATH"

# The next line updates PATH for Netlify's Git Credential Helper.
if [ -f '/home/butlerx/.netlify/helper/path.zsh.inc' ]; then


Loading…
Cancel
Save