nvim: added shell formatter

.config/nvim/init.lua

@@ -1,4 +1,4 @@
-vim.o.go = 'a'
+vim.o.go = "a"
 vim.o.showmode = false
 
 -- disable netrw
@@ -6,11 +6,11 @@ vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 
 -- enable mouse for all modes
-vim.o.mouse = 'a'
-vim.o.clipboard = 'unnamedplus'
+vim.o.mouse = "a"
+vim.o.clipboard = "unnamedplus"
 
 -- basic color settings
-vim.o.background = 'dark'
+vim.o.background = "dark"
 
 -- setting Tab-length
 vim.o.expandtab = true
@@ -61,10 +61,10 @@ vim.o.nobackup = true
 vim.o.nowritebackup = true
 
 -- set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
+vim.o.completeopt = "menuone,noselect"
 
 -- set completion option for command mode
-vim.o.wildmode = 'longest:full,full'
+vim.o.wildmode = "longest:full,full"
 
 -- minimum number of lines around the cursor
 vim.o.scrolloff = 10
@@ -78,14 +78,14 @@ vim.o.undofile = true
 vim.o.undodir = vim.env.XDG_CACHE_HOME .. "/vim/undo"
 
 -- python programs to use
-vim.g.python_host_prog = '/usr/bin/python2'
-vim.g.python3_host_prog = '/usr/bin/python3'
+vim.g.python_host_prog = "/usr/bin/python2"
+vim.g.python3_host_prog = "/usr/bin/python3"
 
 -- folding
-vim.o.foldcolumn = '0'
+vim.o.foldcolumn = "0"
 vim.o.foldlevel = 99
 vim.o.foldlevelstart = 99
-vim.o.foldexpr = 'expr'
+vim.o.foldexpr = "expr"
 vim.o.foldenable = true
 vim.o.conceallevel = 0
 vim.g.markdown_folding = 1
@@ -98,34 +98,35 @@ vim.o.textwidth = 80
 -- read files correctly
 vim.filetype.add({
   extension = {
-    c = 'c',
-    h = 'c',
-    html = 'html',
-    java = 'java',
-    js = 'javascript',
-    lua = 'lua',
-    md = 'markdown',
-    nim = 'nim',
-    py = 'python',
-    sage = 'python',
-    tex = 'tex',
-  }
+    c = "c",
+    h = "c",
+    html = "html",
+    java = "java",
+    js = "javascript",
+    lua = "lua",
+    md = "markdown",
+    nim = "nim",
+    py = "python",
+    sage = "python",
+    sh = "shell",
+    tex = "tex",
+  },
 })
 
 -- set mapleader for hotkeys
 vim.g.mapleader = ","
 
 -- load general mapped keys
-require('style')
+require("style")
 
 -- load dictionaries and helper functions
-require('dictionaries')
+require("dictionaries")
 
 -- load plugins (autoload all files in plugin folder)
-require('loadplugins')
+require("loadplugins")
 
 -- load general mapped keys
-require('keymap')
+require("keymap")
 
 vim.cmd([[
 set foldopen-=hor

.config/nvim/lua/plugins/conform.lua

@@ -5,10 +5,12 @@ return {
     config = function()
       require("conform").setup({
         formatters_by_ft = {
-          python = { "isort", "yapf" },
-          markdown = { "mdformat" },
-          tex = { "latexindent" },
           lua = { "stylua" },
+          markdown = { "mdformat" },
+          python = { "isort", "yapf" },
+          sh = { "beautysh" },
+          shell = { "beautysh" },
+          tex = { "latexindent" },
           yaml = { "yamlfmt" },
         },
       })
@@ -18,6 +20,12 @@ return {
           { "-y=defaultIndent: '  '" }
         ),
       }
+      require("conform").formatters.beautysh = {
+        args = require("conform.util").extend_args(
+          require("conform.formatters.beautysh").args,
+          { "--indent-size=2", "--force-function-style=fnpar" }
+        ),
+      }
     end,
   },
 }

.config/nvim/lua/plugins/mason.lua

@@ -9,7 +9,7 @@ return {
           require("null-ls").setup({
             sources = {
               -- latex
-              require("null-ls").builtins.formatting.latexindent,
+              -- require("null-ls").builtins.formatting.latexindent,
               -- lua
               require("null-ls").builtins.formatting.stylua,
               -- markdown
@@ -17,6 +17,8 @@ return {
               -- python
               require("null-ls").builtins.formatting.isort,
               require("null-ls").builtins.formatting.yapf,
+              -- shell
+              -- require("null-ls").builtins.formatting.beautysh,
               -- yaml
               require("null-ls").builtins.formatting.yamlfmt,
             }
@@ -37,6 +39,8 @@ return {
             -- python
             "isort",
             "yapf",
+            -- shell
+            "beautysh",
             -- yaml
             "yamlfmt",
           }

.config/sxhkd/sxhkdrc

@@ -11,11 +11,15 @@ super + r
         dmenu_run -F -i -c -l 20
 
 super + a
-        playerctl previous
+        lmc previous
 super + s
-        playerctl play-pause
+        lmc playpause
 super + d
-        playerctl next
+        lmc next
+super + c
+        lmc loop
+super + x
+        lmc shuffle
 super + f
         $TERMINAL -e $FILE
 

.local/bin/etc/statusbar/cpu

@@ -2,8 +2,6 @@
 
 model=$(cat /proc/cpuinfo | grep "model name" | head -n1)
 
-icon="^b#282828^^c#dfdfdf^  ^d^"
-
 if printf "$model " | grep -Fqe "AMD"; then
     temp=$(sensors | awk '/Tctl/ {print  $2}')
 else
@@ -12,4 +10,14 @@ fi
 
 temp=$(printf %3s $(echo ${temp##*+} | sed "s/\..*//") | tr ' ' ' ')
 
-echo "$icon $temp°C"
+if [ $temp -gt 100 ]
+then
+    icon="^b#282828^^c#ff0000^  ^d^"
+elif [ $temp -gt 80 ]
+then
+    icon="^b#282828^^c#ffff00^  ^d^"
+else
+    icon="^b#282828^^c#dfdfdf^  ^d^"
+fi
+
+echo "$icon"

.local/bin/etc/statusbar/disk

@@ -3,9 +3,21 @@
 # Status bar module for disk space
 # $1 should be drive mountpoint
 
-disk="/"
+disk="/home"
 [ ! -z "$1" ] && disk="$1"
 
 icon="$disk"
 
-printf "^b#282828^^c#dfdfdf^ 󰗮 ^d^ %s\n" "$(df -h "$disk" | awk ' /[0-9]/ {print $3 "/" $2}')"
+free=$(df "$disk" | awk ' /[0-9][0-9]/ {print $4}')
+
+if [ $free -gt 104857600 ]
+then
+    icon="^b#282828^^c#dfdfdf^ 󰗮 ^d^"
+elif [ $free -gt 52428800 ]
+then
+    icon="^b#282828^^c#ffff00^ 󰗮 ^d^"
+else
+    icon="^b#282828^^c#ff0000^ 󰗮 ^d^"
+fi
+
+printf "$icon %s"

.local/bin/etc/statusbar/gpu

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-icon="^b#282828^^c#dfdfdf^  ^d^"
+icon="^b#282828^^c#dfdfdf^  ^d^"
 
 temp=""
 
@@ -12,4 +12,14 @@ else
     return
 fi
 
-echo "$icon $temp°C"
+if [ $temp -gt 100 ]
+then
+    icon="^b#282828^^c#ff0000^  ^d^"
+elif [ $temp -gt 80 ]
+then
+    icon="^b#282828^^c#ffff00^  ^d^"
+else
+    icon="^b#282828^^c#dfdfdf^  ^d^"
+fi
+
+echo "$icon"

.local/bin/etc/statusbar/internet

@@ -2,9 +2,24 @@
 
 wifipercent="   0"
 
-[ "$(cat /sys/class/net/w*/operstate)" = 'down' ] && wifiicon="^c#ff0000^ ^d^"
+[ "$(cat /sys/class/net/w*/operstate)" = 'down' ] && wifiicon="^c#ff0000^ " && wifistatus="down"
 
-[ ! -n "${wifiicon+var}" ] && wifiicon="^c#dfdfdf^ ^d^" && wifipercent=$(grep "^\s*w" /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
+[ ! -n "${wifiicon+var}" ] && wifistatus="up" && wifipercent=$(grep "^\s*w" /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
 
 wifipercent=$(printf %3s $wifipercent | tr ' ' ' ')
-echo "$(cat /sys/class/net/e*/operstate | sed "s/down/^b#282828^^c#ff0000^  /;s/up/^b#282828^^c#dfdfdf^ 󰈀 /")" "$wifiicon" "$wifipercent%"
+
+if [ $wifistatus = "up" ]
+then
+    if [ $wifipercent -gt 75 ]
+    then
+        wifiicon=" ^d^"
+    elif [ $wifipercent -gt 40 ]
+    then
+        wifiicon=" ^d^"
+    else
+        wifiicon=" ^d^"
+    fi
+fi
+
+
+echo "$(cat /sys/class/net/e*/operstate | sed "s/down/^b#282828^^c#ff0000^  /;s/up/^b#282828^^c#dfdfdf^ 󰈀 /")" "$wifiicon"

.local/bin/etc/statusbar/memory

@@ -2,5 +2,16 @@
 
 icon="^b#282828^^c#dfdfdf^  ^d^ "
 total=$(free -h | awk '/^Mem:/ {print  $3/$2}')
-percent=$(printf %3s $(printf %-4s $total | tr ' ' '0' | cut -c1-4 | sed -e 's/\.//g' | sed -e 's/^0//g') | tr ' ' ' ')%
-echo "$icon$percent"
+percent=$(printf %3s $(printf %-4s $total | tr ' ' '0' | cut -c1-4 | sed -e 's/\.//g' | sed -e 's/^0//g') | tr ' ' ' ')
+
+if [ $percent -gt 75 ]
+then
+    icon="^b#282828^^c#ff0000^  ^d^"
+elif [ $percent -gt 50 ]
+then
+    icon="^b#282828^^c#ffff00^  ^d^"
+else
+    icon="^b#282828^^c#dfdfdf^  ^d^"
+fi
+
+echo "$icon"

.local/bin/etc/statusbar/player

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+playerctlstatus=$(playerctl status 2> /dev/null)
+track="$(playerctl metadata "xesam:artist") - $(playerctl metadata "xesam:title")"
+track=$(echo "$track" | cut -c1-40)
+loop=$(playerctl loop)
+shuffle=$(playerctl shuffle)
+
+if [ "$loop" = "Playlist" ]
+then
+    loop_icon=""
+elif [ "$loop" = "Track" ]
+then
+    loop_icon=""
+elif [ "$loop" = "None" ]
+then
+    loop_icon=""
+fi
+
+if [ "$shuffle" = "Off" ]
+then
+    shuffle_icon=""
+elif [ "$shuffle" = "On" ]
+then
+    shuffle_icon=""
+fi
+
+
+if [ "$playerctlstatus" = "" ]
+then
+    echo ""
+elif [ "$playerctlstatus" = "Playing" ]
+then
+    echo "$track ^b#282828^^c#dfdfdf^ ▶️  $loop_icon  $shuffle_icon ^d^"
+elif [ "$playerctlstatus" = "Paused" ]
+then
+    echo "^b#282828^^c#dfdfdf^   $loop_icon  $shuffle_icon ^d^"
+fi

.local/bin/etc/statusbar/volume

@@ -3,20 +3,20 @@
 vol="$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print $2}' | sed -e 's/\.//g' | sed 's/^0*//')"
 
 if [ "$vol" -eq "0" ]; then
-	vol_info="^c#dfdfdf^ ^d^"
+	vol_info="^c#dfdfdf^  "
 elif [ "$vol" -gt "70" ]; then
-	vol_info="^c#dfdfdf^ ^d^"
+	vol_info="^c#dfdfdf^  "
 else
-	vol_info="^c#dfdfdf^ ^d^"
+	vol_info="^c#dfdfdf^  "
 fi
 
-$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | grep -q '\[MUTED\]') && vol_info="^c#ff0000^ ^d^"
+$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | grep -q '\[MUTED\]') && vol_info="^c#ff0000^  "
 
 if wpctl get-volume @DEFAULT_SOURCE@ | grep -q '\[MUTED\]'; then
-	mic="^b#282828^^c#ff0000^  "
+	mic="^c#ff0000^  "
 else
-	mic="^b#282828^^c#dfdfdf^  "
+	mic="^c#dfdfdf^  "
 fi
 
 vol=$(printf %3s $vol | tr ' ' ' ')
-printf "%s %s %s %s\\n" "$mic" "$vol_info" "$vol%"
+printf "^b#282828^%s%s^d^ %s" "$mic" "$vol_info" "$vol%"

.local/bin/etc/sxhkd/audio/lmc

@@ -12,6 +12,11 @@ case "$1" in
         undeaf) wpctl set-mute @DEFAULT_SINK@ 0;;
         mute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1;;
         unmute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 0;;
+        previous) playerctl previous;;
+        playpause) playerctl play-pause;;
+        next) playerctl next;;
+        shuffle) playerctl shuffle toggle;;
+        loop) playerctl loop none;;
 	*) cat << EOF
 lmc: cli music interface for pulse for those with divine intellect too
 grand to remember the pamixer commands.
@@ -23,8 +28,12 @@ Allowed options:
   unmute        unmute microphone
   deaf          deaf sound
   undeaf        undeaf sound
+  previous      play previous song in player
+  playpause     toggle play or pause in player
+  next          play next song in player
   all else	Print this message
 
 EOF
 esac
 pkill -RTMIN+4 $STATUSBAR
+sleep 1 && pkill -RTMIN+9 $STATUSBAR