commit 2e9dfd256db50cb5f22cd1239713de534d09d5a9
parent bb754015e660782df8ebc73103129ca2de5339a9
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Sat, 2 Jan 2021 13:51:04 -0800
Emacs changes
Diffstat:
4 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
@@ -6,10 +6,10 @@ ws1=("Web" "Music" "Mail" "_>" "Msg")
ws2=("_>" "_>" "_>" "_>" "Prop")
if [ "$HOST" = "Southpark" ]; then
- bspc monitor "HDMI-A-2" -d $ws1
- bspc monitor "DisplayPort-1" -d $ws2
- xset -display :0.0 s off
- xset -display :0.0 s noblank
+ bspc monitor "HDMI-A-2" -d $ws1
+ bspc monitor "DisplayPort-1" -d $ws2
+ xset -display :0.0 s off
+ xset -display :0.0 s noblank
else
bspc monitor -d $ws1 $ws2
fi
diff --git a/.config/polybar/desktop b/.config/polybar/desktop
@@ -303,7 +303,7 @@ label = %percentage_used%%
[module/wlan]
type = internal/network
-interface = wlp3s0
+interface = wlp5s0
interval = 3.0
format-connected = 🌐 <ramp-signal> <label-connected>
@@ -325,7 +325,7 @@ ramp-signal-foreground = ${colors.foreground-alt}
[module/eth]
type = internal/network
-interface = enp0s25
+interface = enp6s0
interval = 3.0
format-connected-underline = #55aa55
@@ -466,7 +466,7 @@ label-warn = %temperature-c%
label-warn-foreground = ${colors.secondary}
interval = 1
-hwmon-path = /sys/class/thermal/thermal_zone0/temp
+hwmon-path =/sys/class/thermal/thermal_zone3/temp
ramp-0 =
ramp-1 =
diff --git a/.emacs.d/lisp/config.org b/.emacs.d/lisp/config.org
@@ -242,7 +242,8 @@
:ensure t
:bind (:map cider-mode-map
("M-e" . cider-eval-last-sexp)
- ("C-x C-e" . nil))
+ ("M-r" . cider-eval-region)
+ )
:init
(eval-after-load "cider-mode"
'(define-key cider-mode-map (kbd "C-x") 'joe-nextword)))
@@ -369,8 +370,13 @@
** C
#+begin_src emacs-lisp
-(setq c-default-style "linux"
- c-basic-offset 4)
+
+(use-package cc-mode
+ :config
+ (setq c-default-style "linux"
+ c-basic-offset 4)
+ (c-set-offset 'inline-open '0))
+
#+end_src
** JavaScript
#+begin_src emacs-lisp
diff --git a/scripts/init-polybar.sh b/scripts/init-polybar.sh
@@ -1,5 +1,12 @@
#!/usr/bin/env sh
+polybar_conf="/home/ryan/.config/polybar/desktop"
+
+case $HOSTNAME in
+ (Southpark) polybar_conf="/home/ryan/.config/polybar/desktop" ;;
+ (*) polybar_conf="/home/ryan/.config/polybar/config" ;;
+esac
+
# Terminate already running bar instances
killall -q polybar
@@ -7,8 +14,6 @@ killall -q polybar
while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
# Launch Polybar, using default config location ~/.config/polybar/config
-polybar --reload main &
-
-#polybar main &
+polybar --reload main -c "$polybar_conf" &
echo "Polybar launched..."