Migrate to lua_ls

Update X monitor config
Update p10k
2023-06-03 14:22:40 +03:00 · 2023-06-03 14:21:19 +03:00 · 2023-06-03 14:19:51 +03:00 · 2023-06-03 14:18:42 +03:00 · 2023-06-03 14:16:39 +03:00
6 changed files with 119 additions and 75 deletions
--- a/.alacritty.yml
+++ b/.alacritty.yml
@ -1,41 +1,74 @@
-# Background opacity
-background_opacity: 0.3
+# Window opacity
+window:
+  opacity: 1

 font:
-   normal:
-      family:
-         "MesloLGS NF"
-#   normal:
-#      family: " GoMono Nerd Font" 
-#   bold:
-#      family: "Noto Color Emoji" 
-#   italic:
-#      family: "Noto Color Emoji" 
-   size: 8
+  normal:
+    family: "MesloLGS NF"
+  #   normal:
+  #      family: " GoMono Nerd Font" 
+  #   bold:
+  #      family: "Noto Color Emoji" 
+  #   italic:
+  #      family: "Noto Color Emoji" 
+  size: 14
+
+colors:
+  # Default colors
+  primary:
+    background: '0x1a1b26'
+    foreground: '0xc0caf5'
+
+  # Normal colors
+  normal:
+    black:   '0x15161E'
+    red:     '0xf7768e'
+    green:   '0x9ece6a'
+    yellow:  '0xe0af68'
+    blue:    '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan:    '0x7dcfff'
+    white:   '0xa9b1d6'
+
+  # Bright colors
+  bright:
+    black:   '0x414868'
+    red:     '0xf7768e'
+    green:   '0x9ece6a'
+    yellow:  '0xe0af68'
+    blue:    '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan:    '0x7dcfff'
+    white:   '0xc0caf5'
+
+  indexed_colors:
+    - { index: 16, color: '0xff9e64' }
+    - { index: 17, color: '0xdb4b4b' }

 # Colors (Panda)
-colors:
-  primary:
-    background: '#292A2B'
-    foreground: '#E6E6E6'
-
-  normal:
-    black:   '#292A2B'
-    red:     '#FF2C6D'
-    green:   '#19f9d8'
-    yellow:  '#FFB86C'
-    blue:    '#45A9F9'
-    magenta: '#FF75B5'
-    cyan:    '#67d3c2'
-    orange:  '#B084EB'
-    white:   '#E6E6E6'
-  bright:
-    black:   '#292A2B'
-    red:     '#FF2C6D'
-    green:   '#19f9d8'
-    yellow:  '#ffcc95'
-    blue:    '#6FC1FF'
-    magenta: '#FF9AC1'
-    cyan:    '#67d3c2'
-    white:   '#ffffff'
+# colors:
+#   primary:
+#     background: '#292A2B'
+#     foreground: '#E6E6E6'
+#
+#   normal:
+#     black:   '#292A2B'
+#     red:     '#FF2C6D'
+#     green:   '#19f9d8'
+#     yellow:  '#FFB86C'
+#     blue:    '#45A9F9'
+#     magenta: '#FF75B5'
+#     cyan:    '#67d3c2'
+#     orange:  '#B084EB'
+#     white:   '#E6E6E6'
+#   bright:
+#     black:   '#292A2B'
+#     red:     '#FF2C6D'
+#     green:   '#19f9d8'
+#     yellow:  '#ffcc95'
+#     blue:    '#6FC1FF'
+#     magenta: '#FF9AC1'
+#     cyan:    '#67d3c2'
+#     white:   '#ffffff'
+#

--- a/.config/nvim/lua/vtimofei/lsp/init.lua
+++ b/.config/nvim/lua/vtimofei/lsp/init.lua
@ -1,5 +1,5 @@
 require('vtimofei.lsp.gopls')
 require('vtimofei.lsp.rust_analyzer')
-require('vtimofei.lsp.sumneko_lua')
+require('vtimofei.lsp.lua_ls')
 require('vtimofei.lsp.tsserver')
 require('vtimofei.lsp.clangd')
--- a/.config/nvim/lua/vtimofei/lsp/sumneko_lua.lua
+++ b/.config/nvim/lua/vtimofei/lsp/sumneko_lua.lua
@ -2,7 +2,7 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local remap = require('vtimofei.lsp.remap')
 local lsp_conf = require('lspconfig')

-lsp_conf.sumneko_lua.setup{
+lsp_conf.lua_ls.setup{
        capabilities = capabilities,
        on_attach = function()
                remap.hover()
--- a/.config/xorg.conf.d/10-monitors.conf
+++ b/.config/xorg.conf.d/10-monitors.conf
@ -1,16 +1,3 @@
-Section "Monitor"
-	# Monitor Identify
-	Identifier  "eDP1"
-
-	# Setting Resolution and Modes
-	Option "PreferredMode" "1366x768"
-	Option "TargetRefresh" "60"
-	
-	Option "LeftOf" "HDMI1"
-
-	Option "Position" "0 1008"
-EndSection
-
 Section "Monitor"
 	# Monitor Identify
 	Identifier  "HDMI1"
@ -19,9 +6,22 @@ Section "Monitor"
 	Option "PreferredMode" "3840x2160"
 	Option "TargetRefresh" "60"

-	Option "RightOf" "eDP1"
+	Option "LeftOf" "eDP1"

-	Option "Position" "2049 0"
+	Option "Position" "0 0"
+EndSection
+
+Section "Monitor"
+	# Monitor Identify
+	Identifier  "eDP1"
+
+	# Setting Resolution and Modes
+	Option "PreferredMode" "1366x768"
+	Option "TargetRefresh" "60"
+
+	Option "RightOf" "HDMI1"
+
+	Option "Position" "3840 1008"
 EndSection

 ## 1080p monitor
--- a/.p10k.zsh
+++ b/.p10k.zsh
@ -1,8 +1,9 @@
-# Generated by Powerlevel10k configuration wizard on 2021-07-13 at 19:38 EEST.
-# Based on romkatv/powerlevel10k/config/p10k-rainbow.zsh, checksum 25238.
+# Generated by Powerlevel10k configuration wizard on 2022-05-25 at 09:37 EEST.
+# Based on romkatv/powerlevel10k/config/p10k-rainbow.zsh, checksum 23401.
 # Wizard options: nerdfont-complete + powerline, small icons, rainbow, unicode,
-# 24h time, vertical separators, blurred heads, slanted tails, 2 lines, disconnected,
-# no frame, compact, many icons, concise, transient_prompt, instant_prompt=verbose.
+# 24h time, vertical separators, blurred heads, flat tails, 2 lines, dotted, no frame,
+# darkest-ornaments, sparse, many icons, concise, transient_prompt,
+# instant_prompt=verbose.
 # Type `p10k configure` to generate another config.
 #
 # Config for Powerlevel10k with powerline prompt style with colorful background.
@ -77,6 +78,7 @@
    haskell_stack           # haskell version from stack (https://haskellstack.org/)
    kubecontext             # current kubernetes context (https://kubernetes.io/)
    terraform               # terraform workspace (https://www.terraform.io)
+    # terraform_version     # terraform version (https://www.terraform.io)
    aws                     # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
    aws_eb_env              # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
    azure                   # azure account name (https://docs.microsoft.com/en-us/cli/azure)
@ -130,7 +132,7 @@
  typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT=

  # Add an empty line before each prompt.
-  typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
+  typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=true

  # Connect left prompt lines with these symbols. You'll probably want to use the same color
  # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below.
@ -146,13 +148,13 @@
  # '─'. The last two make it easier to see the alignment between left and right prompt and to
  # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
  # for more compact prompt if using using this option.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' '
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='·'
  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND=
  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND=
  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
    # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE
    # ornaments defined above.
-    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=242
+    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238
    # Start filler from the edge of the screen if there are no left segments on the first line.
    typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}'
    # End filler on the edge of the screen if there are no right segments on the first line.
@ -172,9 +174,9 @@
  # The left end of right prompt.
  typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='░▒▓'
  # The left end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0BA'
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL=''
  # The right end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0BC'
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL=''
  # Left prompt terminator for lines without any segments.
  typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=

@ -1278,10 +1280,20 @@
  typeset -g POWERLEVEL9K_TERRAFORM_OTHER_BACKGROUND=0
  # typeset -g POWERLEVEL9K_TERRAFORM_OTHER_VISUAL_IDENTIFIER_EXPANSION='⭐'

+  #############[ terraform_version: terraform version (https://www.terraform.io) ]##############
+  # Terraform version color.
+  typeset -g POWERLEVEL9K_TERRAFORM_VERSION_FOREGROUND=4
+  typeset -g POWERLEVEL9K_TERRAFORM_VERSION_BACKGROUND=0
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_TERRAFORM_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
+  ################[ terraform_version: It shows active terraform version (https://www.terraform.io) ]#################
+  typeset -g POWERLEVEL9K_TERRAFORM_VERSION_SHOW_ON_COMMAND='terraform|tf'
+
  #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]#############
  # Show kubecontext only when the the command you are typing invokes one of these tools.
  # Tip: Remove the next line to always show kubecontext.
-  typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|fluxctl|stern'
+  typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern'

  # Kubernetes context classes for the purpose of using different colors, icons and expansions with
  # different contexts.
--- a/.xinitrc
+++ b/.xinitrc
@ -1,9 +1,8 @@
 #!/bin/sh

-# JetBrains IDE fix
-export _JAVA_AWT_WM_NONREPARENTING=1
-export AWT_TOOLKIT=MToolkit
-wmname LG3D
+# Export some paths here that need to be picked up by
+# the dmenu
+source ~/.config/path

 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@ -42,8 +41,8 @@ xset s noblank     # don't blank the video device
 xset s off         # disable screensaver

 # Try to use the same scaling as my 4K monitor on my 768 laptop monitor
-xrandr --dpi 150 \
-	--output eDP1 --scale 1.5x1.5
+xrandr --dpi 163.2 \
+	--output eDP1 --scale 1.615x1.615

 # Restore my background
 nitrogen  --restore &
@ -58,15 +57,15 @@ picom --experimental-backends &
 # Load keybinds
 #xbindkeys

+setxkbmap us dvp
+
 # Start dwmblocks
 dwmblocks &

-# Export some paths here that need to be picked up by
-# the dmenu
-source ~/.config/path
-
-# Disable the laptop keyboard
-# sleep 5; /home/vtimofei/scripts/laptopkb-disable &
+# Disable the laptop keyboard & touchpad
+/home/vtimofei/scripts/laptopkb-disable
+/home/vtimofei/scripts/laptoptouch-disable

 # Finally exec my window manager
 exec dwm
+# exec /home/vtimofei/desktop-apps/dwm/rwm/target/debug/rwm 2>/tmp/rwm.logs
Author	SHA1	Message	Date
Victor Timofei	da1b6610cc	Migrate to lua_ls	2023-06-03 14:22:40 +03:00
Victor Timofei	4caf6e07cd	Update X monitor config	2023-06-03 14:21:19 +03:00
Victor Timofei	967843ec0e	Update p10k	2023-06-03 14:19:51 +03:00
Victor Timofei	dd9f5a2d5d	Update .xinitrc	2023-06-03 14:18:42 +03:00
Victor Timofei	424ec3b86b	Tokyooo	2023-06-03 14:16:39 +03:00