diff --git a/.gitignore b/.gitignore index c6ef0d2..d991bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ git/.gitconfig-work +zsh/.oh-my-zsh home/ +nano/.cache/nano/* \ No newline at end of file diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..d7ac7c3 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,4 @@ +import = ["/home/qgodefro/.config/alacritty/dracula.toml", "/home/qgodefro/.config/alacritty/qgodefro.toml"] + +[env] +TERM = "xterm-256color" diff --git a/alacritty/.config/alacritty/dracula.toml b/alacritty/.config/alacritty/dracula.toml new file mode 100644 index 0000000..8fb50e3 --- /dev/null +++ b/alacritty/.config/alacritty/dracula.toml @@ -0,0 +1,78 @@ +[colors.bright] +black = "#6272a4" +blue = "#d6acff" +cyan = "#a4ffff" +green = "#69ff94" +magenta = "#ff92df" +red = "#ff6e6e" +white = "#ffffff" +yellow = "#ffffa5" + +[colors.cursor] +cursor = "CellForeground" +text = "CellBackground" + +[colors.footer_bar] +background = "#282a36" +foreground = "#f8f8f2" + +[colors.hints.end] +background = "#282a36" +foreground = "#f1fa8c" + +[colors.hints.start] +background = "#f1fa8c" +foreground = "#282a36" + +[colors.line_indicator] +background = "None" +foreground = "None" + +[colors.normal] +black = "#21222c" +blue = "#bd93f9" +cyan = "#8be9fd" +green = "#50fa7b" +magenta = "#ff79c6" +red = "#ff5555" +white = "#f8f8f2" +yellow = "#f1fa8c" + +[colors.primary] +background = "0x0e1419" +bright_foreground = "#ffffff" +foreground = "0xf8f8f2" + +[colors.search.focused_match] +background = "#ffb86c" +foreground = "#44475a" + +[colors.search.matches] +background = "#50fa7b" +foreground = "#44475a" + +[colors.selection] +background = "#44475a" +text = "CellForeground" + +[colors.vi_mode_cursor] +cursor = "CellForeground" +text = "CellBackground" + +[bell] +color = "0xf8f8f2" + +[font] +size = 8.0 + +[font.bold] +family = "Hack Nerd Font Mono" +style = "Bold" + +[font.normal] +family = "Hack Nerd Font Mono" +style = "Regular" + +[font.offset] +x = 1 +y = 1 diff --git a/alacritty/.config/alacritty/dracula.yml b/alacritty/.config/alacritty/dracula.yml deleted file mode 100644 index a03b708..0000000 --- a/alacritty/.config/alacritty/dracula.yml +++ /dev/null @@ -1,145 +0,0 @@ -abspaces: 4 -font: - # Normal (roman) font face - normal: - # Font family - # - # Default: - # - (macOS) Menlo - # - (Linux/BSD) monospace - # - (Windows) Consolas - family: monospace - - # The `style` can be specified to pick a specific face. - style: Regular - - # Bold font face - bold: - # Font family - # - # If the bold family is not specified, it will fall back to the - # value specified for the normal font. - family: monospace - - # The `style` can be specified to pick a specific face. - style: Bold - - # Italic font face - #italic: - # Font family - # - # If the italic family is not specified, it will fall back to the - # value specified for the normal font. - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Italic - - # Bold italic font face - #bold_italic: - # Font family - # - # If the bold italic family is not specified, it will fall back to the - # value specified for the normal font. - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Bold Italic - - # Point size - # size: 8.0 - - # Offset is the extra space around each character. `offset.y` can be thought of - # as modifying the line spacing, and `offset.x` as modifying the letter spacing. - offset: - x: 1 - y: 1 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increasing `x` moves the glyph to the right, - # increasing `y` moves the glyph upwards. - #glyph_offset: - # x: 0 - # y: 0 - - # Thin stroke font rendering (macOS only) - # - # Thin strokes are suitable for retina displays, but for non-retina screens - # it is recommended to set `use_thin_strokes` to `false` - # - # macOS >= 10.14.x: - # - # If the font quality on non-retina display looks bad then set - # `use_thin_strokes` to `true` and enable font smoothing by running the - # following command: - # `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO` - # - # This is a global setting and will require a log out or restart to take - # effect. - #use_thin_strokes: true - -# If `true`, bold text is drawn using the bright color variants. -#draw_bold_text_with_bright_colors: true - -# Dracula theme for Alacritty -# https://draculatheme.com/alacritty -# -# Color palette -# https://spec.draculatheme.com -# -# Template -# https://github.com/alacritty/alacritty/blob/master/alacritty.yml - - -colors: - primary: - background: "0x0e1419" - bright_foreground: '#ffffff' - foreground: "0xf8f8f2" - normal: - black: '#21222c' - red: '#ff5555' - green: '#50fa7b' - yellow: '#f1fa8c' - blue: '#bd93f9' - magenta: '#ff79c6' - cyan: '#8be9fd' - white: '#f8f8f2' - bright: - black: '#6272a4' - red: '#ff6e6e' - green: '#69ff94' - yellow: '#ffffa5' - blue: '#d6acff' - magenta: '#ff92df' - cyan: '#a4ffff' - white: '#ffffff' - cursor: - text: CellBackground - cursor: CellForeground - vi_mode_cursor: - text: CellBackground - cursor: CellForeground - search: - matches: - foreground: '#44475a' - background: '#50fa7b' - focused_match: - foreground: '#44475a' - background: '#ffb86c' - footer_bar: - background: '#282a36' - foreground: '#f8f8f2' - hints: - start: - foreground: '#282a36' - background: '#f1fa8c' - end: - foreground: '#f1fa8c' - background: '#282a36' - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: '#44475a' diff --git a/alacritty/.config/alacritty/qgodefro.toml b/alacritty/.config/alacritty/qgodefro.toml new file mode 100644 index 0000000..7b5970d --- /dev/null +++ b/alacritty/.config/alacritty/qgodefro.toml @@ -0,0 +1,23 @@ +live_config_reload = true + +[window] +dynamic_padding = true +decorations = 'None' +opacity = 0.8 +dynamic_title = true + +[bell] +animation = "EaseOutQuad" +duration = 150 + +[colors] +draw_bold_text_with_bright_colors = true + +[scrolling] +history = 100000 +multiplier = 3 + +[selection] +save_to_clipboard = true +semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" + diff --git a/alacritty/.config/alacritty/qgodefro.yml b/alacritty/.config/alacritty/qgodefro.yml deleted file mode 100644 index 0f6a2c7..0000000 --- a/alacritty/.config/alacritty/qgodefro.yml +++ /dev/null @@ -1,26 +0,0 @@ -windows: - decorations: none - opacity: 0.8 - dynamic_title: true - dimensions: - columns: 0 - lines: 0 - - class: - general: alacritty - -scrolling: - history: 10000 - multiplier: 1 - -draw_bold_text_with_bright_colors: true - -bell: - animation: EaseOutExpo - duration: 2 - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - save_to_clipboard: true - -live_config_reload: true diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index 3d14dc6..975a92f 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -11,7 +11,7 @@ local naughty = require("naughty") local menubar = require("menubar") local hotkeys_popup = require("awful.hotkeys_popup").widget -local battery_widget = require("awesome.battery-widget/battery-widget") +-- local battery_widget = require("awesome.battery-widget/battery-widget") -- Enable hotkeys help widget for VIM and other apps -- when client with a matching name is opened: require("awful.hotkeys_popup.keys") @@ -19,7 +19,8 @@ require("awful.hotkeys_popup.keys") -- Load Debian menu entries local debian = require("debian.menu") local has_fdo, freedesktop = pcall(require, "freedesktop") -local battery_widget = require("battery-widget") +-- local battery_widget = require("battery-widget") + -- {{{ Error handling -- Check if awesome encountered an error during startup and fell back to -- another config (This code will only ever execute for the fallback config) @@ -51,7 +52,7 @@ beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua") -- This is used later as the default terminal and editor to run. -- terminal = "x-terminal-emulator" -terminal = "~/bins/alacritty/usr/bin/alacritty" +terminal = "/home/qgodefro/.cargo/bin/alacritty" editor = os.getenv("EDITOR") or "editor" editor_cmd = terminal .. " -e " .. editor @@ -62,11 +63,11 @@ editor_cmd = terminal .. " -e " .. editor -- However, you can use another modifier like Mod1, but it may interact with others. modkey = "Mod4" -lain.layout.termfair.center.nmaster = 4 -lain.layout.termfair.center.ncol = 2 +-- lain.layout.termfair.center.nmaster = 4 +-- lain.layout.termfair.center.ncol = 2 -- Table of layouts to cover with awful.layout.inc, order matters. -awful.layout.set(lain.layout.termfair, tag) +-- awful.layout.set(lain.layout.termfair, tag) awful.layout.layouts = { awful.layout.suit.floating, awful.layout.suit.tile, @@ -81,7 +82,7 @@ awful.layout.layouts = { awful.layout.suit.max.fullscreen, awful.layout.suit.magnifier, awful.layout.suit.corner.nw, - lain.layout.termfair, +-- lain.layout.termfair, -- awful.layout.suit.corner.ne, -- awful.layout.suit.corner.sw, -- awful.layout.suit.corner.se, @@ -144,8 +145,6 @@ mykeyboardlayout = awful.widget.keyboardlayout() -- {{{ Wibar -- Create a textclock widget -mytextclock = wibox.widget.textclock() - -- Create a wibox for each screen and add it local taglist_buttons = gears.table.join( awful.button({ }, 1, function(t) t:view_only() end), @@ -204,6 +203,10 @@ end -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) screen.connect_signal("property::geometry", set_wallpaper) +mytextclock = wibox.widget.textclock() +myutcclock = wibox.widget.textclock({format="%H:%m", timezone="UTC"}) +mymtlclock = wibox.widget.textclock({format="%H:%M", timezone="Canada/Montreal"}) + awful.screen.connect_for_each_screen(function(s) -- Wallpaper set_wallpaper(s) @@ -244,6 +247,8 @@ awful.screen.connect_for_each_screen(function(s) layout = wibox.layout.fixed.horizontal, mykeyboardlayout, wibox.widget.systray(), + mymtlclock, + myutcclock, mytextclock, s.mylayoutbox, }, @@ -360,12 +365,13 @@ globalkeys = gears.table.join( {description = "show the menubar", group = "launcher"}) ) + clientkeys = gears.table.join( awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen c:raise() - end, + end , {description = "toggle fullscreen", group = "client"}), awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, {description = "close", group = "client"}), @@ -401,9 +407,10 @@ clientkeys = gears.table.join( c.maximized_horizontal = not c.maximized_horizontal c:raise() end , - {description = "(un)maximize horizontally", group = "client"}) - - awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("/home/qgodefro/.local/bin/lock", false) end) + {description = "(un)maximize horizontally", group = "client"}), + awful.key({ modkey, "Control" }, "l", function (c) + c.util.spawn{"/home/qgodefro/.local/bin/lock", false} + end) ) -- Bind all key numbers to tags. @@ -587,5 +594,5 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} -local battery = battery_widget:new({}) -right_layout:add(battery.widget) +-- local battery = battery_widget:new({}) +-- right_layout:add(battery.widget) diff --git a/git/.gitconfig b/git/.gitconfig index 4bc9fcb..0c7068e 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,8 +1,8 @@ [user] name = "Hactarus" - email = "859868+Hactarus@users.noreply.github.com" - signingkey = E78C926AFF8835F1D31D63E0004635081CCE8F11 + email = Hactarus@users.noreply.github.com + signingkey = 53A726B989BDD7DA617933C0D03D25D1292719AC [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/\\* //'`" diff --git a/git/.gitconfig-github b/git/.gitconfig-github new file mode 100644 index 0000000..cbed5b8 --- /dev/null +++ b/git/.gitconfig-github @@ -0,0 +1,6 @@ +[user] + name = "Hactarus" + email = "859868+Hactarus@users.noreply.github.com" + signingkey = E78C926AFF8835F1D31D63E0004635081CCE8F11 +[commit] + gpgsign = true \ No newline at end of file diff --git a/htop/.config/htop/htoprc b/htop/.config/htop/htoprc new file mode 100644 index 0000000..34ab242 --- /dev/null +++ b/htop/.config/htop/htoprc @@ -0,0 +1,39 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=46 +sort_direction=-1 +tree_sort_key=0 +tree_sort_direction=1 +hide_kernel_threads=0 +hide_userland_threads=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=1 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=0 +tree_view_always_by_pid=1 +header_margin=1 +detailed_cpu_time=1 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=1 +show_cpu_temperature=1 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime DiskIO NetworkIO Battery +right_meter_modes=2 2 2 2 2 2 +hide_function_bar=0 diff --git a/htop/.htop.conf b/htop/.htop.conf deleted file mode 100644 index bb62d49..0000000 --- a/htop/.htop.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=0 -shadow_other_users=0 -show_thread_names=0 -highlight_base_name=0 -highlight_megabytes=1 -highlight_threads=0 -tree_view=0 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -delay=15 -left_meters=LeftCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=RightCPUs Tasks LoadAverage Uptime -right_meter_modes=1 2 2 2 diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 612ae57..2654b33 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -1,5 +1,5 @@ # This file has been auto-generated by i3-config-wizard(1). -# It will 'FiraCode Nerd Font Mono'not be overwritten, so edit it as you like. +# It will not be overwritten, so edit it as you like. # # Should you change your keyboard layout some time, delete # this file and re-run i3-config-wizard(1). @@ -13,8 +13,7 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -#font pango:monospace 8 -font 'FiraCode Nerd Font Mono' 8 +font 'Hack Nerd Font Mono':monospace 8 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -47,10 +46,10 @@ floating_modifier $mod # move tiling windows via drag & drop by left-clicking into the title bar, # or left-clicking anywhere into the window while holding the floating modifier. -tiling_drag modifier titlebar +# tiling_drag modifier titlebar # start a terminal -bindsym $mod+Return exec /etc/profiles/per-user/hactario/bin/alacritty +bindsym $mod+Return exec alacritty # kill focused window bindsym $mod+Shift+a kill @@ -116,15 +115,15 @@ bindsym $mod+q focus parent # Define names for default workspaces for which we configure key bindings later on. # We use variables to avoid repeating the names in multiple places. -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" +set $ws1 "1:Chat" +set $ws2 "2:Main" +set $ws3 "3:Console" set $ws4 "4" set $ws5 "5" set $ws6 "6" set $ws7 "7" set $ws8 "8" -set $ws9 "9" +set $ws9 "9:Spotify" set $ws10 "10" # switch to workspace @@ -185,25 +184,34 @@ mode "resize" { bindsym $mod+r mode "resize" +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + font pango:Hack Nerd Font Mono, FontAwesome 10 + status_command i3status -c ~/.config/i3status/config + position bottom + workspace_buttons yes + # tray_output none + colors { + background #282A36 + statusline #F8F8F2 + separator #44475A + focused_workspace #44475A #44475A #F8F8F2 + active_workspace #282A36 #44475A #F8F8F2 + inactive_workspace #282A36 #282A36 #BFBFBF + urgent_workspace #FF5555 #FF5555 #F8F8F2 + binding_mode #FF5555 #FF5555 #F8F8F2 + } + bindsym --release button3 exec --no-startup-id import ~/screenshot-$(date +%F-%T).png +} + client.focused #6272A4 #6272A4 #F8F8F2 #6272A4 #6272A4 client.focused_inactive #44475A #44475A #F8F8F2 #44475A #44475A client.unfocused #282A36 #282A36 #BFBFBF #282A36 #282A36 client.urgent #44475A #FF5555 #F8F8F2 #FF5555 #FF5555 client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36 + client.background #F8F8F2 -bar { - font 'FiraCode Nerd Font Mono',FontAwesome 12 - position bottom - status_command i3status ~/.config/i3status-rust/config.toml - colors { - background #282A36 - statusline #F8F8F2 - separator #44475A - focused_workspace #44475A #44475A #F8F8F2 - active_workspace #282A36 #44475A #F8F8F2 - inactive_workspace #282A36 #282A36 #BFBFBF - urgent_workspace #FF5555 #FF5555 #F8F8F2 - binding_mode #FF5555 #FF5555 #F8F8F2 - } -} +exec "setxkbmap -layout be" + diff --git a/i3/.config/i3status-rust/config.toml b/i3/.config/i3status-rust/config.toml index 0f106e2..1c0c0cc 100644 --- a/i3/.config/i3status-rust/config.toml +++ b/i3/.config/i3status-rust/config.toml @@ -12,4 +12,4 @@ bat = [ "|¾|", "|X|", ] -bat_charging = "|^|" \ No newline at end of file +bat_charging = "|^|" diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config index 2e5f2ee..6a26f3c 100644 --- a/i3/.config/i3status/config +++ b/i3/.config/i3status/config @@ -1,37 +1,61 @@ -general { +# i3status configuration file. +# see "man i3status" for documentation. - output_format = "i3bar" - colors = true - color_good = "#50FA7B" - color_degraded = "#F1FA8C" - color_bad = "#FF5555" - interval = 5 +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + color_good = "#a3be8c" + color_degraded = "#ebcb8b" + color_bad = "#bf616a" + separator = "" + output_format = "i3bar" + interval = 5 } order += "ipv6" -order += "disk /" +order += "wireless _first_" +order += "ethernet _first_" +order += "disk /home" +order += "load" +order += "memory" order += "run_watch DHCP" order += "run_watch VPNC" order += "path_exists VPN" -order += "wireless wlan0" -order += "ethernet eth0" order += "battery 0" order += "cpu_temperature 0" -order += "memory" -order += "load" order += "tztime local" -order += "tztime berlin" +order += "tztime Montreal" +order += "tztime Brussels" -wireless wlan0 { - format_up = "W: (%quality at %essid, %bitrate) %ip" +wireless _first_ { + format_up = "W: (%quality at %essid) %ip (%speed)" format_down = "W: down" } -ethernet eth0 { +ethernet _first_ { format_up = "E: %ip (%speed)" format_down = "E: down" } + +battery all { + format = "%status %percentage %remaining" +} + +load { + format = "%1min" +} + +memory { + format = "%used | %available" + threshold_degraded = "1G" + format_degraded = "MEMORY < %available" +} + battery 0 { format = "%status %percentage %remaining %emptytime" format_down = "No battery" @@ -62,9 +86,14 @@ tztime local { hide_if_equals_localtime = true } -tztime berlin { +tztime Brussels { format = "%Y-%m-%d %H:%M:%S %Z" - timezone = "Europe/Berlin" + timezone = "Europe/Brussels" +} +tztime Montreal { + format = "%H:%M %Z" + timezone = "America/Montreal" + hide_if_equals_localtime = true } load { @@ -73,7 +102,6 @@ load { cpu_temperature 0 { format = "T: %degrees °C" - path = "/sys/devices/platform/coretemp.0/temp1_input" } memory { @@ -86,6 +114,10 @@ disk "/" { format = "%free" } +disk "/home" { + format = "%free" +} + read_file uptime { path = "/proc/uptime" -} \ No newline at end of file +} diff --git a/nano/.cache/nano/.keep b/nano/.cache/nano/.keep new file mode 100644 index 0000000..e69de29 diff --git a/nano/.nanorc b/nano/.nanorc index b93226a..9558520 100644 --- a/nano/.nanorc +++ b/nano/.nanorc @@ -5,7 +5,7 @@ set backupdir "~/.cache/nano/" # set backwards # set boldtext -set brackets ""')>]}" +set brackets "\"')>]}" # set casesensitive set constantshow # set cutfromcursor @@ -64,4 +64,3 @@ include "/usr/share/nano/*.nanorc" # bind M-B cutwordleft main # bind M-N cutwordright main # bind Del backspace all -set nonewlines diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 9c9e802..acae2dd 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -104,10 +104,10 @@ if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 1\)' 'se if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 1\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set -g mode-mouse off' # fix pane_current_path on new window and splits -if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind c; bind c new-window -c "#{pane_current_path}"' -if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" "unbind '\"'; bind '\"' split-window -v -c '#{pane_current_path}'" -if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind v; bind v split-window -h -c "#{pane_current_path}"' -if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind %; bind % split-window -h -c "#{pane_current_path}"' +#if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind c; bind c new-window -c "#{pane_current_path}"' +#if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" "unbind '\"'; bind '\"' split-window -v -c '#{pane_current_path}'" +#if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind v; bind v split-window -h -c "#{pane_current_path}"' +#if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind %; bind % split-window -h -c "#{pane_current_path}"' set -g history-limit 90000 set -g alternate-screen on diff --git a/zsh/.oh-my-zsh b/zsh/.oh-my-zsh index 6768906..b5583a3 160000 --- a/zsh/.oh-my-zsh +++ b/zsh/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 6768906d07151140db901510b2c8b1ce2622f365 +Subproject commit b5583a321644218702c4ef588934575f46a2159b diff --git a/zsh/.zshrc b/zsh/.zshrc index baa7d44..0e01281 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,11 +1,12 @@ -export PATH=$HOME/bins/toolbox:$HOME/.local/bin:/usr/local/bin:$HOME/.pyenv/bin:$PATH +export PATH=$HOME/bins/toolbox:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$HOME/.pyenv/bin:$HOME/hosting-run-scripts/:$PATH export ZSH=$HOME/.oh-my-zsh # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes ZSH_THEME="agnoster" -DEFAULT_USER=$USER +HOST_COLOR=$(hostname -f | xxd -u -ps -s 5 -l 3 || 'FF0000') # CASE_SENSITIVE="true" # HYPHEN_INSENSITIVE="true" -DISABLE_AUTO_UPDATE="true" +DISABLE_AUTO_UPDATE="false" +DEFAULT_USER=$USER # export UPDATE_ZSH_DAYS=13 # DISABLE_LS_COLORS="true" # DISABLE_AUTO_TITLE="true" @@ -16,6 +17,11 @@ DISABLE_AUTO_UPDATE="true" # DISABLE_UNTRACKED_FILES_DIRTY="true" HIST_STAMPS="yyyy-mm-dd" + +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init --path)" + # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder @@ -243,9 +249,9 @@ tmux #tmuxinator #torrent #tugboat -#ubuntu +ubuntu #urltools -#vagrant +vagrant vault #vi-mode #vim-interaction @@ -268,7 +274,7 @@ vault ) zstyle :omz:plugins:ssh-agent agent-forwarding on -zstyle :omz:plugins:ssh-agent identities auberge +zstyle :omz:plugins:ssh-agent identities $(hostname -f) zstyle :omz:plugins:ssh-agent lifetime 4h source $ZSH/oh-my-zsh.sh @@ -283,7 +289,7 @@ source $ZSH/oh-my-zsh.sh # else # export EDITOR='mvim' # fi - +export EDITOR='hx' # Compilation flags # export ARCHFLAGS="-arch x86_64" @@ -339,4 +345,25 @@ alias oss='openstack server' alias psa='ps auxwwwf' alias toph='top -cHd1' 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' +if [ -f ~/.webhosting/activate ]; then source ~/.webhosting/activate; fi +autoload -Uz compinit +zstyle ':completion:*' menu select +fpath+=~/.zfunc +fpath+=${ZDOTDIR:-~}/.zsh_functions +alias bat=batcat +alias osm="openstack --os-cloud management_stack" +alias osmb="openstack --os-cloud management_stack_sbg" +alias osmd="openstack --os-cloud management_stack_de" +export BASTION_CONF_FILE=~/.config/ovh/bastion.env VAULT_ADDR="https://vault.ood.ovh:8200"