Stuff

emacs/.config/emacs/init.el

@@ -57,12 +57,9 @@
 ;; Disable backup files etc.
 (setq make-backup-files nil)
 
-<<<<<<< HEAD
-=======
 ;; Melpa
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(package-initialize)
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -88,7 +85,6 @@
  ;; If there is more than one, they won't work right.
  )
 
->>>>>>> master
 ;; LSP
 (require 'use-package)
 (use-package lsp-mode

eww/.config/eww/eww.yuck

@@ -250,7 +250,7 @@
     )))
 
 (defpoll music-active         :interval "200ms"  "scripts/musicstatus")
-(defpoll music-status         :interval "200ms"  "playerctl status &>/dev/null")
+(defpoll music-status         :interval "200ms"  "playerctl status")
 (defpoll artUrl               :interval "200ms"  "playerctl metadata artUrl &>/dev/null")
 (defpoll title                :interval "200ms"  "playerctl metadata title &>/dev/null")
 (defpoll artist               :interval "200ms"  "playerctl metadata artist &>/dev/null")