.

2 files changed, 113 insertions, 67 deletions

diff --git a/emacs b/emacs
index 4a37357..cd9bb6b 100644
--- a/emacs
+++ b/emacs
@@ -1,49 +1,23 @@
 ;; -*- lexical-binding: t; -*-
-
-(fset 'yes-or-no-p 'y-or-n-p)
-
 ;; Put Emacs auto-save and backup files to /tmp
-(defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory))
+
 (add-to-list 'load-path "~/.emacs.d/elisp")
+(fset 'yes-or-no-p 'y-or-n-p)
 (setq
  ;; Visual
  inhibit-startup-screen t
- display-time-format "%a, %d/%m/%Y %H:%M"
  default-frame-alist '((font . "Iosevka SS13 Extended")
 		       (height . 150)
 		       (line-spacing . 0.5))
-
-
  ;; undo
  undo-limit 10000000
  undo-outer-limit 20000000
-
- ;; imenu
- imenu-auto-rescan t
-
- ;; complete
- completion-cycle-threshold 5
- completion-ignore-case t
-  
+ 
   ;; X integration
- x-select-enable-clipboard t
- x-select-enable-primary t
  ring-bell-function 'ignore
  default-directory (concat (getenv "HOME") "/")
  focus-follows-mouse t
  mouse-autoselect-window t
- 
- ;; Backups
- backup-by-copying t             
- delete-old-versions t
- kept-new-versions 6
- kept-old-versions 2
- version-control nil
- auto-save-default nil
- auto-save-list-file-prefix emacs-tmp-dir
- auto-save-file-name-transforms `((".*" ,emacs-tmp-dir t))  ; Change autosave dir to tmp
- backup-directory-alist `((".*" . ,emacs-tmp-dir))
-
  ;; Package list
  package-list '(
 		magit
@@ -56,7 +30,6 @@
 		yasnippet
 		yasnippet-snippets
 		pinentry
-		eat
 		avy
 		tldr
 		elfeed
@@ -74,34 +47,15 @@
 			 ("melpa-stable" . "https://stable.melpa.org/packages/")))
 
 (setq-default fill-column 80
-	      grep-template (string-join '("ugrep"
-                                           "--color=never"
-                                           "--ignore-binary"
-                                           "--ignore-case"
-                                           "--include=<F>"
-                                           "--line-number"
-                                           "--null"
-                                           "--recursive"
-                                           "--regexp=<R>")
-                                         " ")
 	      frame-title-format '("%b"))
 
 ;; UI
 (menu-bar-mode -1)
 (tool-bar-mode -1)
-(scroll-bar-mode -1)
-(display-battery-mode t)
-(pixel-scroll-precision-mode)
 (tab-bar-mode)
-(delete-selection-mode 1)
-(column-number-mode)
-(line-number-mode)
-(display-time-mode)
 
-;; activate all thpe packages (in particular autoloads)
 (package-initialize)
 
-;; fetch the list of packages available 
 (unless package-archive-contents
   (package-refresh-contents))
 
@@ -151,6 +105,70 @@
 				   (if (<= (length exwm-title) 50) exwm-title
 				     (concat (substring exwm-title 0 49) "..."))))))))
 
+(use-package time
+  :init
+  (display-time-mode)
+  :config
+  (setq display-time-format "%a, %d/%m/%Y %H:%M"))
+
+(use-package pixel-scroll
+  :init
+  (pixel-scroll-precision-mode))
+
+(use-package scroll-bar
+  :init
+  (scroll-bar-mode -1))
+
+(use-package frame
+  :init
+  (window-divider-mode))
+
+(use-package delsel
+  :init
+  (delete-selection-mode))
+
+(use-package files
+  :init
+  (defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory))
+  :config
+  (setq backup-by-copying t             
+	delete-old-versions t
+	kept-new-versions 6
+	kept-old-versions 2
+	auto-save-list-file-prefix emacs-tmp-dir
+	version-control nil
+	auto-save-default nil
+	auto-save-file-name-transforms `((".*" ,emacs-tmp-dir t))  
+	backup-directory-alist `((".*" . ,emacs-tmp-dir))))
+
+(use-package minibuffer
+  :config
+  (setq completion-cycle-threshold 5
+	completion-ignore-case t))
+
+(use-package select
+  :config
+  (setq x-select-enable-clipboard t
+	x-select-enable-primary t))
+
+(use-package imenu
+  :config
+  (setq imenu-auto-rescan t))
+
+(use-package battery
+  :init
+  (display-battery-mode t))
+
+(use-package repeat
+  :bind
+  (("C-." . repeat)
+   (:repeat-map repeat-repeat-map
+		("." . repeat)))
+  :config
+  (setq repeat-on-final-keystroke t)
+  (setq set-mark-command-repeat-pop t)
+  (repeat-mode 1))
+
 (use-package org-crypt
   :init
   (setenv "GPG_AGENT_INFO" nil)
@@ -158,6 +176,21 @@
 	epg-gpg-program "gpg2")
   (org-crypt-use-before-save-magic))
 
+(use-package grep
+  :config
+  (setq-default 
+   grep-template (string-join
+		  '("ugrep"
+                    "--color=never"
+                    "--ignore-binary"
+                    "--ignore-case"
+                    "--include=<F>"
+                    "--line-number"
+                    "--null"
+                    "--recursive"
+                    "--regexp=<R>")
+                  " ")))
+
 (use-package pinentry
   :ensure t
   :init
@@ -171,7 +204,7 @@
 
 (use-package exwm-mff
   :load-path "elisp"
-  :init
+  :config
   (exwm-mff-mode))
 
 (use-package avy
@@ -251,6 +284,10 @@
 
 (use-package flymake
   :defer t
+  :bind
+  (:repeat-map flymake-repeat-map
+	       ("]" . flymake-goto-next-error)
+	       ("[" . flymake-goto-prev-error))
   :hook
   ((flymake-mode .
             (lambda ()
@@ -314,26 +351,15 @@
 (use-package org-link-minor-mode
   :ensure nil)
 
-(defvar marcc/timestamp-format "%H:%M "
-  "Format for H:M timestamp")
-
-(defun marcc/timestamp-hour ()
-  "Insert a timestamp at the current point.
-Uses `marcc/timestamp-format' for formatting the date/time."
-  (interactive)
-  (insert (format-time-string marcc/timestamp-format (current-time))))
-
 (use-package calendar
   :defer t
   :init
   (add-to-list 'auto-mode-alist '("~/personal-db/log" . diary-mode))
   :hook
   ((diary-mode . variable-pitch-mode)
+   (diary-mode . org-link-minor-mode)
+   (diary-fancy-display-mode . org-link-minor-mode)
    (diary-fancy-display-mode . variable-pitch-mode)
-   (diary-mode . 'org-link-minor-mode)
-   (diary-fancy-display-mode . 'org-link-minor-mode)
-   (diary-mode . (lambda () 
-		 (add-hook 'after-save-hook 'sync-org)))   
    (diary-mode . flyspell-mode))
   :config
   (global-set-key (kbd "C-c d") 'calendar)
@@ -397,6 +423,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
 (defun sync-org ()
   (interactive)
   (async-shell-command "org-sync"))
+
 (add-to-list 'display-buffer-alist '("*Async Shell Command*" display-buffer-no-window (nil)))
 
 ;; Org
@@ -455,7 +482,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
    (org-mode . flyspell-mode)
    (org-mode . visual-line-mode)
    (org-mode . (lambda () 
-		(add-hook 'after-save-hook 'sync-org)))
+		(add-hook 'after-save-hook 'sync-org nil t)))
    (org-mode . variable-pitch-mode)))
 
 (use-package rec-mode
@@ -472,6 +499,10 @@ Uses `marcc/timestamp-format' for formatting the date/time."
   :init
   (yas-global-mode 1))
 
+(use-package register
+  :bind
+  (("C-z" . 'point-to-register)))
+
 (defun marc/set-msmtp-account ()
   (if (message-mail-p)
       (save-excursion
@@ -489,6 +520,10 @@ Uses `marcc/timestamp-format' for formatting the date/time."
 (add-hook 'message-send-mail-hook 'marc/set-msmtp-account)
 (add-hook 'message-mode-hook 'flyspell-mode)
 
+(use-package flyspell
+  :bind (:map flyspell-mode-map
+	      ("C-." . repeat)))
+
 (use-package mu4e
   :ensure nil
   :load-path "/usr/share/emacs/site-lisp/mu4e/"
@@ -622,7 +657,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  ;; 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 151 :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 150 :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"))))
@@ -651,8 +686,8 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(markdown-pre-face ((t (:inherit markdown-code-face))))
  '(mastodon-display-name-face ((t (:inherit nil :weight bold))))
  '(mode-line ((t (:background "gray95" :foreground "black" :box (:line-width (8 . 8) :style flat-button) :overline "#e0e0e0" :underline (:color "#e0e0e0" :style line :position t) :family "Iosevka Aile"))))
- '(mode-line-emphasis ((t (:weight semi-bold))))
- '(mode-line-inactive ((t (:inherit mode-line :background "grey95" :foreground "grey60" :underline (:color "#e0e0e0" :style line :position 0) :weight light))))
+ '(mode-line-emphasis ((t (:weight regular))))
+ '(mode-line-inactive ((t (:inherit mode-line :background "#fbfbfb" :foreground "grey60" :overline "#f9f9f9" :underline (:color "#f9f9f9" :style line :position 0) :weight light))))
  '(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold))))
  '(mu4e-highlight-face ((t (:inherit highlight))))
  '(org-date ((t (:inherit fixed-pitch :foreground "gray40" :underline t))))
@@ -700,5 +735,6 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(package-selected-packages
    '(exwm-mff eat pinentry exwm emms company orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs))
  '(tab-bar-format '(tab-bar-format-align-right tab-bar-format-global))
+ '(window-divider-default-right-width 2)
  '(yank-from-kill-ring-rotate t))
 (put 'secrets-mode 'disabled nil)
diff --git a/mozilla/firefox/kbwnloer.default-default/chrome/userChrome.css b/mozilla/firefox/kbwnloer.default-default/chrome/userChrome.css
new file mode 100644
index 0000000..ae8a6dd
--- /dev/null
+++ b/mozilla/firefox/kbwnloer.default-default/chrome/userChrome.css
@@ -0,0 +1,10 @@
+#TabsToolbar {
+  visibility: collapse;
+}
+
+menubar, toolbar, nav-bar, #TabsToolbar > * {
+    background-color: white !important;
+    font-family: "Iosevka Aile";
+}
+
+