.

2 files changed, 64 insertions, 38 deletions

diff --git a/home/dots/.emacs b/home/dots/.emacs
index d60c4fc..2bed45c 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -69,22 +69,6 @@
   (unless (package-installed-p package)
     (package-install package)))
 
-(use-package diminish :ensure t)
-
-(use-package tab-bar
-  :init
-  (tab-bar-mode)
-  :config
-  (setq tab-bar-new-tab-choice "*scratch*"))
-
-(use-package project
-  :ensure t
-  :config
-  (add-to-list 'project-switch-commands '(project-list-buffers "Buffers"))
-  (define-key project-prefix-map (kbd "b") 'project-list-buffers)
-  (add-to-list 'project-switch-commands '(project-kill-buffers "Kill Buffers"))
-  (add-to-list 'project-switch-commands '(project-shell "Shell")))
-
 (use-package exwm
   :init
   (setq exwm-workspace-number 1
@@ -120,17 +104,15 @@
   (exwm-input-set-key (kbd "<XF86MonBrightnessDown>")
 		      (lambda () (interactive)
 			(let ((inhibit-message t))
-			  (shell-command "brightnessctl set 5%- 1> /dev/null"))))
+			  (shell-command "brightnessctl set 5%-"))))
   (exwm-input-set-key (kbd "<XF86MonBrightnessUp>")
 		      (lambda () (interactive)
 			(let ((inhibit-message t))
-			  (shell-command "brightnessctl set +5% 1> /dev/null"))))
+			  (shell-command "brightnessctl set +5%"))))
   (exwm-input-set-key (kbd "s-<SPC>")
 		      (lambda (cmd) ;; s-&: Launch application.
 			(interactive (list (read-shell-command "$ ")))
 			(start-process-shell-command cmd nil cmd)))  
-  (exwm-enable)
-  (exwm-xim-mode)
   (shell-command "xrdb ~/.Xresources")
   (shell-command "dbus-update-activation-environment DISPLAY")
   ;; Sticky keys
@@ -156,6 +138,27 @@
 				   (if (<= (length exwm-title) 50) exwm-title
 				     (concat (substring exwm-title 0 49) "..."))))))))
 
+(use-package exwm-randr
+  :after exwm
+  :config
+  (exwm-randr-mode))
+
+
+(use-package diminish :ensure t)
+
+(use-package tab-bar
+  :init
+  (tab-bar-mode)
+  (setq tab-bar-new-tab-choice "*scratch*"))
+
+(use-package project
+  :ensure t
+  :config
+  (add-to-list 'project-switch-commands '(project-list-buffers "Buffers"))
+  (define-key project-prefix-map (kbd "b") 'project-list-buffers)
+  (add-to-list 'project-switch-commands '(project-kill-buffers "Kill Buffers"))
+  (add-to-list 'project-switch-commands '(project-shell "Shell")))
+
 (use-package exwm-systemtray
   :after exwm
   :config
@@ -250,12 +253,6 @@
   (setq x-select-enable-clipboard t
 	x-select-enable-primary t))
 
-(use-package exwm-randr
-  :after exwm
-  :config
-  (exwm-randr-mode)
-  (start-process-shell-command "xrandr" nil ""))
-
 (use-package pdf-tools)
 
 (use-package imenu
@@ -726,8 +723,18 @@
 	   "#guix")))
   :init
   (global-set-key 
-   "\C-cef"
+   "\C-ceo"
+   (lambda ()
+     "erc - join osm"
+     (interactive)
+     (erc
+      :server "irc.oftc.net"
+      :port "6667"
+      :nick "mccd")))
+  (global-set-key 
+   "\C-cel"
    (lambda ()
+     "erc - join libera chat"
      (interactive)
      (erc
       :server "irc.libera.chat"
@@ -761,7 +768,8 @@
 	org-hide-emphasis-markers t
 	org-agenda-include-diary nil
 	org-agenda-remove-tags t
-	org-startup-folded 'content
+	org-link-keep-stored-after-insertion t	
+	org-startup-folded t
 	org-agenda-inhibit-startup nil
 	;; Add /New Heading at the end for use
 	org-refile-allow-creating-parent-nodes 'confirm
@@ -774,7 +782,23 @@
            entry (file "~/personal-db/notes/todo.org")
            "* TODO %?\n%i\n%a\n "
            :empty-lines 1)
-	  ("r" "Reminder"
+	  ("b" "Book"
+           entry (file+headline "~/personal-db/notes/concepts.org" "Books")
+           "* %?\n:PROPERTIES:\n:AUTHOR:\n:STATUS: unread\n:END:\n "
+           :empty-lines 1)
+	  ("f" "Film"
+           entry (file+headline "~/personal-db/notes/concepts.org" "Films")
+           "* %?\n:PROPERTIES:\n:DIRECTOR:\n:STATE: unwatched\n:END:\n "
+           :empty-lines 1)
+	  ("c" "Concept"
+           entry (file "~/personal-db/notes/concepts.org")
+           "* %?\n%i\n%a\n "
+           :empty-lines 1)
+	  ("r" "Reference"
+           entry (file "~/personal-db/notes/refs.org")
+           "* %?\n%i\n%a\n "
+           :empty-lines 1)
+	  ("s" "Schedule"
            entry (file "~/personal-db/notes/reminders.org")
            "* TODO %?\nSCHEDULED: %^T"
            :empty-lines 1)
@@ -1098,6 +1122,7 @@
  '(org-agenda-done ((t (:strike-through t :inherit org-time-grid :extend nil))))
  '(org-agenda-structure-filter ((t (:slant italic)))) 
  '(org-done ((t (:strike-through t :weight bold :inherit org-agenda-dimmed-todo-face :extend nil))))
+ '(org-drawer ((t (:inherit org-tag)))) 
  '(org-todo ((t (:weight bold))))      
  '(org-headline-done ((t (:strike-through t :inherit org-agenda-dimmed-todo-face :extend nil))))
  '(org-level-1 ((t (:inherit outline-1 :extend nil :weight regular))))
@@ -1147,7 +1172,7 @@
    '((:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119)
      (:name "Messages with images" :query "mime:image/*" :key 112)))
  '(org-agenda-files
-   '("~/personal-db/notes/sustainable-software.org" "/home/mccd/personal-db/notes/thoughts.org" "/home/mccd/personal-db/notes/cal-ios.org" "/home/mccd/personal-db/notes/ethics-and-software.org" "/home/mccd/personal-db/notes/reminders.org" "/home/mccd/builds/sustainably/piva.org" "/home/mccd/personal-db/notes/programming.org" "/home/mccd/personal-db/notes/unix.org" "/home/mccd/personal-db/notes/agency-and-tech.org" "/home/mccd/personal-db/notes/emacs-teaches.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/todo.org" "/home/mccd/system/guix.org" "/home/mccd/personal-db/notes/log.org"))
+   '("/home/mccd/personal-db/notes/cal-ios.org" "/home/mccd/personal-db/notes/reminders.org" "/home/mccd/builds/sustainably/piva.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/todo.org" "/home/mccd/system/guix.org" "/home/mccd/personal-db/notes/log.org" "/home/mccd/personal-db/notes/refs.org" "/home/mccd/personal-db/notes/formulas.org" "/home/mccd/personal-db/notes/concepts.org" "/home/mccd/personal-db/notes/drafts.org"))
  '(org-fold-core-style 'overlays)
  '(package-selected-packages
    '(nov eldoc-box hide-mode-line exwm-mff eat pinentry exwm emms company orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs))
diff --git a/home/dots/.xinitrc b/home/dots/.xinitrc
index 4e46f32..a62a0d7 100755
--- a/home/dots/.xinitrc
+++ b/home/dots/.xinitrc
@@ -15,13 +15,14 @@ export GDK_SCALE="1.5"
 export XCURSOR_SIZE="32"
 #autocutsel &
 emacs --daemon -f exwm-enable
-xsetroot -solid '#000000' &
-gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' &
-gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' &
-gsettings set org.gnome.desktop.interface cursor-size 32 &
-gsettings set org.gnome.desktop.interface cursor-theme Adwaita &
+xsetroot -solid '#000000' 
+gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' 
+gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' 
+gsettings set org.gnome.desktop.interface cursor-size 32 
+gsettings set org.gnome.desktop.interface cursor-theme Adwaita 
 # xkbcomp $HOME/.config/keymap_locked_modifier.xkb $DISPLAY &
-setxkbmap -layout us -variant colemak -option "caps:nocaps" & 
-xsetroot -cursor_name left_ptr &
-xset r rate 200 60 &
+setxkbmap -layout us -variant colemak -option "caps:nocaps" 
+xsetroot -cursor_name left_ptr 
+xset r rate 200 60
+xrdb ~/.Xresources
 exec dbus-run-session emacsclient -c