Compare commits

..

No commits in common. "main" and "dev/hactarus/master" have entirely different histories.

6 changed files with 30 additions and 21 deletions

View file

@ -71,13 +71,13 @@ env:
# Values for `decorations` (macOS only):
# - transparent: Title bar, transparent background and title bar buttons
# - buttonless: Title bar, transparent background and no title bar buttons
decorations: none
#decorations: none
# Background opacity
#
# Window opacity as a floating point number from `0.0` to `1.0`.
# The value `0.0` is completely transparent and `1.0` is opaque.
opacity: "0.9"
#opacity: 0.8
# Startup Mode (changes require restart)
#
@ -88,14 +88,13 @@ env:
#
# Values for `startup_mode` (macOS only):
# - SimpleFullscreen
startup_mode: Maximized
#startup_mode: Windowed
# Window title
#title: Alacritty
# Allow terminal applications to change Alacritty's window title.
#dynamic_title: true
# Window class (Linux/BSD only):
#class:
@ -111,10 +110,10 @@ env:
# the default theme variant.
#decorations_theme_variant: None
scrolling:
#scrolling:
# Maximum number of lines in the scrollback buffer.
# Specifying '0' will disable scrolling.
history: 100000
#history: 10000
# Scrolling distance multiplier.
#multiplier: 3

View file

@ -1,8 +1,8 @@
[user]
name = "Hactarus"
email = "859868+Hactarus@users.noreply.github.com"
signingkey = E78C926AFF8835F1D31D63E0004635081CCE8F11
email = Hactarus@users.noreply.github.com
[alias]
pushdev = !git push --set-upstream origin "`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`:dev/hactarus/`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`"
@ -15,13 +15,13 @@
defaultBranch = main
[commit]
gpgsign = false
gpgsign = true
[url "ssh://git@gitlab.com"]
insteadOf = "https://gitlab.com"
insteadOf = "https://www.gitlab.com"
[url "ssh://git@github.com"]
insteadOf = "https://github.com"
insteadOf = "https://www.github.com"
[includeIf "gitdir:~/work"]
path = .gitconfig-work

View file

@ -1 +0,0 @@
experimental-features = nix-command flakes

View file

@ -1,7 +1,5 @@
#!/usr/bin/env bash
cd "$( dirname "$0" )"
# make sure we have pulled in and updated any submodules
git submodule init
git submodule update
@ -12,7 +10,6 @@ base=(
helix
htop
nano
nix
puppet
ssh
terminfo

@ -1 +1 @@
Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0
Subproject commit 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea

View file

@ -2,7 +2,7 @@ export PATH=$HOME/bins/toolbox:$HOME/.local/bin:/usr/local/bin:$HOME/.pyenv/bin:
export ZSH=$HOME/.oh-my-zsh
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="agnoster"
DEFAULT_USER=$USER
# CASE_SENSITIVE="true"
# HYPHEN_INSENSITIVE="true"
DISABLE_AUTO_UPDATE="true"
@ -162,7 +162,6 @@ man
#n98-magerun
nanoc
#ng
#nix
#nmap
node
#nomad
@ -187,7 +186,7 @@ postgres
#powder
#powify
#profiles
pyenv
#pyenv
pylint
python
#rails
@ -246,7 +245,7 @@ tmux
#ubuntu
#urltools
#vagrant
vault
#vault
#vi-mode
#vim-interaction
#virtualenv
@ -324,6 +323,7 @@ status() {
alias kbe='setxkbmap be'
alias kus='setxkbmap us'
alias meteo='curl -4 http://wttr.in/Roubaix'
alias dl='wget -r -k -T 5 -t 2 -U '\''Mozilla/5.0 (X11; Linux x86_64; rv:35.0) Gecko/20100101 Firefox/35.0'\'' '
alias egrep='egrep --color=auto'
alias fgrep='fgrep --color=auto'
@ -336,7 +336,21 @@ alias ll='ls -lah'
alias osj='openstack -f json'
alias osc='openstack console log show'
alias oss='openstack server'
alias pass='tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs'
alias paste='pastebin -m -n Hactar'
alias psa='ps auxwwwf'
alias toph='top -cHd1'
alias vdir='vdir --color=auto'
alias ip="ip --color"
VAULT_ADDR="https://vault.ood.ovh:8200"
alias gw01='z3 gw01.infra.mps.gs.ovh.net'
alias hr-admin='z3 root@hr-admin.rungs.ovh'
alias public='z3 root@public01.infra.gs.ovh.net'
alias thot_cloudweb-robot-preprod='thot '\''wss://thot.ovh.com/tail/?tk=c89ec346-ce0d-4504-b69b-b3c216e91385'\'''
alias thot_reseller-robot-preprod='thot '\''wss://thot.ovh.com/tail/?tk=e4bdf746-d041-41d3-81a5-7e4629d3e507'\'''
alias m5='sm3 ovh@mozg-mutu5.ovh.ha.ovh.net'
alias melt='sm3 gs@mozg-meltingpot.ovh.ha.ovh.net'
alias mis='sm3 mozg-mis.ovh.ha.ovh.net'
alias logalert='sm3 --osh logovh --log alert | grep -E "MUTU|INTERNE|CLOUDWEB"'
alias evilssh='ssh sm3.ovh.net -- --osh selfForgetHostKey --host mis-reseller.lb.engine.ha.ovh.net --port 10666 && ssh -t sm3.ovh.net -- root@mis-reseller.lb.engine.ha.ovh.net -p 10666'
alias c='connect'