From 07700484d1b7e6c0665401ed62c119eeb51eda7d Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Tue, 28 Feb 2023 10:13:06 +0100 Subject: [PATCH] Stuff --- emacs/.config/emacs/init.el | 4 ---- eww/.config/eww/eww.yuck | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index f4ea640..1ef53ac 100644 --- a/emacs/.config/emacs/init.el +++ b/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 diff --git a/eww/.config/eww/eww.yuck b/eww/.config/eww/eww.yuck index 73652ff..f794185 100644 --- a/eww/.config/eww/eww.yuck +++ b/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")