Fix stuff

This commit is contained in:
Marco Thomas
2022-05-20 11:52:16 +02:00
parent 6f032ddd27
commit 9e0589a9cf
3 changed files with 17 additions and 13 deletions

View File

@@ -317,7 +317,7 @@ Use =doom-modeline= as a bar... together with icons and nyan cat!
#+end_src #+end_src
Show me the time! Show me the time!
#+begin_src emacs-lisp #+begin_src emacs-lisp :tangle no
(display-time-mode) (display-time-mode)
#+end_src #+end_src
@@ -696,13 +696,12 @@ Auto matching pairs are reaaaaally nice.
:straight t :straight t
:general :general
(vim-leader-def 'normal 'global (vim-leader-def 'normal 'global
"gb" 'magit-branch "gb" 'magit-blame
"gc" 'magit-checkout "gc" 'magit-checkout
"gc" 'magit-commit "gc" 'magit-commit
"gd" 'magit-diff "gd" 'magit-diff
"gg" 'counsel-git-grep "gg" 'counsel-git-grep
"gi" 'magit-gitignore-in-topdir "gi" 'magit-gitignore-in-topdir
"gj" 'magit-blame
"gl" 'magit-log "gl" 'magit-log
"gp" 'magit-push "gp" 'magit-push
"gs" 'magit-status "gs" 'magit-status
@@ -989,9 +988,9 @@ Who needs LaTeX when you can have the power of unicode?
("\\bigo" ?𝒪) ("\\bigo" ?𝒪)
; Greek ; Greek
("\\Ga" ?α) ("\\GA" ?Α) ("\\a" ?α) ("\\Ga" ?α) ("\\GA" ?Α) ("\\alpha" ?α)
("\\Gb" ) ("\\GB" ?Β) ("\\b" ) ("\\Gb" ) ("\\GB" ?Β) ("\\beta" )
("\\Gg" ?γ) ("\\GG" ) ("\\g" ?γ) ("\\Gamma" ) ("\\Gg" ?γ) ("\\GG" ) ("\\gamma" ?γ) ("\\Gamma" )
("\\Gd" ) ("\\GD" ) ("\\delta" ) ("\\Delta" ) ("\\Gd" ) ("\\GD" ) ("\\delta" ) ("\\Delta" )
("\\Ge" ) ("\\GE" ?Ε) ("\\epsilon" ) ("\\Ge" ) ("\\GE" ?Ε) ("\\epsilon" )
("\\Gz" ) ("\\GZ" ?Ζ) ("\\Gz" ) ("\\GZ" ?Ζ)
@@ -999,7 +998,7 @@ Who needs LaTeX when you can have the power of unicode?
("\\Gth" ) ("\\GTH" ) ("\\theta" ) ("\\Theta" ) ("\\Gth" ) ("\\GTH" ) ("\\theta" ) ("\\Theta" )
("\\Gi" ?ι) ("\\GI" ?Ι) ("\\iota" ?ι) ("\\Gi" ?ι) ("\\GI" ?Ι) ("\\iota" ?ι)
("\\Gk" ) ("\\GK" ?Κ) ("\\Gk" ) ("\\GK" ?Κ)
("\\Gl" ) ("\\GL" ) ("\\lam" ) ("\\Gl" ) ("\\GL" ) ("\\lambda" )
("\\Gm" ) ("\\GM" Μ) ("\\mu" ) ("\\Gm" ) ("\\GM" Μ) ("\\mu" )
("\\Gx" ) ("\\GX" ) ("\\xi" ) ("\\Xi" ) ("\\Gx" ) ("\\GX" ) ("\\xi" ) ("\\Xi" )
("\\Gp" ) ("\\GP" ) ("\\pi" ) ("\\Pi" ) ("\\Gp" ) ("\\GP" ) ("\\pi" ) ("\\Pi" )

View File

@@ -16,22 +16,23 @@ else
fi fi
wifi=$(iwgetid -r) wifi=$(iwgetid -r)
if [ -z $wifi ]; then if [ -z "$wifi" ]; then
wifi='no wifi' wifi='no wifi'
fi fi
powermode=$(cat /sys/firmware/acpi/platform_profile) powermode=$(cat /sys/firmware/acpi/platform_profile)
cpu_util=$(ps -A -o pcpu | tail -n+2 | paste -sd+ | bc) # cpu_util=$(ps -A -o pcpu | tail -n+2 | paste -sd+ | bc)
cpu_util=$(cat /proc/loadavg | awk '{print $1, $2, $3}')
if [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') = 'no' ]; then if [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') = 'no' ]; then
audio=" $(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}')" audio="$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}')"
else else
audio="婢 muted" audio="婢 muted"
fi fi
light=$(light -G | awk '{print int($1+0.5)'})"%" light=$(light -G | awk '{print int($1+0.5)'})"%"
sep=" " sep=" "
echo "${sep} ${light} ${sep} ${audio} ${sep} ${wifi} ${sep} ${powermode}: ${cpu_util} ${sep} ${conservation} ${sep} ${battery}% ${bat_rem} ${sep} ${date}" echo "${sep}${light} ${sep} ${audio} ${sep}${wifi} ${sep}${powermode}: ${cpu_util} ${sep}${conservation} ${sep}${battery}% ${bat_rem} ${sep}${date}"

View File

@@ -152,6 +152,10 @@ input type:keyboard {
bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+9 move container to workspace number $ws9
bindsym $mod+Shift+0 move container to workspace number $ws10 bindsym $mod+Shift+0 move container to workspace number $ws10
# Move between displays
bindsym $mod+Control+$left move workspace to output left
bindsym $mod+Control+$right move workspace to output right
# Layout stuff: # Layout stuff:
workspace_layout stacking workspace_layout stacking