From 0b54bbc0897c7da59852b709a0aa7d96cc8e5c0c Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 5 Apr 2023 15:16:24 +0200 Subject: [PATCH 1/2] feat: sbar wlp module, dwm builtin set-light --- .config/nvim/pack/plugins/opt/lspconfig | 2 +- .config/nvim/pack/plugins/opt/treesitter | 2 +- .config/suckless | 2 +- .config/zsh/ohmyzsh | 2 +- bin/crypto | Bin 18264 -> 18232 bytes bin/music | 2 + bin/sbar | 53 ++++++++++++++++------- bin/set-light | 29 ------------- bin/set-vol | 2 +- bin/set-wlp | 16 +++++++ 10 files changed, 61 insertions(+), 49 deletions(-) create mode 100755 bin/music delete mode 100755 bin/set-light create mode 100755 bin/set-wlp diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index 0bc0c38..7179a46 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit 0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f +Subproject commit 7179a46c2345050783d14397e672e7b152a7af4f diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 871f566..411e771 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 871f5665d92d59a369cf916e9aa4d321d466f1e3 +Subproject commit 411e771d511442ab81670701f5c830f6c74aadd7 diff --git a/.config/suckless b/.config/suckless index d6372de..a259fb3 160000 --- a/.config/suckless +++ b/.config/suckless @@ -1 +1 @@ -Subproject commit d6372de826221674d1421ba3598aedc214183417 +Subproject commit a259fb34124799ff99e62e97a0905592c42a82b8 diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 8d23fbd..25c2c3a 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 8d23fbd6964b8446bbc73ff04507362d1fd49eb5 +Subproject commit 25c2c3a4683be60c3526858be960ee6ce1249245 diff --git a/bin/crypto b/bin/crypto index 6f59a336eea5b768b6f7a68a31a72fa92baabc72..c46ecf8e3e7c29ed14fa3cc207d2c5448b735a53 100755 GIT binary patch delta 3790 zcmZ`+3s6+o89sM$fi>XnBI~mF*cC;ML>8k4QILl$9B0tMRwvTfqQRvyQCWFpAgx^! zvZ*(lO%_i{v9(h(lgyYlnLwGE)z)^YiC`benrW-nI%+3QmuXT_VuZ$e`<-*|MIged07fCv9}eI@vDTaCaI)^ILW-u;!acdbXC*cdC6_+O;&Gu znN@O^?nzYdbS4({UIKBIZ<%`UE1Jx%1oeIidsebr2Q{lf&1#UnDSc>dbE!7t%w$9D z{I7}_HmKHNW=imUJ(WYMm|3WfAMVrN4xXw654n zJBmKy`$gp&EvYnE^eW_vEecV*PEnMz#+MGKeI~itoiry~Gc(0sn96NGpz=V3&l0ct zuc8E^<{w1OC!*)hY(*H_@rjGd2S%yfI!xuQaVl@TMuVPVYJSHPKSj_gv>-<1^VD21 zNP}BPp}RIQ;){q#yR}%)esT~FyJ&D)_7a|@U-pbHkJ8BQmKI<08n>IC+UaY^t!r%9 zN9Dk=d+?OIj&q89+gtZkBQ*5XUN>yqPp^PQk7^MS7VhSTy}mtO#PBsW)Om{=cEKX5 zS_}${=A!K8MNc=^(o=P@Ii--XN{@*~2$Z91^k^M%NehFF)d@PHmFS(g%%_$E-8}P-)0{|ak|@f*9-*Nw zv9M4`Y-mumQhQE3i1D}nBjym^=%8IRCtb8hi!pv4s_{O|Lmys@M|eZYp5gc%rr74L zeOEYp(4PbGUtt{KZ?~aW00W+nb2bqY-1sqia+HQ_ned#@>wDSbvs_XYYn$cr=S+xF zJ7K&+9i#IH;&vV#amjcymrQDAwUut zQEJlzNc+ z$baSYcVSc1`O%KoAm_OcMF9xP?;o_IU+c$^F?|ssBW6pA0TAH9M$9$+Joi6ijCFi8 zV*W;#7*q52&VMP;c%1jL)wZsu=6(IVl|#n5WWK5au|e_eqdc@llw`#0-zMVgHNukA zb)5Yz&pG}lR9;(2hggZERk1bat20=uWq|jnIgo-jM)sGH{ZC?iCCL6F&n=3?E+pA` zW<1C9NfUBBb(g)CVNbesm-is)`%Ok!5?<+Z4!bP&CmUM$TZ)uzSx@#h?(;S^l5HEm zM%YqUmY-zfMU(qz{Xd?2i)XK2S=mdU*tzVPZ)UCeP8MD7{z-c4!2XD9ofAEse z;m>;KFLvxet?ZE5o2ylR%1isBK0T~+uwll{BVC}$Cb_BSXoy>OnQ$JOdoqR>5Gb}F{ z)~6;Kwx=ZFp_v0wA!@Y=`l?C#%5nX6=%0Z;ADcSvpYW)G8*u;cLf?ssU7h6rw{icY z(?~k0M%zh~0^I9sT$Gx`qRT8<`e{o)UCEiRuI0h>Q`G_&>oqK5v1O~RuV-)tAr6&@ zk2!LkQX4DCeMib*Lm0c5$z3ZYvHt1bHw+fRan|9y@Gq7xOz=y@M)ZRo)%MnA@+LsR~5VFib`fxco&;E{X+tnkMhJiE}X_S6Syu z=Y}kZ@d%JM7v~4pD##@=i|8j}U9(QeGf2Exm#Dmjy|&7Z-m(Js^YQWkEG;NcxMZ^B zeRQ}B@`F?4FR}fr?8YC%D+{%nDV^X^Hk`wK8kTcxmKsHD9flu3ZZ$ZFety;GxXkSh zW}%%6tuXmgDGQQ4w*H_}99)nD8l{U7#Jm1ljs!<=kY0^V+AG7%uFq; xCRA0xa2{)_SZC|ejq$bQ*IfLTviB=;Op$ycAV=6(MgH{7>(sji5?fO;?|-(Q-^&01 delta 3867 zcmZ`+4Qx}_6~50-LJSGEA&znRv114U0c7cQf)n3B?szd|4*D?bTIHdqBt zalPVMp-FC;QmK=|)M_B1ktm>funGee2~wd>OSgoTE!(JMRwj~#7I&lazI&fv2oZTw z&Uf#3&OP^>bI-ee37wF7PDqWj%sp;0^c0XKB%KtHX=G}XyGhqIR?&1d^*VGnQ-22=PC1W{2S}8o^IW@Zk}>Y9CSfIYixfN@79JC=0^uRH`|>D{*MN z)G6$4s+oO}nr2atlCv53Q=h&LN%u)gvtgWcqa)4WmOQT|6B0MorAP3mK=)$p%O2 z=9f`l{vCe2H1K6@It}Lk3XbBYE>O|(cszbR`APGHN75|z^#tpLb=Wi|o!ef&%(saC zxp|_^m?@ZBG|(9mz2o)b-IoSq}}Yi_oClNA>4qOyn3Qv5O>$#~-1A zZmKWoqQSB#XiT5F+VWjIPFrqVD?@ZIQQw0@yJ#>edzJ`Sj=I7$w5PVVs%DwPK`-v8 zs?6J2xqk=Tx6y#NEJQ>5%XjCMAK0fT9Y3A#sD(0&fVya?vi!B(2OU)h>BY+O-R_#h z`*uQy%@J&9-_8SjYw|ZEPx-I3Q$D_kZy1!1Q(sg9*9fkKr}|YTf^MOK2$jNAiqI>4 zS{k^DA}yTj-`6CU}9~c(;L-3;oHimsqe^XQa4td&HaygCJkk6usTfxf8yb7=9}`VBob>CiS594 ztI|s8aMrN!JZ`3;zWD6F*r-KpK2lYQXDaKTPw0m?% zAK_i*?@0yK@4td;1sSc!70Y{u=NT=Ian}Y>k3sz_!u?QvybWUOq1)&Jjv$eVPh=wb zKID0ky4=wtSeu9dm#5yJhLb?_e?j!W=0||Aj`r}_a9qh(#|#VX?BjTR4h@P!<3~Of zfr=(VTgQes>4}EvDv-( z*?Hfq_{XuccyERtJHMO`?6ohmXV2NZ&A!z>*IsoHmlh`~?1V^@waXWvTG?39`Y;~f zgK=AbJYEVsGk{|Uo&&Z4F90LJOTd2M6`(-^ootCvYpU6nGC<1za+S^}sz}$K&UL%f5-n zZ?iL5InpbvJIgFN*?o+S%xJetkC_YdF7rTMW7UvnSQF&itR1qBbwh4u1CWKxINd7c zFc)Mx^FR)=YRF#J1bLaYLw>-zA%koHvYHuZSfx$O1)0x0kkeT;q>eQ~K4k5XpR;br zOKbr06fVG#1Rgymwj68OwEvwdf1#rKYjX)kDID~3TcJGHZ)q& za3|Wh1dERLN$bY2s(A+1HE)SAJc+v?#G(KRGh?1r>SC_Ea}s5L$GDV9j_te}W4)S4 zK5N%xHai>H?=^;E^-E6u601D={pH+^`o*U5^PU7(a9;f|Q~5{9o4CIz9gWTzTCawT zCwCKHl%jT65knhF_%MFe#@7>KRe&4@a{FBq6++Y!LkVefK9t}^4Z)8~@KKXuFY2ZY z@uf4s?^U*TLHZgK>!u13|G1pS6sk?``1g3!de@us8C532X|Fsd!E>*FrOTpZokH$O*{yVrIgIA2yyV ze63~@QNO?ymXKTAUZW@KnXCM5?#(j5S0R$t0)>Ayp^k}M#xc(#GwWNFWa2wIjf!$+ z!Un&&i_B61%UWc%lprI%`^Zc;2%CdK`hiX1wMA9Mat<|&#enc4254(SB5ta9koYKEC-)oRJh-UU~0 z6UL;Tb+1}%3}q=Z6~oL@jCJb&b<9(|n5D`F)>1sf#Q*U?(~C##wg@xIIhIG@B>bt` zaH8k1ubiX#maw18D;display" "RTMIN+n" -trap "update_vol;display" "RTMIN" -trap "update_backlight;display" "RTMIN+1" -trap "update_bat;display" "RTMIN+2" +# trap ';display' 'RTMIN+n' +trap 'reload_bar;display' 'RTMIN' +trap 'update_vol;display' 'RTMIN+1' +trap 'update_backlight;display' 'RTMIN+2' +trap 'update_crypto;display' 'RTMIN+3' # to update it from external commands ## kill -m "$(cat ~/.cache/pidofbar)" # where m = 34 + n sec=0 while true; do - sleep 1 & wait && { - [ $((sec % 3600)) -eq 0 ] && update_crypto - [ $((sec % 5 )) -eq 0 ] && update_time - [ $((sec % 5 )) -eq 0 ] && update_cpu - [ $((sec % 5 )) -eq 0 ] && update_memory - [ $((sec % 5 )) -eq 0 ] && update_bat - [ $((sec % 5 )) -eq 0 ] && display - - sec="$((sec + 1))" + [ "$((sec % 3600))" = 0 ] && update_crypto + [ "$((sec % 5 ))" = 0 ] && { + update_time + update_cpu + update_memory + update_bat + update_wlp + display } + + sleep 1 & wait + sec="$((sec + 1))" done diff --git a/bin/set-light b/bin/set-light deleted file mode 100755 index db379a0..0000000 --- a/bin/set-light +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e -shopt -s extglob nullglob - -set_brightness() { - local max; max="$(cat "$1"/max_brightness)" - local file="$1"/brightness - local val="$(($2 * max / 100 + 1))" - - [ "$val" -lt 0 ] && val=0 - [ "$val" -gt "$max" ] && val="$max" - echo "$val" > "$file" -} - -CUR_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/current_brightness" -CUR="$(cat "$CUR_FILE" 2> /dev/null || echo 50)" - -case "${1:0:1}" in - '') echo "$CUR"; exit ;; - '+'|'-') NEW="$((CUR - CUR % $1 + $1))" ;; - *) NEW="$1" ;; -esac - -for dev in /sys/class/backlight/*; do - set_brightness "$dev" "$NEW" -done - -echo "$NEW" > "$CUR_FILE" - -kill -35 "$(cat "$HOME/.cache/pidofbar")" diff --git a/bin/set-vol b/bin/set-vol index a94ca99..f039786 100755 --- a/bin/set-vol +++ b/bin/set-vol @@ -18,4 +18,4 @@ else fi # update sbar -kill -34 "$(cat "$HOME/.cache/pidofbar")" +kill -35 "$(cat "$HOME/.cache/pidofbar")" diff --git a/bin/set-wlp b/bin/set-wlp new file mode 100755 index 0000000..430443b --- /dev/null +++ b/bin/set-wlp @@ -0,0 +1,16 @@ +#!/bin/bash -e + +if [ -n "$1" ]; then + nmcli device wifi con "$1" +else + readarray -t NET <<< \ + "$(nmcli -f SSID,CHAN,RATE,SIGNAL,BARS,SECURITY dev wifi list \ + | awk '!seen[$1]++')" + + COLUMNS=1 + select net in "${NET[@]}"; do + nmcli device wifi con "$(awk '{print $1}' <<< "$net")" && break + done +fi + +kill -37 "$(cat "$HOME/.cache/pidofbar")" From 1938b20c822283b2b5c7cafd116dede2405582af Mon Sep 17 00:00:00 2001 From: AngeD Date: Sun, 9 Apr 2023 12:49:01 +0200 Subject: [PATCH 2/2] feat: nvim cin --- .config/nvim/ftplugin/python.lua | 1 - .config/nvim/init.lua | 53 +++++++++++++++++--------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua index a7cb556..e437f58 100644 --- a/.config/nvim/ftplugin/python.lua +++ b/.config/nvim/ftplugin/python.lua @@ -1,5 +1,4 @@ -- variables -vim.g.black_linelength = 79 -- keybindings vim.keymap.set("n", "f", "Black", {buffer=true}) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 729c350..f839fdd 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -2,43 +2,48 @@ ----- variables ----- --------------------- -vim.g.mapleader = " " +vim.g.mapleader = " " -vim.o.expandtab = true -vim.o.smartindent = true -vim.o.shiftwidth = 4 -vim.o.tabstop = 4 +vim.o.expandtab = true +vim.o.smartindent = true +vim.o.shiftwidth = 4 +vim.o.tabstop = 4 +vim.o.cino = "(s" +vim.g.python_indent = { + open_paren = "shiftwidth()" +} -vim.o.list = true -vim.o.listchars = "tab:> ,trail:-,nbsp:+,leadmultispace:│ " +vim.o.list = true +vim.o.listchars = "tab:> ,trail:-,nbsp:+,leadmultispace:│ " -vim.o.number = true -vim.o.relativenumber = true -vim.o.laststatus = 3 +vim.o.number = true +vim.o.relativenumber = true +vim.o.laststatus = 3 -vim.o.ignorecase = true -vim.o.smartcase = true +vim.o.ignorecase = true +vim.o.smartcase = true -vim.o.guicursor = "" +vim.o.guicursor = "" -vim.o.path = vim.o.path .. ",**" -vim.o.suffixes = vim.o.suffixes .. ",.pyc,.hi" +vim.o.path = vim.o.path .. ",**" +vim.o.suffixes = vim.o.suffixes .. ",.pyc,.hi" -vim.o.foldmethod = "indent" -vim.o.foldlevel = 99 +vim.o.foldmethod = "indent" +vim.o.foldlevel = 99 -vim.o.grepprg = "grep -rn" +vim.o.grepprg = "grep -rn" -vim.o.scrolloff = 2 -vim.wo.colorcolumn = "80" +vim.o.scrolloff = 2 +vim.wo.colorcolumn = "80" +vim.g.black_linelength = 79 -vim.g.netrw_banner = 0 +vim.g.netrw_banner = 0 -vim.o.lazyredraw = true +vim.o.lazyredraw = true -vim.o.complete = vim.o.complete .. ",i" +vim.o.complete = vim.o.complete .. ",i" -vim.o.mousemodel = extend +vim.o.mousemodel = extend -------------------- ----- packages -----