summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/dots/.emacs66
-rw-r--r--os/config.scm15
2 files changed, 60 insertions, 21 deletions
diff --git a/home/dots/.emacs b/home/dots/.emacs
index dd9adfb..6c2eeb9 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -4,39 +4,39 @@
(setq
inhibit-startup-screen t
default-frame-alist '((font . "Iosevka SS13 Extended")
- (height . 170)
+ (height . 125)
(line-spacing . 0.5))
;; undo
undo-limit 10000000
undo-outer-limit 20000000
;; Package list
- package-list '(
- magit
- nix-mode
- go-mode
+ package-list '(almost-mono-themes
+ avy
devdocs
- rec-mode
- almost-mono-themes
eldoc-box
- markdown-mode
- nov
- yasnippet
- yasnippet-snippets
- pinentry
- geiser
- geiser-guile
- guix
- avy
- tldr
elfeed
elfeed-protocol
- exwm
emms
+ expand-region
+ exwm
+ geiser
+ geiser-guile
+ go-mode
+ guix
+ lem
+ magit
+ markdown-mode
mastodon
+ nix-mode
+ nov
+ org-remark
pass
- lem
- expand-region)
+ pinentry
+ rec-mode
+ tldr
+ yasnippet
+ yasnippet-snippets)
package-archives '(("elpa" . "https://elpa.gnu.org")
("gnu" . "http://elpa.gnu.org/packages/")
@@ -205,6 +205,30 @@
:init
(add-to-list 'auto-mode-alist '("\\.epub'" . nov-mode)))
+(use-package org-remark
+ :bind (;; :bind keyword also implicitly defers org-remark itself.
+ ;; Keybindings before :map is set for global-map.
+ ("C-c n m" . org-remark-mark)
+ ("C-c n l" . org-remark-mark-line) ; new in v1.3
+ :map org-remark-mode-map
+ ("C-c n o" . org-remark-open)
+ ("C-c n ]" . org-remark-view-next)
+ ("C-c n [" . org-remark-view-prev)
+ ("C-c n r" . org-remark-remove)
+ ("C-c n d" . org-remark-delete))
+ ;; Alternative way to enable `org-remark-global-tracking-mode' in
+ ;; `after-init-hook'.
+ ;; :hook (after-init . org-remark-global-tracking-mode)
+ :init
+ ;; It is recommended that `org-remark-global-tracking-mode' be
+ ;; enabled when Emacs initializes. Alternatively, you can put it to
+ ;; `after-init-hook' as in the comment above
+ (org-remark-global-tracking-mode +1)
+ :config
+ (use-package org-remark-info :after info :config (org-remark-info-mode +1))
+ (use-package org-remark-eww :after eww :config (org-remark-eww-mode +1))
+ (use-package org-remark-nov :after nov :config (org-remark-nov-mode +1)))
+
(use-package battery
:init
(display-battery-mode t))
@@ -790,7 +814,7 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :extend nil :stipple nil :background "white" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 150 :width expanded :foundry "UKWN" :family "Iosevka SS13 Extended"))))
+ '(default ((t (:inherit nil :extend nil :stipple nil :background "white" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 125 :width expanded :foundry "UKWN" :family "Iosevka SS13 Extended"))))
'(avy-lead-face ((t (:inherit fixed-pitch :background "dark red" :foreground "white"))))
'(calendar-weekend-header ((t (:inherit nil))))
'(custom-group-subtitle ((t (:weight bold :family "Iosevka Aile"))))
diff --git a/os/config.scm b/os/config.scm
index d3aa9f5..0244ee5 100644
--- a/os/config.scm
+++ b/os/config.scm
@@ -53,6 +53,21 @@
(services
(append (list (service cups-service-type)
(service nix-service-type)
+ (simple-service 'block-distracting-sites
+ hosts-service-type
+ (list
+ (host "127.0.0.1" "omni.se"
+ '("omni.se" "omni.se"))
+ (host "127.0.0.1" "svt.se"
+ '("svt.se" "svt.se"))
+ (host "127.0.0.1" "reddit.com/r/sweden"
+ '("reddit.com/r/sweden" "reddit.com/r/sweden"))
+ (host "127.0.0.1" "reddit.com/r/decodingthegurus"
+ '("reddit.com/r/decodingthegurus" "reddit.com/r/decodingthegurus"))
+ (host "127.0.0.1" "news.ycombinator.com"
+ '("news.ycombinator.com" "news.ycombinator.com"))
+ (host "127.0.0.1" "lobste.rs"
+ '("lobste.rs" "lobste.rs"))))
(set-xorg-configuration
(xorg-configuration (keyboard-layout keyboard-layout))))
(modify-services %desktop-services