Skip to content

Commit

Permalink
fixed regular polybar
Browse files Browse the repository at this point in the history
  • Loading branch information
@ediw8311xht
ediw8311xht committed Jan 26, 2023
1 parent 348e241 commit da246f5
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 76 deletions.
7 changes: 5 additions & 2 deletions bash/bashrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ alias hf=' find $HOME -iname'
alias mf=' find . -iname'
alias ic=' clear; imgcat'
alias nv=' nvim'
alias nvp=' nvim -p'
alias nvo=' nvim -O'
alias snv=' sudoedit'
alias sf=' clear; screenfetch 2>/dev/null'
alias ac=' acheck'
Expand Down Expand Up @@ -275,7 +277,8 @@ alias xprattach=" nohup /usr/bin/xpra attach :${XPRA_DISPLAY_NUMBER} &"
alias img=' nsxiv -0'
alias nimg=' nsxiv -0 .'
alias ldi=' fdisk -l -o +uuid'
alias szof=' du -ahc --time --max-depth=1'
alias szof=" du -axhc --time --max-depth=1 | grep -Pv '^0[ \t]' | sort -h"
alias szofall=' du -ahc --time --max-depth=1'
alias bgsz=" sudo szof | grep -P '^[^ ]*G'"
alias pcal=' calcurse'
#alias l=' lsd --icon="never"'
Expand Down Expand Up @@ -305,7 +308,7 @@ alias vids=' cd "$HOME/Videos/"'
alias wallz=' cd "$HOME/Pictures/Wallpapers"'
alias nswp=' cd "$HOME/.mynvim/swapfiles/"'
alias ytdl=' yt-dlp -o "$HOME/Videos/%(title)s.%(ext)s" --restrict-filename'
alias m=' man'
alias m=' men'
alias tst=' . $HOME/test.sh'
alias git_mt=' git log --pretty=format:"%h %s" --graph'
alias mansec=' man -f'
Expand Down
159 changes: 94 additions & 65 deletions nvim/init.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,17 @@ endfu

fu! Web(url)
enew
call termopen('w3m "www.stackoverflow.com"')
call termopen('elinks "www.google.com"')
endfunction

"<--------- MY VARS -------------------------------------------------------->
let jam="hi FoldColumn gui=bold guibg=NONE guifg=#00ff00"
let GreatJammy=':call CorrectColors()'
let g:myScheme = [ 'pop-punk', 'eldar', 'elflord', 'delek', 'morning', 'blue', 'cyberpunk-neon', 'peachpuff', 'industry' ]
let g:mySpec = [ ".", jam, ".", ".", ".", ".", GreatJammy, '.', '.']

let g:myBg = [ "#000000", "#333333", "#111111", "#220000", "#002200", "#000022", "#002244" ]
let g:myFg = [ ".", ".", ".", ".", ".", ".", "#aaaaaa" ]

let g:myBg+=["NONE"] | let g:myFg+=[ "."]

let g:python3_host_prog="/usr/bin/python"
"<--------- LET/SET -------------------------------------------------------->
filetype off
Expand Down Expand Up @@ -152,9 +149,9 @@ autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
let g:html_dynamic_folds = 1
let g:coc_start_at_startup = v:true
let g:coc_enable_at_startup = v:false
let g:mapleader = ","
let mapleader = ","
let maplocalleader = ","
let g:mapleader = " "
let mapleader = " "
let maplocalleader = " "

"<--------- PLUGINS -------------------------------------------------------->
call plug#begin()
Expand Down Expand Up @@ -192,6 +189,10 @@ call plug#end()

"<--------_G-VAR_<leader>f_from-:-lf
lua require('base')
let g:bracey_refresh_on_save = 1
let g:bracey_eval_on_save = 1
let g:bracey_auto_start_browser = 0
let g:bracey_server_port = 4842
let g:lf_map_keys = 0
let g:html_mode = 1
let g:is_bash = 1
Expand Down Expand Up @@ -227,75 +228,103 @@ set nocuc
"list keybindings with :help index
"list user keybindings with :map
"nn <leader>. :NERDTreeToggle<esc>
cal L('<leader>', ' <C-^>')
cal L( 'a', ':cal Tog(g:coc_enabled, 0, ":CocEnable", ":CocDisable")<esc>')
cal L( 'b', ':ls<CR>:b<Space>')
cal L( 'c', ':set nocursorline!<esc>')
cal L( 'e', ':set cursorcolumn!<esc>')
cal L( 'f', ':set wrap!<esc>')
cal L( 'h', ':cal Tog(&ls, 0, "set ru \| set ls=2", "set noru \| set ls=0")<esc>')
cal L( 'j', ':cal CyCol(+1)<CR>')
cal L( 'J', ':cal CyCol(-1)<CR>')
cal L( 'n', ':next<esc>')
cal L( 'p', ':previous<esc>')
cal L( 'a' , ':cal Tog(g:coc_enabled, 0, ":CocEnable", ":CocDisable")<esc>')
cal L( 'b' , ':ls<CR>:b<Space>' )
cal L( 'c' , ':set nocursorline!<esc>')
cal L( 'd' , '<C-d>' )
cal L( 'e' , ':set cursorcolumn!<esc>')
cal L( 'f' , ':set wrap!<esc>' )
cal L( 'g' , ':enew<esc>' )
cal L( 'h' , ':cal Tog(&ls, 0, "set ru \| set ls=2", "set noru \| set ls=0")<esc>')
cal L( 'j' , ':cal CyCol(+1)<CR>' )
cal L( 'l' , ':cal CyBac(+1)<CR>' )
cal L( 'n' , ':next<esc>' )
cal L( 'oc' , 'q:iput=execute("")<esc>A<C-c>')
cal L( 'op' , 'q:<C-p><esc>Iput =execute("<esc>A")<esc>A<C-c>')
cal L( 'ox' , ':put =execute("<C-r>0")<esc>')
cal L( 'out' , 'q:iput =execute("<C-r>0")<esc>A<C-c>')
cal L( 'p' , ':previous<esc>' )
"cal L( 'q' , '' )
cal L( 'r' , '<C-w>' )
cal L( 's' , ':%so "${HOME}/.config/nvim/init.vim"<esc>')
cal L( 'tcc' , ':tabclose<esc>' )
cal L( 'tt' , ':tabnew<esc>' )
cal L( 'tn' , ':tabmove +1<esc>' )
cal L( 'tp' , ':tabmove -1<esc>' )
cal L( 'tb' , ':tabmove -1<esc>' )
cal L( 'tm' , ':tabmove' )
cal L( 'tf' , ':tabfirst<esvsplitc>')
cal L( 'tl' , ':tablast<esc>' )
cal L( 'tB' , ':tabmove -1<esc>' )
cal L( 'tN' , ':tabmove +1<esc>' )
cal L( 'u' , '<C-u>' )
cal L( 'var' , ':let maxvar ="<C-r>1<C-r>0"')
cal L( 'vf' , '?<C-r>"<enter>' )
cal L( 'vm' , ':put =eval("<C-r>0")')
cal L( 'vq' , ':put =eval("<C-r>0")<esc>')
cal L( 'vv' , ':cal Cy(["none", "all", "block"], &ve, ["set ve=all \| echo &ve", "set ve=block \| echo &ve", "set ve=none \| echo &ve"], 0)<esc>')
cal L( 'vz' , 'i<C-r>"' )
cal L( 'w' , ':w<esc>' )
cal L( 'x' , ':w<esc>:!%:p<esc>' )
cal L( 'y' , ':hi Normal guibg=Transparent<esc>')
cal L( 'z' , 'z' )

cal L( 'B' , ':Buffers<esc>' )
cal L( 'D' , ':Bracey<esc><enter>')
cal L( 'G' , ':buff term://<esc>iohttp://localhost:4842')
cal L( 'H' , ':vert helpgrep ' )
cal L( 'J' , ':cal yCol(-1)<CR>' )
cal L( 'L' , ':cal CyBac(-1)<CR>' )
cal L( 'M' , ':messages<esc>' )
cal L( 'N' , ':cnext<esc>' )
cal L( 'P' , ':cprevious<esc>' )
cal L( 'S' , ':BraceyStop<esc>' )
cal L( 'T' , ':buff term://<esc>i')
cal L( 'W' , ':call Web("f")<esc>i')

cal L( 's', ':%so "${HOME}/.config/nvim/init.vim"<esc>')
cal L( 'w', ':w<esc>')
cal L( 'x', ':!%:p<esc>')
cal L( 'y', ':hi Normal guibg=Transparent<esc>')
cal L( 'z', 'z')
cal L( 'l', ':cal CyBac(+1)<CR>')
cal L( '<leader>' , ' <C-^>' )
cal L( '<enter>' , ':set paste!<esc>' )
cal L( ';' , ':ls<CR>:b<Space>' )
"cal L( '.' , ':bnext<esc>' )
cal L( '/' , ':Explore<CR>' )

cal L( '[' , ':bprevious<CR>' )
cal L( ']' , ':bnext<CR>' )

cal L( 'N', ':cnext<esc>')
cal L( 'P', ':cprevious<esc>')
cal L( 'L', ':cal CyBac(-1)<CR>')
cal L( 'B', ':Buffers<esc>')
cal L( 'D', ':Bracey<esc>')
cal L( 'H', ':vert helpgrep ')
cal L( 'M', ':messages<esc>')
cal L( 'W', ':call Web("f")<esc>')
cal L( ';', ':ls<CR>:b<Space>')
cal L( '.', 'q:')
cal L( '/', ':Explore<CR>')
cal L( 'op', 'q:<C-p><esc>Iput =execute("<esc>A")<esc>A<C-c>')
cal L( 'oc', 'q:iput =execute("")<esc>A<C-c>')
cal L( 'ox', ':put =execute("<C-r>0")<esc>')
cal L( 'vv', ':cal Cy(["none", "all", "block"], &ve, ["set ve=all \| echo &ve", "set ve=block \| echo &ve", "set ve=none \| echo &ve"], 0)<esc>')
cal L( 'tt', ':tabnew<esc>')
cal L( 'tn', ':tabmove +1<esc>')
cal L( 'tp', ':tabmove -1<esc>')
cal L( 'tb', ':tabmove -1<esc>')
cal L( 'tm', ':tabmove')
cal L( 'tf', ':tabfirst<esc>')
cal L( 'tl', ':tablast<esc>')
cal L( 'tN', ':tabmove +1<esc>')
cal L( 'tB', ':tabmove -1<esc>')
cal L( 'vm', ':put =eval("<C-r>0")')
cal L( 'vq', ':put =eval("<C-r>0")<esc>')
cal L( 'vz', 'i<C-r>"')
cal L( 'vf', '?<C-r>"<enter>')
cal L( 'out', 'q:iput =execute("<C-r>0")<esc>A<C-c>')
cal L( 'tcc', ':tabclose<esc>')
cal L( 'var', ':let maxvar ="<C-r>1<C-r>0"')
cal L( '<C-w>line', ':cal Tog(&cc, 0, "set cc=80", "set cc=0")<esc>')
no <leader>zaf gg/<C-r>0<esc>jVnkzf

map <Space> <leader>
map , <leader>
vn <leader>x c<esc>l:execute "normal! i" . eval('<C-r>"')<esc>
vn im :s/\%V[ \t]*//<esc>| "REMOVE TABS ON VISUAL SELECTION
vn <Enter> zf
nn <leader>q :bd<esc>
nn ZC :bd<esc>
nn ZG :bd!<esc>
no <leader>zaf gg/<C-r>0<esc>jVnkzf
nn <C-p> <C-i>
nn HEALTH :checkhealth<esc>
vn im :s/\%V[ \t]*//<esc>| "REMOVE TABS ON VISUAL SELECTION
vn <Space> zf
sil nn <silent><esc> :noh<esc>
sil nn <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
nn / /\v\c
nn <lt> :tabprevious<esc>
nn > :tabnext<esc>
nn x "xx
nn \ `
nn <C-w>n :new<esc><C-w>L
sil nn <silent><esc> :noh<esc>
sil nn <Enter> @=(foldlevel('.')?'za':"\<Space>")<CR>
im jk <esc>
inoremap <C-e> <esc>A
inoremap <C-a> <esc>I
inoremap <C-b> <left>
inoremap <C-f> <right>
"Exit Terminal and Change Buffer
tnoremap <leader><leader> <C-\><C-n>:Buffers<esc>
tnoremap <leader>. <C-\><C-n>:bnext<esc>
tnoremap <leader><esc> <C-\><C-n>
tnoremap <leader>G <C-\><C-n>iohttp://localhost:4842<enter>
"nn dd "Ddd
"nn D "DD
Expand All @@ -317,13 +346,13 @@ set statusline+=%{wordcount().words}\ w\
autocmd BufNewFile,BufRead *.sh set syntax=zsh
autocmd BufNewFile,BufRead ~/.config/polybar/config setfiletype dosini
autocmd BufNewFile,BufRead ~/.config/i3/* setfiletype i3

"map <C-b> nn <leader>bb :buffers<cr>:b<space>
vn <leader>M :!dc<esc>
vn <leader>m :!bc<esc>
"map <c-b> nn <leader>bb :buffers<cr>:b<space>
"nn <leader><leader> :<backspace>
"nn <leader>ap :let @+="<C-r>1<C-r>0"
"nn <leader>ap :let @+="<c-r>1<c-r>0"
"1+2
"vn <leader>vq q:o<C-c>put =execute(' <C-R>0')
"vn <leader>dc :put =execute('dc <C-r>0')<esc>
"vn <leader>vq q:o<c-c>put =execute(' <C-R>0')

"nn <leader>mq :put =execute('echo <c-r>0')<esc>
"vn <leader>c c<esc>l:execute "normal! i" . execute("!<C-r>"")<esc>
Expand Down
18 changes: 9 additions & 9 deletions xorg/Xresources
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

*.alpha: 1
!*.font: Tamsyn:pixelsize=18:autohint=true:antialias=true
!!*.font: Tamsyn:pixelsize=18:autohint=true:antialias=true
!*.font: TerminessTTF Nerd Font Mono:pixelsize=18:autohint=true:antialias=true
!*.font: xos4Terminus:pixelsize=18:autohint=false:antialias=true
!*.font: Agave:style=Regular:size=12:antialias=true
!*.font: IosevkaCustom:pixelsize=14:antialias=true:autohint=false
!*.font: xos4Terminus:pixelsize=18:autohint=true:antialias=true
*.font: Agave:style=Regular:size=12:antialias=true
!*.font: IosevkaCustom:pixelsize=15:antialias=true:autohint=false
!*.font: Monoid:size=15:antialias=true:autohint=true
*.font: FantasqueSansMono:style=Regular:pixelsize=15:autohint=true:antialias=true
!*.font: FantasqueSansMono:style=Regular:pixelsize=15:autohint=true:antialias=true
!*.font: ComicMono:size=14:autohint=true:antialias=true
!*.font: Lekton:size=13:style=Medium:autohint=false:antialias=true
!*.font: CascadiaMono:size=15:antialias=true
Expand All @@ -17,10 +17,10 @@
!*.font: FiraCodeNerdFont:size=18:antialias=false:autohint=false
!*.font: IosevkaNerdFont:size=15:antialias=true:autohint=true
!*.font: SarasaMonoSlabCL:pixelsize=15:antialias=true:autohint=true
!*.font: SarasaMonoSCNerd:size=15:antialias=true:autohint=true
!*.font: SarasaMonoSCNerd:pixelsize=15:antialias=true:autohint=true
!*.font: Hack:size=15:antialias=true:autohint=true
!*.font: Hermit:size=15:antialias=true:autohint=true
!*.font: IBM 3270:size=19:antialias=true:autohint=true
!*.font: IBM 3270:pixelsize=15:antialias=true:autohint=true
!!!!!!!!!!!!!!ISSUES in st with SharTechMono only with ('fig' displays incorrectly) ShareTechMono
!*.font: ShareTechMono:size=13:style=Regular:autohint=true:antialias=true
!!!!!!!COOL FONTS (my names for ref):
Expand Down Expand Up @@ -88,9 +88,9 @@
!!!!!!!!!!!!!!!!!!!!!!!----------------SPECIAL------(FLOAT)--FROM:-[http://dotshare.it/dots/136/]
!!special_float.font: Agave:style=Regular:pixelsize=17:antialias=true
!!special_float*alpha: 1
special_float*background: #000022
special_float*background: #000011
!!special_float*foreground: #f8f8f2
!!special_float*borderpx: 10px
!special_float*borderpx: 10px
!!special_float*cursorColor: #d4d7d4
!!special_float*internalBorder: 10px
!!special_float*color0: #1B1D1E
Expand Down

0 comments on commit da246f5

Please sign in to comment.