summaryrefslogtreecommitdiff
path: root/cfg
diff options
context:
space:
mode:
Diffstat (limited to 'cfg')
-rw-r--r--cfg/.vimrc16
-rw-r--r--cfg/i3/config2
-rw-r--r--cfg/i3/kurobar.sh16
3 files changed, 31 insertions, 3 deletions
diff --git a/cfg/.vimrc b/cfg/.vimrc
index 7e36cfc..fcce8ab 100644
--- a/cfg/.vimrc
+++ b/cfg/.vimrc
@@ -1,6 +1,9 @@
" vimrc fine shyt
+let g:editorconfig = 0
+filetype plugin on
" tabs are either 4 or nada
+filetype indent off
set tabstop=4
set shiftwidth=4
set expandtab
@@ -8,7 +11,6 @@ set exrc secure
set virtualedit=block
" c-o-l-o-r-s-!
syntax on
-filetype plugin on
" useful (i dont even use this anymore)
set backspace=indent,eol,start
nnoremap <C-S> :w<CR>
@@ -27,6 +29,9 @@ set mouse=
" for firenvim
set guifont=Comic\ Mono:h12
+"add time at the right of status bar thing
+set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P\ %{strftime(\"%Y年%m月%d日\ %H時%M分%S秒\")}
+
" vim-plug fine shyt
call plug#begin()
@@ -41,6 +46,7 @@ call plug#begin()
Plug 'vim-skk/skkeleton'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'windwp/nvim-autopairs'
+ Plug 'zenlang/zen.vim'
call plug#end()
@@ -122,3 +128,11 @@ inoremap <silent><expr> <CR> pumvisible() ? coc#_select_confirm() : "\<CR>"
" function signature while typing
autocmd CursorHoldI * silent call CocActionAsync('showSignatureHelp')
+" indentation stuff for js/ts because i guess so
+autocmd FileType javascript,typescript setlocal shiftwidth=4 tabstop=4 softtabstop=4
+autocmd FileType javascript,typescript setlocal indentexpr=
+
+" zen-c filetype detection (w zuhaitz)
+au BufRead,BufNewFile *.zc set filetype=zen
+
+
diff --git a/cfg/i3/config b/cfg/i3/config
index 3c92b2b..cfafdf4 100644
--- a/cfg/i3/config
+++ b/cfg/i3/config
@@ -31,6 +31,7 @@ bindsym $mod+BackSpace exec jmdmenu run
bindsym $mod_alt+Space exec jmdmenu run
bindsym $mod+Shift+BackSpace exec jmdmenu raw
bindsym $mod+Return exec $term
+bindsym $mod+Shift+Return exec xterm
bindsym $mod+Shift+b exec $browser
#bindsym $mod+v exec jmdmenu clipbd
bindsym $mod+period exec jmdmenu bmj
@@ -169,7 +170,6 @@ exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapp
exec --no-startup-id xinput set-prop "MOSART Semi. 2.4G Wireless Mouse" "libinput Accel Speed" -1
exec --no-startup-id blueman-applet
exec --no-startup-id xfsettingsd
-exec --no-startup-id clangd
# remap capslock to escape
exec --no-startup-id setxkbmap -option caps:escape
diff --git a/cfg/i3/kurobar.sh b/cfg/i3/kurobar.sh
index a9d82a0..aadcab3 100644
--- a/cfg/i3/kurobar.sh
+++ b/cfg/i3/kurobar.sh
@@ -11,6 +11,20 @@ while true; do
bat="N/A"
fi
+ # --- battery charge status --- silly ---
+ status=$(cat /sys/class/power_supply/BAT*/status)
+
+ if [[ "$status" == "Charging" && "$bat" -lt 70 ]]; then
+ charge_status="++ing~!"
+ elif [[ "$status" == "Charging" && "$bat" -ge 70 ]]; then
+ charge_status="++ing but.. i'm full~~"
+ elif [[ "$status" == "Discharging" && "$bat" -lt 40 ]]; then
+ charge_status="++ me~~!"
+ else
+ charge_status="--ing"
+ fi
+
+
# --- ram usage in gb ---
mem_used=$(free -g | awk '/^Mem:/ {print $3}')
mem_total=$(free -g | awk '/^Mem:/ {print $2}')
@@ -39,7 +53,7 @@ while true; do
dt=$(date '+%Y年%m月%d日 %H時%M分%S秒')
# --- print bar line ---
- echo "vol.$volume% | bat.$bat% | bri.$bright | lan.$localip | pub.$pubip | "$mem_used"/"$mem_total"gb | $dt"
+ echo "vol.$volume% | $charge_status ($bat%) | bri.$bright | lan.$localip | pub.$pubip | "$mem_used"/"$mem_total"gb | $dt"
sleep 0.01
done