merge: main

.config/alacritty.yml

@@ -23,12 +23,13 @@ env:
   # available, otherwise `xterm-256color` is used.
   TERM: alacritty
 
-window:
+#window:
   # Window dimensions (changes require restart)
   #
-  # Number of lines/columns (not pixels) in the terminal. The number of columns
+  # Number of lines/columns (not pixels) in the terminal. Both lines and columns
-  # must be at least `2`, while using a value of `0` for columns and lines will
+  # must be non-zero for this to take effect. The number of columns must be at
-  # fall back to the window manager's recommended size.
+  # least `2`, while using a value of `0` for columns and lines will fall back
+  # to the window manager's recommended size
   #dimensions:
   #  columns: 0
   #  lines: 0
@@ -67,8 +68,7 @@ window:
   #
   # 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: 1.0
-
 
   # Startup Mode (changes require restart)
   #
@@ -94,11 +94,12 @@ window:
     # General application class
     #general: Alacritty
 
-  # GTK theme variant (Linux/BSD only)
+  # Decorations theme variant (Linux/BSD only)
   #
-  # Override the variant of the GTK theme. Commonly supported values are `dark`
+  # Override the variant of the GTK theme/Wayland client side decorations.
-  # and `light`. Set this to `None` to use the default theme variant.
+  # Commonly supported values are `dark` and `light`. Set this to `None` to use
-  #gtk_theme_variant: None
+  # the default theme variant.
+  #decorations_theme_variant: None
 
 #scrolling:
   # Maximum number of lines in the scrollback buffer.
@@ -173,48 +174,157 @@ font:
   #  x: 0
   #  y: 0
 
-  # Thin stroke font rendering (macOS only)
+  # Use built-in font for box drawing characters.
   #
-  # Thin strokes are suitable for retina displays, but for non-retina screens
+  # If `true`, Alacritty will use a custom built-in font for box drawing
-  # it is recommended to set `use_thin_strokes` to `false`.
+  # characters (Unicode points 2500 - 259f).
-  #use_thin_strokes: true
+  #
+  #builtin_box_drawing: true
 
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false
 
 # Colors (Tomorrow Night)
-colors:
+#colors:
   # Default colors
-  primary:
+  #primary:
-    background: '#1d1f21'
+  #  background: '#1d1f21'
-    foreground: '#c5c8c6'
+  #  foreground: '#c5c8c6'
 
-  # Colors the cursor will use if `custom_cursor_colors` is true
+    # Bright and dim foreground colors
-  cursor:
+    #
-    text: '#1d1f21'
+    # The dimmed foreground color is calculated automatically if it is not
-    cursor: '#ffffff'
+    # present. If the bright foreground color is not set, or
+    # `draw_bold_text_with_bright_colors` is `false`, the normal foreground
+    # color will be used.
+    #dim_foreground: '#828482'
+    #bright_foreground: '#eaeaea'
+
+  # Cursor colors
+  #
+  # Colors which should be used to draw the terminal cursor.
+  #
+  # Allowed values are CellForeground/CellBackground, which reference the
+  # affected cell, or hexadecimal colors like #ff00ff.
+  #cursor:
+  #  text: CellBackground
+  #  cursor: CellForeground
+
+  # Vi mode cursor colors
+  #
+  # Colors for the cursor when the vi mode is active.
+  #
+  # Allowed values are CellForeground/CellBackground, which reference the
+  # affected cell, or hexadecimal colors like #ff00ff.
+  #vi_mode_cursor:
+  #  text: CellBackground
+  #  cursor: CellForeground
+
+  # Search colors
+  #
+  # Colors used for the search bar and match highlighting.
+  #search:
+    # Allowed values are CellForeground/CellBackground, which reference the
+    # affected cell, or hexadecimal colors like #ff00ff.
+    #matches:
+    #  foreground: '#000000'
+    #  background: '#ffffff'
+    #focused_match:
+    #  foreground: '#ffffff'
+    #  background: '#000000'
+
+  # Keyboard hints
+  #hints:
+    # First character in the hint label
+    #
+    # Allowed values are CellForeground/CellBackground, which reference the
+    # affected cell, or hexadecimal colors like #ff00ff.
+    #start:
+    #  foreground: '#1d1f21'
+    #  background: '#e9ff5e'
+
+    # All characters after the first one in the hint label
+    #
+    # Allowed values are CellForeground/CellBackground, which reference the
+    # affected cell, or hexadecimal colors like #ff00ff.
+    #end:
+    #  foreground: '#e9ff5e'
+    #  background: '#1d1f21'
+
+  # Line indicator
+  #
+  # Color used for the indicator displaying the position in history during
+  # search and vi mode.
+  #
+  # By default, these will use the opposing primary color.
+  #line_indicator:
+  #  foreground: None
+  #  background: None
+
+  # Footer bar
+  #
+  # Color used for the footer bar on the bottom, used by search regex input,
+  # hyperlink URI preview, etc.
+  #
+  #footer_bar:
+  #  background: '#c5c8c6'
+  #  foreground: '#1d1f21'
+
+  # Selection colors
+  #
+  # Colors which should be used to draw the selection area.
+  #
+  # Allowed values are CellForeground/CellBackground, which reference the
+  # affected cell, or hexadecimal colors like #ff00ff.
+  #selection:
+  #  text: CellBackground
+  #  background: CellForeground
 
   # Normal colors
-  normal:
+  #normal:
-    black:   '#1d1f21'
+  #  black:   '#1d1f21'
-    red:     '#cc6666'
+  #  red:     '#cc6666'
-    green:   '#b5bd68'
+  #  green:   '#b5bd68'
-    yellow:  '#e6c547'
+  #  yellow:  '#f0c674'
-    blue:    '#81a2be'
+  #  blue:    '#81a2be'
-    magenta: '#b294bb'
+  #  magenta: '#b294bb'
-    cyan:    '#70c0ba'
+  #  cyan:    '#8abeb7'
-    white:   '#373b41'
+  #  white:   '#c5c8c6'
 
   # Bright colors
-  bright:
+  #bright:
-    black:   '#666666'
+  #  black:   '#666666'
-    red:     '#ff3334'
+  #  red:     '#d54e53'
-    green:   '#9ec400'
+  #  green:   '#b9ca4a'
-    yellow:  '#f0c674'
+  #  yellow:  '#e7c547'
-    blue:    '#81a2be'
+  #  blue:    '#7aa6da'
-    magenta: '#b77ee0'
+  #  magenta: '#c397d8'
-    cyan:    '#54ced6'
+  #  cyan:    '#70c0b1'
-    white:   '#282a2e'
+  #  white:   '#eaeaea'
+
+  # Dim colors
+  #
+  # If the dim colors are not set, they will be calculated automatically based
+  # on the `normal` colors.
+  #dim:
+  #  black:   '#131415'
+  #  red:     '#864343'
+  #  green:   '#777c44'
+  #  yellow:  '#9e824c'
+  #  blue:    '#556a7d'
+  #  magenta: '#75617b'
+  #  cyan:    '#5b7d78'
+  #  white:   '#828482'
+
+  # Indexed Colors
+  #
+  # The indexed colors include all colors from 16 to 256.
+  # When these are not set, they're filled with sensible defaults.
+  #
+  # Example:
+  #   `- { index: 16, color: '#ff00ff' }`
+  #
+  #indexed_colors: []
 
   # Transparent cell backgrounds
   #
@@ -303,6 +413,11 @@ colors:
   # Cursor blinking interval in milliseconds.
   #blink_interval: 750
 
+  # Time after which cursor stops blinking, in seconds.
+  #
+  # Specifying '0' will disable timeout for blinking.
+  #blink_timeout: 5
+
   # If this is `true`, the cursor will be rendered as a hollow box when the
   # window is not focused.
   #unfocused_hollow: true
@@ -321,8 +436,7 @@ colors:
 # shell.
 #
 # Default:
-#   - (macOS) /bin/bash --login
+#   - (Linux/BSD/macOS) `$SHELL` or the user's login shell, if `$SHELL` is unset
-#   - (Linux/BSD) user login shell
 #   - (Windows) powershell
 #shell:
 #  program: /bin/bash
@@ -353,18 +467,22 @@ colors:
   # If this is `true`, the cursor is temporarily hidden when typing.
   #hide_when_typing: false
 
-# Regex hints
+# Hints
 #
-# Terminal hints can be used to find text in the visible part of the terminal
+# Terminal hints can be used to find text or hyperlink in the visible part of
-# and pipe it to other applications.
+# the terminal and pipe it to other applications.
 #hints:
   # Keys used for the hint labels.
   #alphabet: "jfkdls;ahgurieowpq"
 
   # List with all available hints
   #
-  # Each hint must have a `regex` and either an `action` or a `command` field.
+  # Each hint must have any of `regex` or `hyperlinks` field and either an
-  # The fields `mouse`, `binding` and `post_processing` are optional.
+  # `action` or a `command` field. The fields `mouse`, `binding` and
+  # `post_processing` are optional.
+  #
+  # The `hyperlinks` option will cause OSC 8 escape sequence hyperlinks to be
+  # highlighted.
   #
   # The fields `command`, `binding.key`, `binding.mods`, `binding.mode` and
   # `mouse.mods` accept the same values as they do in the `key_bindings` section.
@@ -374,7 +492,8 @@ colors:
   #
   # If the `post_processing` field is set to `true`, heuristics will be used to
   # shorten the match if there are characters likely not to be part of the hint
-  # (e.g. a trailing `.`). This is most useful for URIs.
+  # (e.g. a trailing `.`). This is most useful for URIs and applies only to
+  # `regex` matches.
   #
   # Values for `action`:
   #   - Copy
@@ -388,6 +507,7 @@ colors:
   #enabled:
   # - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\
   #           [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+"
+  #   hyperlinks: true
   #   command: xdg-open
   #   post_processing: true
   #   mouse:
@@ -516,6 +636,8 @@ colors:
 #   - ToggleBlockSelection
 #   - ToggleSemanticSelection
 #       Toggle semantic selection based on `selection.semantic_escape_chars`.
+#   - CenterAroundViCursor
+#       Center view around vi mode cursor
 #
 # - Vi mode exclusive cursor motion actions:
 #
@@ -641,9 +763,9 @@ colors:
   #- { key: Copy,                                        action: Copy           }
   #- { key: L,         mods: Control,                    action: ClearLogNotice }
   #- { key: L,         mods: Control, mode: ~Vi|~Search, chars: "\x0c"          }
-  #- { key: PageUp,    mods: Shift,   mode: ~Alt,        action: ScrollPageUp,  }
+  #- { key: PageUp,    mods: Shift,   mode: ~Alt,        action: ScrollPageUp   }
   #- { key: PageDown,  mods: Shift,   mode: ~Alt,        action: ScrollPageDown }
-  #- { key: Home,      mods: Shift,   mode: ~Alt,        action: ScrollToTop,   }
+  #- { key: Home,      mods: Shift,   mode: ~Alt,        action: ScrollToTop    }
   #- { key: End,       mods: Shift,   mode: ~Alt,        action: ScrollToBottom }
 
   # Vi Mode
@@ -669,6 +791,7 @@ colors:
   #- { key: V,      mods: Control,       mode: Vi|~Search, action: ToggleBlockSelection    }
   #- { key: V,      mods: Alt,           mode: Vi|~Search, action: ToggleSemanticSelection }
   #- { key: Return,                      mode: Vi|~Search, action: Open                    }
+  #- { key: Z,                           mode: Vi|~Search, action: CenterAroundViCursor    }
   #- { key: K,                           mode: Vi|~Search, action: Up                      }
   #- { key: J,                           mode: Vi|~Search, action: Down                    }
   #- { key: H,                           mode: Vi|~Search, action: Left                    }
@@ -767,3 +890,6 @@ colors:
 
   # Print all received window events.
   #print_events: false
+
+  # Highlight window damage information.
+  #highlight_damage: false

.config/nvim/init.lua

@@ -13,6 +13,7 @@ vim.o.list           = true
 
 vim.o.number         = true
 vim.o.relativenumber = true
+vim.o.laststatus     = 3
 
 vim.o.ignorecase     = true
 vim.o.smartcase      = true
@@ -44,6 +45,7 @@ vim.o.mousemodel     = extend
 require"pack-impatient"
 vim.cmd("packadd plenary")
 
+require"pack-onedark"
 require"pack-dirdiff"
 require"pack-easy-align"
 require"pack-indent-blankline"

.config/nvim/lua/pack-which-key.lua

@@ -1,2 +1,2 @@
 vim.cmd("packadd which-key")
-require'which-key'.setup{}
+require'which-key'.setup {}

.config/picom.conf

@@ -25,16 +25,6 @@ shadow-offset-x = -7;
 # shadow-offset-y = -15
 shadow-offset-y = -7;
 
-# Avoid drawing shadows on dock/panel windows. This option is deprecated,
-# you should use the *wintypes* option in your config file instead.
-#
-# no-dock-shadow = false
-
-# Don't draw shadows on drag-and-drop windows. This option is deprecated, 
-# you should use the *wintypes* option in your config file instead.
-#
-# no-dnd-shadow = false
-
 # Red color value of shadow (0.0 - 1.0, defaults to 0).
 # shadow-red = 0
 
@@ -44,16 +34,8 @@ shadow-offset-y = -7;
 # Blue color value of shadow (0.0 - 1.0, defaults to 0).
 # shadow-blue = 0
 
-# Do not paint shadows on shaped windows. Note shaped windows 
+# Hex string color value of shadow (#000000 - #FFFFFF, defaults to #000000). This option will override options set shadow-(red/green/blue)
-# here means windows setting its shape through X Shape extension. 
+# shadow-color = "#000000"
-# Those using ARGB background is beyond our control. 
-# Deprecated, use 
-#   shadow-exclude = 'bounding_shaped'
-# or 
-#   shadow-exclude = 'bounding_shaped && !rounded_corners'
-# instead.
-#
-# shadow-ignore-shaped = ''
 
 # Specify a list of conditions of windows that should have no shadow.
 #
@@ -69,6 +51,9 @@ shadow-exclude = [
   "_GTK_FRAME_EXTENTS@:c"
 ];
 
+# Specify a list of conditions of windows that should have no shadow painted over, such as a dock window.
+# clip-shadow-above = []
+
 # Specify a X geometry that describes the region in which shadow should not
 # be painted in, such as a dock window region. Use
 #    shadow-exclude-reg = "x10+0+0"
@@ -88,7 +73,7 @@ shadow-exclude = [
 # Fade windows in/out when opening/closing and when opacity changes,
 #  unless no-fading-openclose is used.
 # fading = false
-#fading = true
+#fading = true;
 
 # Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028)
 # fade-in-step = 0.028
@@ -118,16 +103,13 @@ fade-out-step = 0.03;
 
 # Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
 # inactive-opacity = 1
-#inactive-opacity = 0.8;
+#inactive-opacity = 0.95;
 
 # Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
 # frame-opacity = 1.0
-#frame-opacity = 0.7;
+#frame-opacity = 0.9;
 
-# Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0)
+# Let inactive opacity set by -i override the '_NET_WM_WINDOW_OPACITY' values of windows.
-# menu-opacity = 1.0
-
-# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows.
 # inactive-opacity-override = true
 inactive-opacity-override = false;
 
@@ -137,7 +119,7 @@ inactive-opacity-override = false;
 # Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
 # inactive-dim = 0.0
 
-# Specify a list of conditions of windows that should always be considered focused.
+# Specify a list of conditions of windows that should never be considered focused.
 # focus-exclude = []
 focus-exclude = [ "class_g = 'Cairo-clock'" ];
 
@@ -154,6 +136,22 @@ focus-exclude = [ "class_g = 'Cairo-clock'" ];
 # opacity-rule = []
 
 
+#################################
+#           Corners             #
+#################################
+
+# Sets the radius of rounded window corners. When > 0, the compositor will
+# round the corners of windows. Does not interact well with
+# `transparent-clipping`.
+corner-radius = 0
+
+# Exclude conditions for rounded corners.
+rounded-corners-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'"
+];
+
+
 #################################
 #     Background-Blurring       #
 #################################
@@ -164,6 +162,8 @@ focus-exclude = [ "class_g = 'Cairo-clock'" ];
 # blur-size = 12
 #
 # blur-deviation = false
+#
+# blur-strength = 5
 
 # Blur background of semi-transparent / ARGB windows.
 # Bad in performance, with driver-dependent behavior.
@@ -187,7 +187,7 @@ focus-exclude = [ "class_g = 'Cairo-clock'" ];
 # example:
 #   blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1";
 #
-# blur-kern = ''
+# blur-kern = ""
 blur-kern = "3x3box";
 
 
@@ -203,18 +203,20 @@ blur-background-exclude = [
 #       General Settings        #
 #################################
 
+# Enable remote control via D-Bus. See the man page for more details.
+# dbus = true
+
 # Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers.
 # daemon = false
 
 # Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`.
 # `xrender` is the default one.
 #
-# backend = 'glx'
+backend = "glx"
-backend = "glx";
 
 # Enable/disable VSync.
 # vsync = false
-vsync = true
+vsync = true;
 
 # Enable remote control via D-Bus. See the *D-BUS API* section below for more details.
 # dbus = false
@@ -235,26 +237,12 @@ mark-ovredir-focused = true;
 # detect-rounded-corners = false
 detect-rounded-corners = true;
 
-# Detect '_NET_WM_OPACITY' on client windows, useful for window managers
+# Detect '_NET_WM_WINDOW_OPACITY' on client windows, useful for window managers
-# not passing '_NET_WM_OPACITY' of client windows to frame windows.
+# not passing '_NET_WM_WINDOW_OPACITY' of client windows to frame windows.
 #
 # detect-client-opacity = false
 detect-client-opacity = true;
 
-# Specify refresh rate of the screen. If not specified or 0, picom will 
-# try detecting this with X RandR extension.
-#
-# refresh-rate = 60
-refresh-rate = 0
-
-# Limit picom to repaint at most once every 1 / 'refresh_rate' second to 
-# boost performance. This should not be used with 
-#   vsync drm/opengl/opengl-oml
-# as they essentially does sw-opti's job already, 
-# unless you wish to specify a lower refresh rate than the actual value.
-#
-# sw-opti = 
-
 # Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window,
 # rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy,
 # provided that the WM supports it.
@@ -277,14 +265,14 @@ refresh-rate = 0
 # in the same group focused at the same time.
 #
 # detect-transient = false
-detect-transient = true
+detect-transient = true;
 
 # Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same
-# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if 
+# group focused at the same time. This usually means windows from the same application
-# detect-transient is enabled, too.
+# will be considered focused or unfocused at the same time.
+# 'WM_TRANSIENT_FOR' has higher priority if detect-transient is enabled, too.
 #
 # detect-client-leader = false
-detect-client-leader = true
 
 # Resize damaged region by a specific number of pixels.
 # A positive value enlarges it while a negative one shrinks it.
@@ -309,7 +297,7 @@ detect-client-leader = true
 # practically happened) and may not work with blur-background.
 # My tests show a 15% performance boost. Recommended.
 #
-# glx-no-stencil = false
+glx-no-stencil = true;
 
 # GLX backend: Avoid rebinding pixmap on window damage.
 # Probably could improve performance on rapid window content changes,
@@ -319,12 +307,12 @@ detect-client-leader = true
 # glx-no-rebind-pixmap = false
 
 # Disable the use of damage information.
-# This cause the whole screen to be redrawn everytime, instead of the part of the screen
+# This cause the whole screen to be redrawn every time, instead of the part of the screen
 # has actually changed. Potentially degrades the performance, but might fix some artifacts.
 # The opposing option is use-damage
 #
 # no-use-damage = false
-use-damage = true
+use-damage = true;
 
 # Use X Sync fence to sync clients' draw calls, to make sure all draw
 # calls are finished before picom starts drawing. Needed on nvidia-drivers
@@ -332,11 +320,17 @@ use-damage = true
 #
 # xrender-sync-fence = false
 
-# GLX backend: Use specified GLSL fragment shader for rendering window contents. 
+# GLX backend: Use specified GLSL fragment shader for rendering window
-# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` 
+# contents. Read the man page for a detailed explanation of the interface.
-# in the source tree for examples.
 #
-# glx-fshader-win = ''
+# window-shader-fg = "default"
+
+# Use rules to set per-window shaders. Syntax is SHADER_PATH:PATTERN, similar
+# to opacity-rule. SHADER_PATH can be "default". This overrides window-shader-fg.
+#
+# window-shader-fg-rule = [
+#   "my_shader.frag:window_type != 'dock'"
+# ]
 
 # Force all windows to be painted with blending. Useful if you
 # have a glx-fshader-win that could turn opaque pixels transparent.
@@ -360,6 +354,12 @@ use-damage = true
 #
 # transparent-clipping = false
 
+# Specify a list of conditions of windows that should never have transparent
+# clipping applied. Useful for screenshot tools, where you need to be able to
+# see through transparent parts of the window.
+#
+# transparent-clipping-exclude = []
+
 # Set the log level. Possible values are:
 #  "trace", "debug", "info", "warn", "error"
 # in increasing level of importance. Case doesn't matter.
@@ -375,13 +375,13 @@ log-level = "warn";
 # logs might still be written to the stderr.
 # When setting this option from the config file, it is recommended to use an absolute path.
 #
-# log-file = '/path/to/your/log/file'
+# log-file = "/path/to/your/log/file"
 
 # Show all X errors (for debugging)
 # show-all-xerrors = false
 
 # Write process ID to a file.
-# write-pid-path = '/path/to/your/log/file'
+# write-pid-path = "/path/to/your/log/file"
 
 # Window type settings
 #
@@ -407,6 +407,10 @@ log-level = "warn";
 #     normally won't be able to see. Useful when the window has parts of it
 #     transparent, and you want shadows in those areas.
 #
+#   clip-shadow-above:::
+#     Controls whether shadows that would have been drawn above the window should
+#     be clipped. Useful for dock windows that should have no shadow painted on top.
+#
 #   redir-ignore:::
 #     Controls whether this type of windows should cause screen to become
 #     redirected again after been unredirected. If you have unredir-if-possible
@@ -416,7 +420,7 @@ log-level = "warn";
 #wintypes:
 #{
 #  tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
-#  dock = { shadow = false; }
+#  dock = { shadow = false; clip-shadow-above = true; }
 #  dnd = { shadow = false; }
 #  popup_menu = { opacity = 0.8; }
 #  dropdown_menu = { opacity = 0.8; }

.config/zsh/.zshrc

@@ -1,9 +1,5 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of "$ZDOTDIR"/.zshrc.
+# If you come from bash you might have to change your $PATH.
-# Initialization code that may require console input (password prompts, [y/n]
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  . "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
 
 # Path to your oh-my-zsh installation.
 export ZSH="$ZDOTDIR/ohmyzsh"
@@ -12,7 +8,7 @@ export ZSH="$ZDOTDIR/ohmyzsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="powerlevel10k/powerlevel10k"
+ZSH_THEME="simpletheme"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -74,7 +70,7 @@ zstyle ':omz:update' mode disabled  # disable automatic updates
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git vi-mode colored-man-pages gitignore)
+plugins=(vi-mode colored-man-pages kube-ps1 timer git gitignore)
 
 . "$ZSH"/oh-my-zsh.sh
 
@@ -95,10 +91,6 @@ plugins=(git vi-mode colored-man-pages gitignore)
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
-# To customize prompt, run `p10k configure` or edit "$ZDOTDIR"/.p10k.zsh.
-[[ ! -f "$ZDOTDIR"/.p10k.zsh ]] || . "$ZDOTDIR"/.p10k.zsh
-
-eval "$(pyenv init -)"
 . "$ZDOTDIR"/.docker_aliases
 . "$ZDOTDIR"/.kubectl_aliases
 . "$ZDOTDIR"/.zsh_aliases

.config/zsh/custom/themes/simpletheme.zsh-theme

@@ -0,0 +1,13 @@
+PROMPT='
+$(kube_ps1)
+%(?::%{$fg_bold[red]%}%? )%{$fg[cyan]%}%~%{$reset_color%} $(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+
+KUBE_PS1_PREFIX=
+KUBE_PS1_SEPARATOR=' '
+KUBE_PS1_DIVIDER=/
+KUBE_PS1_SUFFIX=

.gitmodules

@@ -28,6 +28,3 @@
 [submodule ".config/zsh/ohmyzsh"]
 	path = .config/zsh/ohmyzsh
 	url = https://github.com/ohmyzsh/ohmyzsh.git
-[submodule ".pyenv"]
-	path = .pyenv
-	url = https://github.com/pyenv/pyenv.git

.zshenv

@@ -1,6 +1,4 @@
-export PYENV_ROOT="$HOME/.pyenv"
+path=("$HOME/bin" "$HOME/.local/bin" $path)
-
-path=("$HOME/bin" "$HOME/.local/bin" "$PYENV_ROOT/bin" $path)
 
 export XDG_CACHE_HOME="$HOME"/.cache
 export XDG_CONFIG_HOME="$HOME"/.config
@@ -10,6 +8,7 @@ export XDG_CONFIG_DIRS=/etc/xdg
 export XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
 
 export ZDOTDIR="$HOME"/.config/zsh
+export ZSH_CUSTOM="$ZDOTDIR/custom"
 export HISTFILE="$XDG_STATE_HOME"/zsh/history
 export ZLE_RPROMPT_INDENT=0