Update nvim/init.vim

Reviewed-on: #1

.zshrc

@@ -1,52 +0,0 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# 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
-    source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=2000
-SAVEHIST=2000
-bindkey -v
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-bindkey "\e[3~" delete-char
-autoload -Uz compinit
-compinit
-# End of lines added by compinstall
-
-# zsh extensionst
-source /data/kits/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
-source /data/kits/zsh/powerlevel10k/powerlevel10k.zsh-theme
-source /data/kits/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-eval `dircolors /data/kits/zsh/dircolor/bliss.dircolors`
-
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="/data/runtimes/julia/bin/:$PATH"
-export PATH="/data/runtimes/gurobi/linux64/bin/:$PATH"
-export PATH="/data/runtimes/conda/bin:$PATH"
-export PATH="/data/runtimes/nodejs/bin:$PATH"
-export EDITOR=nvim
-export TERM='xterm-256color'
-
-
-alias ls='ls --color=auto'
-
-# >>> juliaup initialize >>>
-
-# !! Contents within this block are managed by juliaup !!
-
-path=('/data/runtimes/julia/bin' $path)
-export PATH
-
-# <<< juliaup initialize <<<
-zshaddhistory() {
-    whence ${${(z)1}[1]} >/dev/null || return 2
-}
-

README.md

@@ -36,22 +36,18 @@ EndSection
 ```
 ![stones](./screenshots/Screenshot_20240503_095414.png)
 
-## Vim
+## Neovim
 
 ### Vimplug
-#### Neovim
+```sh
-```
 sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
        https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 ```
-#### Vim
-```sh
-curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-```
 ### Conquer of Completion
-- Requirements:
+- nodejs is a requirement
-   - Nodejs
+```
+curl -sL install-node.vercel.app/lts | bash
+```
 ### coc.nvim
 ```
 :CocInstall coc-pairs coc-json coc-tsserver coc-snippets

alacritty/alacritty.toml

@@ -16,20 +16,9 @@ family = "MesloLGS NF"
 [font.normal]
 family = "MesloLGS NF"
 
-[[keyboard.bindings]]
+[keyboard]
-key = "T"
+bindings = [
-mods = "Control|Shift"
+{ key = "T", mods = "Control|Shift", action = "SpawnNewInstance" },
-action = "SpawnNewInstance"
+{ key = "PageUp",  action = "ScrollLineUp" },
-
+{ key = "PageDown", action = "ScrollLineDown" },
-[[keyboard.bindings]]
+]
-key = "PageUp"
-action = "ScrollLineUp"
-
-[[keyboard.bindings]]
-key = "PageDown"
-action = "ScrollLineDown"
-
-[[keyboard.bindings]]
-key = "Return"
-mods = "Shift"
-chars = "\u001b\r"

alacritty/alacritty.toml.dc947f6f.bak

@@ -1,24 +0,0 @@
-[window]
-startup_mode = "Maximized"
-
-[font]
-size = 14.0
-
-[font.bold]
-family = "MesloLGS NF"
-
-[font.bold_italic]
-family = "MesloLGS NF"
-
-[font.italic]
-family = "MesloLGS NF"
-
-[font.normal]
-family = "MesloLGS NF"
-
-[keyboard]
-bindings = [
-{ key = "T", mods = "Control|Shift", action = "SpawnNewInstance" },
-{ key = "PageUp",  action = "ScrollLineUp" },
-{ key = "PageDown", action = "ScrollLineDown" },
-]

nvim/.vimrc

@@ -1,143 +0,0 @@
-syntax on
-set number
-set cursorline
-set expandtab tabstop=4 shiftwidth=4 softtabstop=4
-set autoindent
-set spelllang=vi,en
-
-
-" Fold
-set foldmethod=syntax
-set foldlevel=1
-set foldnestmax=1
-set encoding=utf8
-
-" Search
-set hlsearch
-nnoremap i :nohls<CR>i
-
-" Plugin
-call plug#begin()
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'dense-analysis/ale'
-Plug 'preservim/nerdtree'
-Plug 'preservim/nerdcommenter'
-Plug 'lervag/vimtex'
-Plug 'JuliaEditorSupport/julia-vim'
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
-Plug  'honza/vim-snippets'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'kevinhwang91/nvim-bqf' 
-Plug 'morhetz/gruvbox'
-Plug 'tpope/vim-fugitive'
-Plug 'ynkdir/vim-diff'
-Plug '4ree/vim-ime'
-call plug#end()
-
-"Color scheme
-"colorscheme iceberg
-"set background=light
-colorscheme gruvbox
-let g:gruvbox_contrast_light = 'hard'
-hi clear SpellBad
-hi SpellBad cterm=underline ctermfg=red
-
-
-"Open NERDTree
-:nnoremap <silent> <expr> <F2> g:NERDTree.IsOpen() ? "\:NERDTreeClose<CR>" : bufexists(expand('%')) ? "\:NERDTreeFind<CR>" : "\:NERDTree<CR>"
-
-"Coc.nvim
-inoremap <silent><expr> <TAB>
-      \ coc#pum#visible() ? coc#_select_confirm() :
-      \ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
-      \ CheckBackSpace() ? "\<TAB>" :
-      \ coc#refresh()
-inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
-                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
-
-function! CheckBackSpace() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
-let g:coc_snippet_next = '<tab>' 
-inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
-                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
-
-" Comments
-let mapleader = ","
-
-" remap save
-nnoremap <space> :w<CR>
-
-" moving between windows
-nnoremap <C-h> <C-W>h
-nnoremap <C-j> <C-W>j
-nnoremap <C-k> <C-W>k
-nnoremap <C-l> <C-W>l
-nnoremap <C-Left> <C-W>h
-nnoremap <C-Down> <C-W>j
-nnoremap <C-Up> <C-W>k
-nnoremap <C-Right> <C-W>l
-nnoremap <leader>to :tabonly<CR>
-nnoremap <leader>o :only<CR>
-nnoremap <leader><tab> :tabn<CR>
-nnoremap <S-tab> :tabp<CR>
-
-"set clipboard+=unnamedplus
-" " Copy to clipboard
-vnoremap  <leader>y  "+y
-nnoremap  <leader>Y  "+yg_
-nnoremap  <leader>y  "+y
-nnoremap  <leader>yy  "+yy
-
-" " Paste from clipboard
-nnoremap <leader>p "+p
-nnoremap <leader>P "+P
-
-
-" FZF key mapping
-nnoremap <silent> <Leader>b :Buffers<CR>
-nnoremap <silent> <Leader>r :Rg<CR>
-nnoremap <silent> <Leader>f :Files<CR>
-nnoremap <silent> <Leader>g :GFiles<CR>
-nnoremap <silent> <Leader>w :Rg <C-R><C-W><CR>
-
-filetype plugin on
-set splitright
-set splitbelow
-
-let g:vimtex_view_method= 'zathura'
-
-"Language tool
-map <F3> :ALEToggle<CR>
-
-
-"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
-"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
-"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
-if (empty($TMUX))
-  if (has("nvim"))
-    "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
-    let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-  endif
-  "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
-  "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
-  " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
-  if (has("termguicolors"))
-    set termguicolors
-  endif
-endif
-
-if &term =~ 'xterm' || &term == 'win32'
-    " Use DECSCUSR escape sequences
-    let &t_SI = "\e[5 q"    " blink bar
-    let &t_SR = "\e[3 q"    " blink underline
-    let &t_EI = "\e[1 q"    " blink block
-    let &t_ti ..= "\e[1 q"  " blink block
-    let &t_te ..= "\e[0 q"  " default (depends on terminal, normally blink
-    " block)
-endif
-

nvim/init.vim(server)

@@ -99,29 +99,3 @@ filetype plugin on
 set splitright
 set splitbelow
 
-"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
-"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
-"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
-if (empty($TMUX))
-  if (has("nvim"))
-    "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
-    let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-  endif
-  "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
-  "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
-  " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
-  if (has("termguicolors"))
-    set termguicolors
-  endif
-endif
-
-if &term =~ 'xterm' || &term == 'win32'
-    " Use DECSCUSR escape sequences
-    let &t_SI = "\e[5 q"    " blink bar
-    let &t_SR = "\e[3 q"    " blink underline
-    let &t_EI = "\e[1 q"    " blink block
-    let &t_ti ..= "\e[1 q"  " blink block
-    let &t_te ..= "\e[0 q"  " default (depends on terminal, normally blink
-    " block)
-endif
-

polybar/config.ini

@@ -54,7 +54,7 @@ separator-foreground = ${colors.disabled}
 font-0 = 0xProto Nerd Font:pixelsize=14;3
 
 modules-left = xworkspaces xwindow 
-modules-right = polytiramisu memory cpu date battery xkeyboard
+modules-right = polytiramisu memory cpu date battery
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -68,12 +68,6 @@ enable-ipc = true
 ; wm-restack = i3
 
 ; override-redirect = true
-[module/xkeyboard]
-type = internal/xkeyboard
-
-; List of indicators to ignore
-blacklist-0 = num lock
-blacklist-1 = scroll lock
 
 [module/xworkspaces]
 type = internal/xworkspaces

sway/config

@@ -24,7 +24,7 @@ set $menu rofi -show drun
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-set $bg /data/sync/images/wallpapers/0002.png
+set $bg /data/sync/images/wallpapers/0002.jpg
 set $screenlock 'swaylock -i $bg'
 set $images $(xdg-user-dir PICTURES)/$(date +'%s_grim.png')
 #
@@ -76,9 +76,8 @@ input "5426:156:Razer_Razer_DeathAdder_V2_X_HyperSpeed" {
 }
 
 #exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh
-exec --no-startup-id source ~/.config/fcitx.sh
-exec --no-startup-id fcitx5
 exec --no-startup-id kwalletd6
+exec --no-startup-id fcitx5
 #exec --no-startup-id blueman-applet
 exec --no-startup-id owncloud 
 exec --no-startup-id waybar
@@ -98,7 +97,7 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id $raise-volume
 bindsym XF86AudioLowerVolume exec --no-startup-id $lower-volume
 bindsym XF86AudioMute        exec --no-startup-id $mute-sink
 bindsym XF86AudioMicMute     exec --no-startup-id $mute-source
-bindsym $mod+slash  exec --no-startup-id $mute-sink
+bindsym $mod+slash  exec --no-startup-id wpctl $mute-sink
 bindsym $mod+period exec --no-startup-id $raise-volume
 bindsym $mod+comma  exec --no-startup-id $lower-volume
 

sway/swaylock.conf

@@ -1,5 +0,0 @@
-# Set a background image
-image=/data/sync/images/wallpapers/0002.png
-
-# Set the scaling mode for the image
-scaling=fill

waybar/config

@@ -4,7 +4,7 @@
                   // Choose the order of the modules
         "modules-left": ["sway/workspaces", "sway/window"],
         "modules-center": ["clock"],
-        "modules-right": ["custom/tiramisu","battery", "network", "bluetooth", "wireplumber", "tray"],
+        "modules-right": ["custom/tiramisu","battery", "bluetooth", "network", "wireplumber", "tray"],
         //"modules-right": ["custom/tiramisu", "bluetooth",network", "wireplumber", "tray"],
         // Modules configuration
         //        "hyprland/workspaces": {
@@ -29,20 +29,19 @@
             //"format": "{status}  ",
             "format-on": "",
             "format-off": "󰂲",
-            //"format-connected": "{device_alias} 󰂱",
+            "format-connected": "{device_alias} 󰂱",
-            "format-connected": "󰂱",
             // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
             "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
             "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
             "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
             "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
-            "on-click": "dbus-launch --exit-with-session blueman-manager"
+            "on-click": "~/.local/bin/rofi-bluetooth"
+            //"on-click": "blueman-manager"
         },
         "network": {
-            "interface": "wlp0s20f3",
+            "interface": "wls2",
             "format": "{ifname}",
-            //"format-wifi": "{essid} {icon}",
+            "format-wifi": "{essid} {icon}",
-            "format-wifi": "{icon}",
             "format-ethernet": "{ipaddr}/{cidr} 󰊗",
             "format-disconnected": "", //An empty format will hide the module.
             "tooltip-format": "{ifname} via {gwaddr} 󰊗",

waybar/style.css

@@ -83,6 +83,15 @@ tooltip label{
     background: @bg_hover;
     color: @content_main;
 }
+button {
+    border: none;
+    border-radius: 0;
+}
+button:hover {
+    box-shadow: inherit;
+    text-shadow: inherit;
+    background: inherit;
+}
 
 #taskbar {
 }