Compare commits

..

5 Commits

Author SHA1 Message Date
cho
8a62c5280c delete custom.el 2023-09-28 20:18:15 +07:00
cho
79225406e8 update 2023-09-28 20:18:15 +07:00
cho
25665457f4 Revert "Revert "add org-download and config""
This reverts commit 617c86d44b7579e5c9c755e57a38933638f4e355.
2023-09-28 20:18:15 +07:00
cho
f2aa8f935c Revert "add org-download and config"
This reverts commit 09167cd5c42916472115b6fa0fb2a36ebbefa24d.
2023-09-28 20:18:15 +07:00
cho
8a61a535b9 add org-download and config, update other configs 2023-09-28 20:17:15 +07:00
10 changed files with 66 additions and 25 deletions

View File

@ -33,14 +33,15 @@
;; There are two ways to load a theme. Both assume the theme is installed and ;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the ;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default: ;; `load-theme' function. This is the default:
(setq doom-theme 'doom-tomorrow-night) ;(setq doom-theme 'doom-tomorrow-night)
;(setq doom-theme 'doom-one) ;(setq doom-theme 'doom-one)
;(setq doom-theme 'doom-wilmersdorf) ;(setq doom-theme 'doom-wilmersdorf)
;(setq doom-theme 'doom-plain-dark) ;(setq doom-theme 'doom-plain-dark)
;(setq doom-theme 'doom-feather-dark) ;(setq doom-theme 'doom-feather-dark)
;(setq doom-theme 'doom-monokai-ristretto)
;(setq doom-theme 'doom-plain) ;(setq doom-theme 'doom-plain)
;(setq doom-theme 'doom-flatwhite) (setq doom-theme 'doom-flatwhite)
;; This determines the style of line numbers in effect. If set to `nil', line ;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'. ;; numbers are disabled. For relative line numbers, set this to `relative'.
@ -195,11 +196,14 @@
; (concat "${type:15} ${title:*} " (propertize "${tags:10}" 'face 'org-tag))) ; (concat "${type:15} ${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
;;; org-capture stuff ;;; org-capture stuff
;;; examples: file:~/.emacs.d/modules/lang/org/config.el
; my location of the todo.org file
(setq +org-capture-todo-file "ag/todo.org") (setq +org-capture-todo-file "ag/todo.org")
;; this sets Personal notes to refile instead
(defvar +org-capture-refile-file "refile.org") (defvar +org-capture-refile-file "refile.org")
(setq +org-capture-refile-file (setq +org-capture-refile-file
(expand-file-name +org-capture-refile-file org-directory)) (expand-file-name +org-capture-refile-file org-directory))
; refile.org at the root of org-directory
;(add-to-list 'org-capture-templates ;(add-to-list 'org-capture-templates
; '(("s" "Slipbox" entry (file "braindump/org/inbox.org") ; '(("s" "Slipbox" entry (file "braindump/org/inbox.org")
@ -212,16 +216,20 @@
(setq org-capture-templates (setq org-capture-templates
'(("t" "Personal todo" entry '(("t" "Personal todo" entry
(file+headline +org-capture-todo-file "todo") (file+headline +org-capture-todo-file "todo")
"* [ ] %?\n%i\n%a") "* [ ] %?\n%i\n%a" :prepend t)
("T" "Personal todo (single)" entry ("T" "Personal todo (no link)" entry
(file+headline +org-capture-todo-file "todo") (file+headline +org-capture-todo-file "todo")
"* [ ] %?\n") "* [ ] %?\n" :prepend t)
("n" "Personal notes" entry ;;; i never use this
;("n" "Personal notes" entry
;(file+headline +org-capture-notes-file "Inbox")
;"* %u %?\n%i\n%a" :prepend t)
("r" "Personal refile file" entry
(file +org-capture-refile-file) (file +org-capture-refile-file)
"* %u %?\n%i\n%a" :prepend t) "* %u %?\n%i\n%a" :prepend t)
;; using org-journal atm.. ;; using org-journal atm, i will likely never use this
;("j" "Journal" entry ;("j" "Journal" entry
;(file+olp+datetree +org-capture-journal-file) ;(file+olp+datetree +org-capture-journal-file)
;"* %U %?\n%i\n%a" :prepend t) ;"* %U %?\n%i\n%a" :prepend t)
@ -241,6 +249,7 @@
(file+headline +org-capture-project-changelog-file "Unreleased") (file+headline +org-capture-project-changelog-file "Unreleased")
"* %U %?\n%i\n%a" :prepend t) "* %U %?\n%i\n%a" :prepend t)
;; reference for function: [[file:~/.emacs.d/modules/lang/org/autoload/org-capture.el::defun +org--capture-central-file (file project]]
;; Will use {org-directory}/{+org-capture-projects-file} and store ;; Will use {org-directory}/{+org-capture-projects-file} and store
;; these under {ProjectName}/{Tasks,Notes,Changelog} headings. They ;; these under {ProjectName}/{Tasks,Notes,Changelog} headings. They
;; support `:parents' to specify what headings to put them under, e.g. ;; support `:parents' to specify what headings to put them under, e.g.
@ -263,13 +272,16 @@
:prepend t) :prepend t)
;; org books / general logging ;; org books / general logging
("b" "Book log" item (function org-books-visit-book-log) ("b" "Book log / General log (org)" item (function org-books-visit-book-log)
"- %U %?" :prepend t) "- %U %?" :prepend t)
;; zettelkasten ;; zettelkasten
("s" "Slipbox" entry (file "roam/inbox.org") ("s" "Slipbox" entry (file "roam/inbox.org")
"* %?\n"))) "* %U %?\n")
("S" "Slipbox link" entry (file "roam/inbox.org")
"* %U %?\n %i\n %a")))
(setq org-attach-directory "~/notebook/images/attach/")
) )
;;; end of (!after org ... ;;; end of (!after org ...
@ -317,3 +329,15 @@
"Archive all done tasks." "Archive all done tasks."
(interactive) (interactive)
(org-map-entries 'org-archive-subtree "/DONE" 'file)) (org-map-entries 'org-archive-subtree "/DONE" 'file))
(require 'org-download)
(setq-default
org-download-method 'directory
;; org-download-screenshot-method "grimshot save window %s"
;; org-download-screenshot-method "wl-paste -t image/png > '%s'"
;; below script is available on dotfiles: ../.local/bin
org-download-screenshot-method "convert-paste-png.sh '%s'"
org-download-image-dir "~/notebook/images/org-download"
org-download-heading-lvl nil
org-download-timestamp "%Y%m%d-%H%M%S_")
(add-hook 'dired-mode-hook 'org-download-enable)

View File

@ -56,6 +56,7 @@
;(package! org :pin "ca873f7") ;(package! org :pin "ca873f7")
(package! org-books) (package! org-books)
(package! org-download)
;;; customized to support repeated tasks, see https://github.com/akhramov/org-wild-notifier.el/issues/41 ;;; customized to support repeated tasks, see https://github.com/akhramov/org-wild-notifier.el/issues/41
(package! org-wild-notifier (package! org-wild-notifier

View File

@ -1,6 +1,6 @@
profile { profile {
output HDMI-A-1 scale 1 mode 1366x768 position 0,0 output HDMI-A-1 scale 1 mode 1366x768 position 1280,0
output DVI-D-1 scale 1 mode 1280x1024 position 1366,0 output DVI-D-1 scale 1 mode 1280x1024 position 0,0
} }
profile { profile {
output HDMI-A-1 scale 1 mode 1366x768 output HDMI-A-1 scale 1 mode 1366x768

View File

@ -36,6 +36,7 @@ cmd open ${{
video/*|application/vnd.rn-realmedia) setsid -f mpv $f -quiet >/dev/null 2>&1 ;; video/*|application/vnd.rn-realmedia) setsid -f mpv $f -quiet >/dev/null 2>&1 ;;
application/pdf|application/vnd.djvu) setsid -f zathura $fx >/dev/null 2>&1 ;; application/pdf|application/vnd.djvu) setsid -f zathura $fx >/dev/null 2>&1 ;;
application/epub*) setsid -f com.github.johnfactotum.Foliate $fx >/dev/null 2>&1 ;; application/epub*) setsid -f com.github.johnfactotum.Foliate $fx >/dev/null 2>&1 ;;
#application/epub*) setsid -f mupdf -U ~/epub.css $fx >/dev/null 2>&1 ;;
application/pgp-encrypted) $EDITOR $fx ;; application/pgp-encrypted) $EDITOR $fx ;;
application/vnd.openxmlformats-officedocument.wordprocessingml.document|application/vnd.oasis.opendocument.text) setsid -f lowriter $fx >/dev/null 2>&1 ;; application/vnd.openxmlformats-officedocument.wordprocessingml.document|application/vnd.oasis.opendocument.text) setsid -f lowriter $fx >/dev/null 2>&1 ;;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet|application/octet-stream|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template) setsid -f localc $fx >/dev/null 2>&1 ;; application/vnd.openxmlformats-officedocument.spreadsheetml.sheet|application/octet-stream|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template) setsid -f localc $fx >/dev/null 2>&1 ;;
@ -124,7 +125,8 @@ map V push :!nvim<space>
map W $setsid -f $TERMINAL >/dev/null 2>&1 map W $setsid -f $TERMINAL >/dev/null 2>&1
map Y $printf "%s" "$fx" | xclip -selection clipboard #map Y $printf "%s" "$fx" | xclip -selection clipboard
map Y $wl-copy < "$fx"
map <c-f> $setsid -f thunar . ; kill @# map <c-f> $setsid -f thunar . ; kill @#

View File

@ -1,7 +1,7 @@
# mpd.conf # mpd.conf
music_directory "~/Music" music_directory "~/Music"
playlist_directory "~/.config/mpd/playlists" playlist_directory "~/Music/playlists"
pid_file "~/.config/mpd/mpd.pid" pid_file "~/.config/mpd/mpd.pid"
db_file "~/.config/mpd/mpd.db" db_file "~/.config/mpd/mpd.db"
state_file "~/.config/mpd/mpd.state" state_file "~/.config/mpd/mpd.state"

View File

@ -20,9 +20,9 @@ do
convert -rotate -90 "$file" "$file" ;; convert -rotate -90 "$file" "$file" ;;
"f") "f")
convert -flop "$file" "$file" ;; convert -flop "$file" "$file" ;;
"y") "y") wl-copy < $file ;;
printf "%s" "$file" | tr -d '\n' | xclip -selection clipboard && #printf "%s" "$file" | tr -d '\n' | xclip -selection clipboard &&
notify-send "$file copied to clipboard" & ;; #notify-send "$file copied to clipboard" & ;;
"Y") "Y")
readlink -f "$file" | tr -d '\n' | xclip -selection clipboard && readlink -f "$file" | tr -d '\n' | xclip -selection clipboard &&
notify-send "$(readlink -f "$file") copied to clipboard" & ;; notify-send "$(readlink -f "$file") copied to clipboard" & ;;

View File

@ -50,11 +50,11 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
# emacs daemon # emacs daemon
exec /usr/bin/emacs --daemon exec /usr/bin/emacs --daemon
assign [app_id="librewolf"] 2 #assign [app_id="librewolf"] 2
assign [app_id="firefox"] 2 #assign [app_id="firefox"] 2
assign [app_id="mumble"] 9 #assign [app_id="mumble"] 9
assign [app_id="dino"] 9 #assign [app_id="dino"] 9
assign [app_id="deluge"] 10 #assign [app_id="deluge"] 10
#exec_always autotiling #exec_always autotiling
exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
@ -69,7 +69,7 @@ show_marks yes
# looks # looks
font pango: monospace 8 font pango: monospace 8
#gaps inner 25 gaps inner 25
default_border pixel 2 default_border pixel 2
bindsym $mod+Control+y border toggle bindsym $mod+Control+y border toggle

View File

@ -0,0 +1,10 @@
#!/bin/sh
wl-paste -t image > /tmp/convert-paste-png.data
#convert /tmp/convert-paste-png.data -format png "$1"
case "$(file --dereference --brief --mime-type -- "/tmp/convert-paste-png.data")" in
image/jpg|image/jpeg) convert /tmp/convert-paste-png.data -format png "$1" ;;
image/png) wl-paste -t image/png > "$1" ;;
esac

View File

@ -49,6 +49,8 @@ c) locate, git, bzip2 are the missing dependencies not included in the guide.
boot your fedora installer media and follow this guide, make sure to boot with EUFI mode: boot your fedora installer media and follow this guide, make sure to boot with EUFI mode:
https://sysguides.com/install-fedora-38-with-snapshot-and-rollback-support/ https://sysguides.com/install-fedora-38-with-snapshot-and-rollback-support/
or for full disk encryption
https://sysguides.com/install-fedora-38-with-full-disk-encryption-snapshot-and-rollback-support/
** how to make new user and add to wheel ** how to make new user and add to wheel
@ -138,7 +140,7 @@ Allow wheel users to sudo with password and allow several system commands
#+BEGIN_SRC shell #+BEGIN_SRC shell
echo "%wheel ALL=(ALL:ALL) ALL" >/etc/sudoers.d/00-wheel-can-sudo echo "%wheel ALL=(ALL:ALL) ALL" >/etc/sudoers.d/00-wheel-can-sudo
echo "%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/dnf update,/usr/bin/dnf update -y,/usr/bin/loadkeys" >/etc/sudoers.d/01-cmds-without-password echo "%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/dnf update,/usr/bin/dnf update -y,/usr/bin/dnf upgrade,/usr/bin/dnf upgrade,/usr/bin/loadkeys" >/etc/sudoers.d/01-cmds-without-password
echo "Defaults editor=/usr/bin/nvim" >/etc/sudoers.d/02-visudo-editor echo "Defaults editor=/usr/bin/nvim" >/etc/sudoers.d/02-visudo-editor
#+END_SRC #+END_SRC
@ -395,7 +397,7 @@ flatpak install flathub com.unity.UnityHub
*** Foliate (Epub reader) *** Foliate (Epub reader)
#+BEGIN_SRC sh #+BEGIN_SRC sh
flatpak install com.github.johnfactotum.Foliate flatpak install flathub com.github.johnfactotum.Foliate
#+END_SRC #+END_SRC
*** bottles and dependencies *** bottles and dependencies
@ -465,3 +467,4 @@ power_dpm_force_performance_level: high
* todos * todos
** TODO write dependencies and programs to separate files ** TODO write dependencies and programs to separate files
** add packages ** add packages
flatpak install --from https://flathub.org/repo/appstream/com.github.babluboy.bookworm.flatpakref

View File

@ -59,6 +59,7 @@ abook
unzip unzip
lynx lynx
zathura-plugins-all zathura-plugins-all
zathura-pdf-mupdf
krita krita
poppler poppler
mediainfo mediainfo