From d96d22dbb80dfb4c06bf9e2fb29ec90aad906e9d Mon Sep 17 00:00:00 2001 From: Hactarus Date: Mon, 19 Sep 2022 17:39:14 +0200 Subject: [PATCH 1/6] [zsh] Update oh-my-zsh --- zsh/.oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/.oh-my-zsh b/zsh/.oh-my-zsh index 6d48309..7dcabbe 160000 --- a/zsh/.oh-my-zsh +++ b/zsh/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea +Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0 From be29cd21269c50c361810e7661e6edd987b54675 Mon Sep 17 00:00:00 2001 From: Hactarus Date: Wed, 21 Sep 2022 00:09:04 +0200 Subject: [PATCH 2/6] Add default user --- zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 6d07c97..17b87ab 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -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" From 9a20985744ae10e32f6a7302bf248709bd8d2682 Mon Sep 17 00:00:00 2001 From: Hactarus Date: Mon, 26 Sep 2022 23:12:12 +0200 Subject: [PATCH 3/6] update setup basedir --- setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.sh b/setup.sh index a626b9c..8c662f0 100755 --- a/setup.sh +++ b/setup.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd "$( dirname "$0" )" + # make sure we have pulled in and updated any submodules git submodule init git submodule update From 00c314e16e13b3561f4401210767c9894bce0814 Mon Sep 17 00:00:00 2001 From: Hactarus Date: Mon, 23 Jan 2023 17:11:48 +0100 Subject: [PATCH 4/6] remove outdated info --- zsh/.zshrc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 17b87ab..fe7b47f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -323,7 +323,6 @@ 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,21 +335,6 @@ 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" - -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' From 1e1ce9b03b8b9be9e63ddd2ae2b0e4bac47af33a Mon Sep 17 00:00:00 2001 From: Hactarus Date: Mon, 23 Jan 2023 17:11:53 +0100 Subject: [PATCH 5/6] remove outdated info --- git/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/.gitconfig b/git/.gitconfig index 3c32927..68e525c 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -15,7 +15,7 @@ defaultBranch = main [commit] - gpgsign = true + gpgsign = false [url "ssh://git@gitlab.com"] insteadOf = "https://www.gitlab.com" From 8f5e86c61015a04f485b7eb6372ca6a368545c3b Mon Sep 17 00:00:00 2001 From: Hactarus <859868+Hactarus@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:47:54 +0200 Subject: [PATCH 6/6] add nix update gitconfig improve alacritty --- alacritty/.config/alacritty/alacritty.yml | 11 ++++++----- git/.gitconfig | 8 ++++---- nix/.config/nix/nix.conf | 1 + setup.sh | 1 + zsh/.zshrc | 6 ++++-- 5 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 nix/.config/nix/nix.conf diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 6c3e5a9..330d918 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -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.8 + opacity: "0.9" # Startup Mode (changes require restart) # @@ -88,13 +88,14 @@ env: # # Values for `startup_mode` (macOS only): # - SimpleFullscreen - #startup_mode: Windowed + startup_mode: Maximized # Window title #title: Alacritty # Allow terminal applications to change Alacritty's window title. #dynamic_title: true + # Window class (Linux/BSD only): #class: @@ -110,10 +111,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: 10000 + history: 100000 # Scrolling distance multiplier. #multiplier: 3 diff --git a/git/.gitconfig b/git/.gitconfig index 68e525c..4bc9fcb 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,8 +1,8 @@ [user] name = "Hactarus" - email = Hactarus@users.noreply.github.com - + email = "859868+Hactarus@users.noreply.github.com" + signingkey = E78C926AFF8835F1D31D63E0004635081CCE8F11 [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/\\* //'`" @@ -18,10 +18,10 @@ gpgsign = false [url "ssh://git@gitlab.com"] - insteadOf = "https://www.gitlab.com" + insteadOf = "https://gitlab.com" [url "ssh://git@github.com"] - insteadOf = "https://www.github.com" + insteadOf = "https://github.com" [includeIf "gitdir:~/work"] path = .gitconfig-work diff --git a/nix/.config/nix/nix.conf b/nix/.config/nix/nix.conf new file mode 100644 index 0000000..c7d7291 --- /dev/null +++ b/nix/.config/nix/nix.conf @@ -0,0 +1 @@ +experimental-features = nix-command flakes diff --git a/setup.sh b/setup.sh index 8c662f0..f742831 100755 --- a/setup.sh +++ b/setup.sh @@ -12,6 +12,7 @@ base=( helix htop nano + nix puppet ssh terminfo diff --git a/zsh/.zshrc b/zsh/.zshrc index fe7b47f..baa7d44 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -162,6 +162,7 @@ man #n98-magerun nanoc #ng +#nix #nmap node #nomad @@ -186,7 +187,7 @@ postgres #powder #powify #profiles -#pyenv +pyenv pylint python #rails @@ -245,7 +246,7 @@ tmux #ubuntu #urltools #vagrant -#vault +vault #vi-mode #vim-interaction #virtualenv @@ -338,3 +339,4 @@ alias oss='openstack server' alias psa='ps auxwwwf' alias toph='top -cHd1' alias ip="ip --color" +VAULT_ADDR="https://vault.ood.ovh:8200"