swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 17:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorganize Org file structure (emacs)

Browse source
This commit is contained in:
Swarsel 2024-02-09 20:17:12 +01:00
parent 1332f472ca
commit 54631074da
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
8 changed files with 274 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

234
Emacs.org
View file

@ -52,7 +52,7 @@
swarsel-anki-org-file "Anki.org" swarsel-anki-org-file "Anki.org"
swarsel-tasks-org-file "Tasks.org" swarsel-tasks-org-file "Tasks.org"
swarsel-archive-org-file "Archive.org" swarsel-archive-org-file "Archive.org"
swarsel-org-folder-name "org" swarsel-org-folder-name "Org"
swarsel-obsidian-daily-folder-name "⭐ Personal/Journal" swarsel-obsidian-daily-folder-name "⭐ Personal/Journal"
swarsel-obsidian-folder-name "Obsidian" swarsel-obsidian-folder-name "Obsidian"
swarsel-obsidian-vault-name "Main") swarsel-obsidian-vault-name "Main")
@ -356,8 +356,9 @@ Base emacs undo logic is very useful, but not easy to understand. I prefer undo-
"mc" '((lambda () (interactive) (swarsel/open-calendar)) :which-key "calendar") "mc" '((lambda () (interactive) (swarsel/open-calendar)) :which-key "calendar")
"mp" '(popper-toggle :which-key "popper") "mp" '(popper-toggle :which-key "popper")
"md" '(dirvish :which-key "dirvish") "md" '(dirvish :which-key "dirvish")
;; "c" '(:ignore c :which-key "capture") "c" '(:ignore c :which-key "capture")
;; "cj" '((lambda () (interactive) (org-capture nil "jj")) :which-key "journal") ;; "cj" '((lambda () (interactive) (org-capture nil "jj")) :which-key "journal")
"ct" '((lambda () (interactive) (org-capture nil "tt")) :which-key "tasks")
;; "cs" '(markdown-download-screenshot :which-key "screenshot") ;; "cs" '(markdown-download-screenshot :which-key "screenshot")
"l" '(:ignore l :which-key "links") "l" '(:ignore l :which-key "links")
"le" '((lambda () (interactive) (find-file swarsel-emacs-org-filepath)) :which-key "Emacs.org") "le" '((lambda () (interactive) (find-file swarsel-emacs-org-filepath)) :which-key "Emacs.org")
@ -807,135 +808,138 @@ Soon I want to try out this new hot stuff - just at the moment there is too much
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun swarsel/org-mode-setup () (defun swarsel/org-mode-setup ()
(org-indent-mode) (org-indent-mode)
(variable-pitch-mode 1) (variable-pitch-mode 1)
;;(auto-fill-mode 0) ;;(auto-fill-mode 0)
(setq display-line-numbers-type 'relative (setq display-line-numbers-type 'relative
display-line-numbers-current-absolute 1 display-line-numbers-current-absolute 1
display-line-numbers-width-start nil display-line-numbers-width-start nil
display-line-numbers-width 6 display-line-numbers-width 6
display-line-numbers-grow-only 1) display-line-numbers-grow-only 1)
(add-hook 'org-tab-first-hook 'org-end-of-line) (add-hook 'org-tab-first-hook 'org-end-of-line)
(visual-line-mode 1)) (visual-line-mode 1))
;; (setq evil-auto-indent nil) ;; (setq evil-auto-indent nil)
;;(diminish org-indent-mode) ;;(diminish org-indent-mode)
;; (defun swarsel/org-font-setup () ;; (defun swarsel/org-font-setup ()
;; ;; Replace list hyphen with dot ;; ;; Replace list hyphen with dot
;; (font-lock-add-keywords 'org-mode ;; (font-lock-add-keywords 'org-mode
;; '(("^ *\\([-]\\) " ;; '(("^ *\\([-]\\) "
;; (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))) ;; (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))))))
(use-package org (use-package org
;;:diminish (org-indent-mode) ;;:diminish (org-indent-mode)
:hook (org-mode . swarsel/org-mode-setup) :hook (org-mode . swarsel/org-mode-setup)
:bind ("C-<tab>" . org-fold-outer) :bind ("C-<tab>" . org-fold-outer)
:config :config
(setq org-ellipsis " ⤵" (setq org-ellipsis " ⤵"
org-hide-emphasis-markers t) org-hide-emphasis-markers t)
(setq org-startup-folded t) (setq org-startup-folded t)
(setq org-support-shift-select t) (setq org-support-shift-select t)
;; (setq org-agenda-start-with-log-mode t) ;; (setq org-agenda-start-with-log-mode t)
;; (setq org-log-done 'time) ;; (setq org-log-done 'time)
;; (setq org-log-into-drawer t) ;; (setq org-log-into-drawer t)
(setq org-startup-with-inline-images t) (setq org-startup-with-inline-images t)
(setq org-image-actual-width nil) (setq org-image-actual-width nil)
(setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))) (setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\[")))
;; (setq org-agenda-files (setq org-agenda-files
;; '(swarsel-org-tasks-filepath '("/home/swarsel/Nextcloud/Org/Tasks.org"
;; swarsel-org-archive-filepath "/home/swarsel/Nextcloud/Org/Archive.org"
;; swarsel-org-anki-filepath)) "/home/swarsel/Calendars/leon_cal.org"))
(setq org-agenda-files '("/home/swarsel/Calendars/leon_cal.org")) ;; swarsel-org-anki-filepath))
;; (setq org-agenda-files '("/home/swarsel/Calendars/leon_cal.org"))
;; (require 'org-habit) ;; (require 'org-habit)
;; (add-to-list 'org-modules 'org-habit) ;; (add-to-list 'org-modules 'org-habit)
;; (setq org-habit-graph-column 60) ;; (setq org-habit-graph-column 60)
;; (setq org-todo-keywords ;; (setq org-todo-keywords
;; '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)") ;; '((sequence "TODO(t)" "NEXT(n)" "|" "X1DONE(d!)")
;; (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)"))) ;; (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)")))
;; (setq org-refile-targets (setq org-refile-targets
;; '((swarsel-archive-org-file :maxlevel . 1) '((swarsel-archive-org-file :maxlevel . 1)
;; (swarsel-anki-org-file :maxlevel . 1) ;; (swarsel-anki-org-file :maxlevel . 1)
;; (swarsel-tasks-org-file :maxlevel . 1))) (swarsel-tasks-org-file :maxlevel . 1)))
;; ;; Configure custom agenda views ;; ;; Configure custom agenda views
;; (setq org-agenda-custom-commands ;; (setq org-agenda-custom-commands
;; '(("d" "Dashboard" ;; '(("d" "Dashboard"
;; ((agenda "" ((org-deadline-warning-days 7))) ;; ((agenda "" ((org-deadline-warning-days 7)))
;; (todo "NEXT" ;; (todo "NEXT"
;; ((org-agenda-overriding-header "Next Tasks"))) ;; ((org-agenda-overriding-header "Next Tasks")))
;; (tags-todo "agenda/ACTIVE" ((org-agenda-overriding-header "Active Projects"))))) ;; (tags-todo "agenda/ACTIVE" ((org-agenda-overriding-header "Active Projects")))))
;; ("n" "Next Tasks" ;; ("n" "Next Tasks"
;; ((todo "NEXT" ;; ((todo "NEXT"
;; ((org-agenda-overriding-header "Next Tasks"))))) ;; ((org-agenda-overriding-header "Next Tasks")))))
;; ("W" "Work Tasks" tags-todo "+work-email") ;; ("W" "Work Tasks" tags-todo "+work-email")
;; ;; Low-effort next actions ;; ;; Low-effort next actions
;; ("e" tags-todo "+TODO=\"NEXT\"+Effort<15&+Effort>0" ;; ("e" tags-todo "+TODO=\"NEXT\"+Effort<15&+Effort>0"
;; ((org-agenda-overriding-header "Low Effort Tasks") ;; ((org-agenda-overriding-header "Low Effort Tasks")
;; (org-agenda-max-todos 20) ;; (org-agenda-max-todos 20)
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; ("w" "Workflow Status" ;; ("w" "Workflow Status"
;; ((todo "WAIT" ;; ((todo "WAIT"
;; ((org-agenda-overriding-header "Waiting on External") ;; ((org-agenda-overriding-header "Waiting on External")
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "REVIEW" ;; (todo "REVIEW"
;; ((org-agenda-overriding-header "In Review") ;; ((org-agenda-overriding-header "In Review")
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "PLAN" ;; (todo "PLAN"
;; ((org-agenda-overriding-header "In Planning") ;; ((org-agenda-overriding-header "In Planning")
;; (org-agenda-todo-list-sublevels nil) ;; (org-agenda-todo-list-sublevels nil)
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "BACKLOG" ;; (todo "BACKLOG"
;; ((org-agenda-overriding-header "Project Backlog") ;; ((org-agenda-overriding-header "Project Backlog")
;; (org-agenda-todo-list-sublevels nil) ;; (org-agenda-todo-list-sublevels nil)
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "READY" ;; (todo "READY"
;; ((org-agenda-overriding-header "Ready for Work") ;; ((org-agenda-overriding-header "Ready for Work")
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "ACTIVE" ;; (todo "ACTIVE"
;; ((org-agenda-overriding-header "Active Projects") ;; ((org-agenda-overriding-header "Active Projects")
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "COMPLETED" ;; (todo "COMPLETED"
;; ((org-agenda-overriding-header "Completed Projects") ;; ((org-agenda-overriding-header "Completed Projects")
;; (org-agenda-files org-agenda-files))) ;; (org-agenda-files org-agenda-files)))
;; (todo "CANC" ;; (todo "CANC"
;; ((org-agenda-overriding-header "Cancelled Projects") ;; ((org-agenda-overriding-header "Cancelled Projects")
;; (org-agenda-files org-agenda-files))))))) ;; (org-agenda-files org-agenda-files)))))))
;; (setq org-capture-templates (setq org-capture-templates
;; `( `(
;; ("a" "Anki basic" ;; ("a" "Anki basic"
;; entry ;; entry
;; (file+headline swarsel-org-anki-filepath "Dispatch") ;; (file+headline swarsel-org-anki-filepath "Dispatch")
;; (function swarsel-anki-make-template-string)) ;; (function swarsel-anki-make-template-string))
;; ("A" "Anki cloze" ;; ("A" "Anki cloze"
;; entry ;; entry
;; (file+headline org-swarsel-anki-file "Dispatch") ;; (file+headline org-swarsel-anki-file "Dispatch")
;; "* %<%H:%M>\n:PROPERTIES:\n:ANKI_NOTE_TYPE: Cloze\n:ANKI_DECK: 🦁 All::01 ❤️ Various::00 ✨ Allgemein\n:END:\n** Text\n%?\n** Extra\n") ;; "* %<%H:%M>\n:PROPERTIES:\n:ANKI_NOTE_TYPE: Cloze\n:ANKI_DECK: 🦁 All::01 ❤️ Various::00 ✨ Allgemein\n:END:\n** Text\n%?\n** Extra\n")
;; ("t" "Tasks / Projects")
;; ("tt" "Task" entry (file+olp swarsel-org-tasks-filepath "Inbox")
;; "* TODO %?\n %U\n %a\n %i" :empty-lines 1)
;; ("j" "Journal Entries") ("t" "Tasks / Projects")
;; ("jj" "Journal" entry ("tt" "Task" entry (file+olp swarsel-org-tasks-filepath "Inbox")
;; (file+olp+datetree swarsel-org-journal-filepath) "* TODO %?\n %U\n %i" :empty-lines 1)
;; "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n"
;; ;; ,(dw/read-file-as-string "~/Notes/Templates/Daily.org")
;; :clock-in :clock-resume
;; :empty-lines 1)))
;; (swarsel/org-font-setup) ;; ("j" "Journal Entries")
) ;; ("jj" "Journal" entry
;; (file+olp+datetree swarsel-org-journal-filepath)
;; "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n"
;; ;; ,(dw/read-file-as-string "~/Notes/Templates/Daily.org")
;; :clock-in :clock-resume
;; :empty-lines 1)
))
;; (swarsel/org-font-setup)
)
#+end_src #+end_src
** Font Faces ** Font Faces

54
Nix.org
View file

@ -523,6 +523,8 @@ If a non-NixOS host must be used, check the Surface configuration for pointers.
No matter what you do, check the initial /etc/nixos/configuration.nix for notable changes that might emerge in future versions of nix. No matter what you do, check the initial /etc/nixos/configuration.nix for notable changes that might emerge in future versions of nix.
Also, you will most likely need to update the version and hashsum for the firefox extension `bypass-paywalls-clean`.
*** NixOS *** NixOS
#+begin_src nix :noweb yes :tangle profiles/TEMPLATE/nixos.nix #+begin_src nix :noweb yes :tangle profiles/TEMPLATE/nixos.nix
@ -539,9 +541,18 @@ No matter what you do, check the initial /etc/nixos/configuration.nix for notabl
}; };
# Bootloader # Bootloader
boot.loader.grub.enable = true; # use this for single partition boot
boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work boot = {
boot.loader.grub.useOSProber = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
};
# -------------------------------------
# alternate setup using grub
# boot.loader.grub.enable = true;
# boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work
# boot.loader.grub.useOSProber = true;
# -------------------------------------
# -------------------------------------- # --------------------------------------
# you might need a configuration like this instead: # you might need a configuration like this instead:
@ -1348,7 +1359,7 @@ New setup for the SP3, this time using NixOS - another machine will take over th
# waybar config - TEMPLATE - update for cores and temp # waybar config - TEMPLATE - update for cores and temp
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
cpu.format = "{icon0} {icon1} {icon2} {icon3} {icon4} {icon5} {icon6} {icon7}"; cpu.format = "{icon0} {icon1} {icon2} {icon3} {icon4} {icon5} {icon6} {icon7}";
temperature.hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp3_input"; temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon4/temp1_input";
}; };
<<waybarlaptop>> <<waybarlaptop>>
@ -1361,12 +1372,12 @@ New setup for the SP3, this time using NixOS - another machine will take over th
xkb_layout = "us"; xkb_layout = "us";
xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
}; };
# "1:1:AT_Translated_Set_2_keyboard" = { # TEMPLATE "1:1:AT_Translated_Set_2_keyboard" = { # TEMPLATE
# xkb_layout = "us"; xkb_layout = "us";
# xkb_options = "grp:win_space_toggle"; xkb_options = "grp:win_space_toggle";
# # xkb_options = "ctrl:nocaps,grp:win_space_toggle"; # # xkb_options = "ctrl:nocaps,grp:win_space_toggle";
# xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
# }; };
"type:touchpad" = { "type:touchpad" = {
dwt = "enabled"; dwt = "enabled";
tap = "enabled"; tap = "enabled";
@ -1377,8 +1388,8 @@ New setup for the SP3, this time using NixOS - another machine will take over th
}; };
output = { output = {
DP-1 = { eDP-1 = {
mode = "2560x1440"; # TEMPLATE mode = "1920x1080"; # TEMPLATE
scale = "1"; scale = "1";
bg = "~/.dotfiles/wallpaper/lenovowp.png fill"; bg = "~/.dotfiles/wallpaper/lenovowp.png fill";
}; };
@ -1388,6 +1399,17 @@ New setup for the SP3, this time using NixOS - another machine will take over th
modifier = config.wayland.windowManager.sway.config.modifier; modifier = config.wayland.windowManager.sway.config.modifier;
in { in {
"${modifier}+w" = "exec \"bash ~/.dotfiles/scripts/checkschildi.sh\""; "${modifier}+w" = "exec \"bash ~/.dotfiles/scripts/checkschildi.sh\"";
"XF86MonBrightnessUp" = "exec brightnessctl set +5%";
"XF86MonBrightnessDown"= "exec brightnessctl set 5%-";
"XF86Display" = "exec wl-mirror eDP-1";
# "XF86WLAN" = "exec wl-mirror eDP-1";
# "XF86Messenger" = "exec wl-mirror eDP-1";
# "XF86Go" = "exec wl-mirror eDP-1";
# "XF86Favorites" = "exec wl-mirror eDP-1";
# "XF86HomePage" = "exec wtype -P Escape -p Escape";
# "XF86AudioLowerVolume" = "pactl set-sink-volume alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink -5%";
# "XF86AudioRaiseVolume" = "pactl set-sink-volume alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink +5% ";
"XF86AudioMute" = "pactl set-sink-mute alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink toggle";
}; };
startup = [ startup = [
@ -3387,7 +3409,7 @@ Also, I define some useful shell scripts here.
# games # games
lutris lutris
wine #wine
# firefox related # firefox related
tridactyl-native tridactyl-native
@ -3581,6 +3603,8 @@ I use sops-nix to handle secrets that I want to have available on my machines at
- cp ~/.ssh/sops.pub ~/.dotfiles/secrets/keys/NAME.pub - cp ~/.ssh/sops.pub ~/.dotfiles/secrets/keys/NAME.pub
- update entry for sops.age.sshKeyPaths - update entry for sops.age.sshKeyPaths
*Changes are only visible after reboot.*
#+begin_src nix :tangle profiles/common/home.nix #+begin_src nix :tangle profiles/common/home.nix
sops.defaultSopsFile = "${config.home.homeDirectory}/.dotfiles/secrets/general/secrets.yaml"; sops.defaultSopsFile = "${config.home.homeDirectory}/.dotfiles/secrets/general/secrets.yaml";
@ -4792,14 +4816,14 @@ Again I am just using the first bar option here that I was able to find good und
# the rest of the information is also found in the manifest.json, but might not be # the rest of the information is also found in the manifest.json, but might not be
# needed # needed
(let version = "3.4.5.0"; (let version = "3.5.4.0";
in buildFirefoxXpiAddon { in buildFirefoxXpiAddon {
pname = "bypass-paywalls-clean"; pname = "bypass-paywalls-clean";
inherit version; inherit version;
addonId = "magnolia@12.34"; addonId = "magnolia@12.34";
url = url =
"https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.4.5.0.xpi"; "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.4.0.xpi";
sha256 = "703d30c15b88291bd0305cc59013693aea5f75a40ea98fb8e252d1c7bfb43514"; sha256 = "ab81f711c30c4f7a010d69bd964bdfaf0179802c0b27d0a88c73c0aa6b044803";
meta = with lib; { meta = with lib; {
homepage = homepage =
"https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean"; "https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean";

15
profiles/TEMPLATE/nixos.nix
View file

@ -15,9 +15,18 @@
}; };
# Bootloader # Bootloader
boot.loader.grub.enable = true; # use this for single partition boot
boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work boot = {
boot.loader.grub.useOSProber = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
};
# -------------------------------------
# alternate setup using grub
# boot.loader.grub.enable = true;
# boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work
# boot.loader.grub.useOSProber = true;
# -------------------------------------
# -------------------------------------- # --------------------------------------
# you might need a configuration like this instead: # you might need a configuration like this instead:

6
profiles/common/home.nix
View file

@ -1321,14 +1321,14 @@ programs.firefox = {
# the rest of the information is also found in the manifest.json, but might not be # the rest of the information is also found in the manifest.json, but might not be
# needed # needed
(let version = "3.4.5.0"; (let version = "3.5.4.0";
in buildFirefoxXpiAddon { in buildFirefoxXpiAddon {
pname = "bypass-paywalls-clean"; pname = "bypass-paywalls-clean";
inherit version; inherit version;
addonId = "magnolia@12.34"; addonId = "magnolia@12.34";
url = url =
"https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.4.5.0.xpi"; "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.4.0.xpi";
sha256 = "703d30c15b88291bd0305cc59013693aea5f75a40ea98fb8e252d1c7bfb43514"; sha256 = "ab81f711c30c4f7a010d69bd964bdfaf0179802c0b27d0a88c73c0aa6b044803";
meta = with lib; { meta = with lib; {
homepage = homepage =
"https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean"; "https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean";

27
profiles/fourside/home.nix
View file

@ -21,7 +21,7 @@
# waybar config - TEMPLATE - update for cores and temp # waybar config - TEMPLATE - update for cores and temp
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
cpu.format = "{icon0} {icon1} {icon2} {icon3} {icon4} {icon5} {icon6} {icon7}"; cpu.format = "{icon0} {icon1} {icon2} {icon3} {icon4} {icon5} {icon6} {icon7}";
temperature.hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp3_input"; temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon4/temp1_input";
}; };
@ -51,12 +51,12 @@
xkb_layout = "us"; xkb_layout = "us";
xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
}; };
# "1:1:AT_Translated_Set_2_keyboard" = { # TEMPLATE "1:1:AT_Translated_Set_2_keyboard" = { # TEMPLATE
# xkb_layout = "us"; xkb_layout = "us";
# xkb_options = "grp:win_space_toggle"; xkb_options = "grp:win_space_toggle";
# # xkb_options = "ctrl:nocaps,grp:win_space_toggle"; # # xkb_options = "ctrl:nocaps,grp:win_space_toggle";
# xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
# }; };
"type:touchpad" = { "type:touchpad" = {
dwt = "enabled"; dwt = "enabled";
tap = "enabled"; tap = "enabled";
@ -67,8 +67,8 @@
}; };
output = { output = {
DP-1 = { eDP-1 = {
mode = "2560x1440"; # TEMPLATE mode = "1920x1080"; # TEMPLATE
scale = "1"; scale = "1";
bg = "~/.dotfiles/wallpaper/lenovowp.png fill"; bg = "~/.dotfiles/wallpaper/lenovowp.png fill";
}; };
@ -78,6 +78,17 @@
modifier = config.wayland.windowManager.sway.config.modifier; modifier = config.wayland.windowManager.sway.config.modifier;
in { in {
"${modifier}+w" = "exec \"bash ~/.dotfiles/scripts/checkschildi.sh\""; "${modifier}+w" = "exec \"bash ~/.dotfiles/scripts/checkschildi.sh\"";
"XF86MonBrightnessUp" = "exec brightnessctl set +5%";
"XF86MonBrightnessDown"= "exec brightnessctl set 5%-";
"XF86Display" = "exec wl-mirror eDP-1";
# "XF86WLAN" = "exec wl-mirror eDP-1";
# "XF86Messenger" = "exec wl-mirror eDP-1";
# "XF86Go" = "exec wl-mirror eDP-1";
# "XF86Favorites" = "exec wl-mirror eDP-1";
# "XF86HomePage" = "exec wtype -P Escape -p Escape";
# "XF86AudioLowerVolume" = "pactl set-sink-volume alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink -5%";
# "XF86AudioRaiseVolume" = "pactl set-sink-volume alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink +5% ";
"XF86AudioMute" = "pactl set-sink-mute alsa_output.pci-0000_08_00.6.HiFi__hw_Generic_1__sink toggle";
}; };
startup = [ startup = [

1
programs/emacs/custom.el
View file

@ -8,6 +8,7 @@
"badd1a5e20bd0c29f4fe863f3b480992c65ef1fa63951f59aa5d6b129a3f9c4c" "badd1a5e20bd0c29f4fe863f3b480992c65ef1fa63951f59aa5d6b129a3f9c4c"
"2e05569868dc11a52b08926b4c1a27da77580daa9321773d92822f7a639956ce" "2e05569868dc11a52b08926b4c1a27da77580daa9321773d92822f7a639956ce"
default)) default))
'(org-agenda-files nil)
'(send-mail-function 'sendmail-send-it)) '(send-mail-function 'sendmail-send-it))
;; (custom-set-faces ;; (custom-set-faces
;; ;; custom-set-faces was added by Custom. ;; ;; custom-set-faces was added by Custom.

46
programs/emacs/init.el
View file

@ -23,7 +23,7 @@
swarsel-anki-org-file "Anki.org" swarsel-anki-org-file "Anki.org"
swarsel-tasks-org-file "Tasks.org" swarsel-tasks-org-file "Tasks.org"
swarsel-archive-org-file "Archive.org" swarsel-archive-org-file "Archive.org"
swarsel-org-folder-name "org" swarsel-org-folder-name "Org"
swarsel-obsidian-daily-folder-name "⭐ Personal/Journal" swarsel-obsidian-daily-folder-name "⭐ Personal/Journal"
swarsel-obsidian-folder-name "Obsidian" swarsel-obsidian-folder-name "Obsidian"
swarsel-obsidian-vault-name "Main") swarsel-obsidian-vault-name "Main")
@ -249,8 +249,9 @@
"mc" '((lambda () (interactive) (swarsel/open-calendar)) :which-key "calendar") "mc" '((lambda () (interactive) (swarsel/open-calendar)) :which-key "calendar")
"mp" '(popper-toggle :which-key "popper") "mp" '(popper-toggle :which-key "popper")
"md" '(dirvish :which-key "dirvish") "md" '(dirvish :which-key "dirvish")
;; "c" '(:ignore c :which-key "capture") "c" '(:ignore c :which-key "capture")
;; "cj" '((lambda () (interactive) (org-capture nil "jj")) :which-key "journal") ;; "cj" '((lambda () (interactive) (org-capture nil "jj")) :which-key "journal")
"ct" '((lambda () (interactive) (org-capture nil "tt")) :which-key "tasks")
;; "cs" '(markdown-download-screenshot :which-key "screenshot") ;; "cs" '(markdown-download-screenshot :which-key "screenshot")
"l" '(:ignore l :which-key "links") "l" '(:ignore l :which-key "links")
"le" '((lambda () (interactive) (find-file swarsel-emacs-org-filepath)) :which-key "Emacs.org") "le" '((lambda () (interactive) (find-file swarsel-emacs-org-filepath)) :which-key "Emacs.org")
@ -606,10 +607,10 @@
(variable-pitch-mode 1) (variable-pitch-mode 1)
;;(auto-fill-mode 0) ;;(auto-fill-mode 0)
(setq display-line-numbers-type 'relative (setq display-line-numbers-type 'relative
display-line-numbers-current-absolute 1 display-line-numbers-current-absolute 1
display-line-numbers-width-start nil display-line-numbers-width-start nil
display-line-numbers-width 6 display-line-numbers-width 6
display-line-numbers-grow-only 1) display-line-numbers-grow-only 1)
(add-hook 'org-tab-first-hook 'org-end-of-line) (add-hook 'org-tab-first-hook 'org-end-of-line)
(visual-line-mode 1)) (visual-line-mode 1))
;; (setq evil-auto-indent nil) ;; (setq evil-auto-indent nil)
@ -627,7 +628,7 @@
:bind ("C-<tab>" . org-fold-outer) :bind ("C-<tab>" . org-fold-outer)
:config :config
(setq org-ellipsis " ⤵" (setq org-ellipsis " ⤵"
org-hide-emphasis-markers t) org-hide-emphasis-markers t)
(setq org-startup-folded t) (setq org-startup-folded t)
(setq org-support-shift-select t) (setq org-support-shift-select t)
;; (setq org-agenda-start-with-log-mode t) ;; (setq org-agenda-start-with-log-mode t)
@ -637,11 +638,12 @@
(setq org-image-actual-width nil) (setq org-image-actual-width nil)
(setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))) (setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\[")))
;; (setq org-agenda-files (setq org-agenda-files
;; '(swarsel-org-tasks-filepath '("/home/swarsel/Nextcloud/Org/Tasks.org"
;; swarsel-org-archive-filepath "/home/swarsel/Nextcloud/Org/Archive.org"
"/home/swarsel/Calendars/leon_cal.org"))
;; swarsel-org-anki-filepath)) ;; swarsel-org-anki-filepath))
(setq org-agenda-files '("/home/swarsel/Calendars/leon_cal.org")) ;; (setq org-agenda-files '("/home/swarsel/Calendars/leon_cal.org"))
;; (require 'org-habit) ;; (require 'org-habit)
@ -649,13 +651,13 @@
;; (setq org-habit-graph-column 60) ;; (setq org-habit-graph-column 60)
;; (setq org-todo-keywords ;; (setq org-todo-keywords
;; '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)") ;; '((sequence "TODO(t)" "NEXT(n)" "|" "X1DONE(d!)")
;; (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)"))) ;; (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)")))
;; (setq org-refile-targets (setq org-refile-targets
;; '((swarsel-archive-org-file :maxlevel . 1) '((swarsel-archive-org-file :maxlevel . 1)
;; (swarsel-anki-org-file :maxlevel . 1) ;; (swarsel-anki-org-file :maxlevel . 1)
;; (swarsel-tasks-org-file :maxlevel . 1))) (swarsel-tasks-org-file :maxlevel . 1)))
;; ;; Configure custom agenda views ;; ;; Configure custom agenda views
;; (setq org-agenda-custom-commands ;; (setq org-agenda-custom-commands
@ -705,8 +707,8 @@
;; ((org-agenda-overriding-header "Cancelled Projects") ;; ((org-agenda-overriding-header "Cancelled Projects")
;; (org-agenda-files org-agenda-files))))))) ;; (org-agenda-files org-agenda-files)))))))
;; (setq org-capture-templates (setq org-capture-templates
;; `( `(
;; ("a" "Anki basic" ;; ("a" "Anki basic"
;; entry ;; entry
;; (file+headline swarsel-org-anki-filepath "Dispatch") ;; (file+headline swarsel-org-anki-filepath "Dispatch")
@ -716,9 +718,10 @@
;; entry ;; entry
;; (file+headline org-swarsel-anki-file "Dispatch") ;; (file+headline org-swarsel-anki-file "Dispatch")
;; "* %<%H:%M>\n:PROPERTIES:\n:ANKI_NOTE_TYPE: Cloze\n:ANKI_DECK: 🦁 All::01 ❤️ Various::00 ✨ Allgemein\n:END:\n** Text\n%?\n** Extra\n") ;; "* %<%H:%M>\n:PROPERTIES:\n:ANKI_NOTE_TYPE: Cloze\n:ANKI_DECK: 🦁 All::01 ❤️ Various::00 ✨ Allgemein\n:END:\n** Text\n%?\n** Extra\n")
;; ("t" "Tasks / Projects")
;; ("tt" "Task" entry (file+olp swarsel-org-tasks-filepath "Inbox") ("t" "Tasks / Projects")
;; "* TODO %?\n %U\n %a\n %i" :empty-lines 1) ("tt" "Task" entry (file+olp swarsel-org-tasks-filepath "Inbox")
"* TODO %?\n %U\n %i" :empty-lines 1)
;; ("j" "Journal Entries") ;; ("j" "Journal Entries")
;; ("jj" "Journal" entry ;; ("jj" "Journal" entry
@ -726,7 +729,8 @@
;; "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n" ;; "\n* %<%I:%M %p> - Journal :journal:\n\n%?\n\n"
;; ;; ,(dw/read-file-as-string "~/Notes/Templates/Daily.org") ;; ;; ,(dw/read-file-as-string "~/Notes/Templates/Daily.org")
;; :clock-in :clock-resume ;; :clock-in :clock-resume
;; :empty-lines 1))) ;; :empty-lines 1)
))
;; (swarsel/org-font-setup) ;; (swarsel/org-font-setup)
) )

104
secrets/general/secrets.yaml
View file

@ -1,8 +1,7 @@
mrswarsel: ENC[AES256_GCM,data:3gOMVqp4mTGsbPPJwlEnZhjtZg==,iv:ZP+iS13CvVZ7VuGzBd7Or0kkuVKqepOBH8MViugkNzk=,tag:yF+CO+McQ6aEY1z8nsnJXQ==,type:str] mrswarsel: ENC[AES256_GCM,data:KorCRr6QGzwXXXVcuox5lhSQrg==,iv:rdAlpEYnQaeLH/cXDLixVOZj0mmkynewNlp53L/U4lo=,tag:gE19U/CPl2hU38VYgdLlGQ==,type:str]
nautilus: ENC[AES256_GCM,data:pOhMQ8tq7g4HgGLeEgBVWZS3gQ==,iv:BYKjp1+EcbY3kfGthvETIxFJT/WMl3dwUkFHEnGZjPQ=,tag:VHSm8xgmxeUVxnOPqqQr1g==,type:str] nautilus: ENC[AES256_GCM,data:KTBIwO/m/O3RfYBf0kTdgM83mQ==,iv:fCVfS3eYE0F9Jhju+uT0rHcFPBMLYtsJURILMATvjYA=,tag:pzpVeK8YYYl6NgC0FRnCoQ==,type:str]
leon: ENC[AES256_GCM,data:n7Xt9zBj7BQnwNMWg1/2xOUJgQ==,iv:SI27QnW4CD2oOWq8sSrDg7I0xhW6GQ5vWSKq/pIrNTI=,tag:KUpTXFgrJwtqFAK/z49cig==,type:str] leon: ENC[AES256_GCM,data:5OAaO/8XiOJEUicx+otLoUUG9w==,iv:cxoNYOQCFIjX53ZgaL/Pu4ZDeL2EByClCIWG2JcRHMw=,tag:954bA4bjcLZsv2hFbtykSQ==,type:str]
caldav: ENC[AES256_GCM,data:ZYLNxPQTrc0xFSkMWN4HzduFz0GVcCCJVbmlissVN4oTgAbPEqp/sD0ONXSyQb7teCm3vMZNWXJGtLqBHqlxOpQEO9RI8f9ZiyfTGw==,iv:A3CZp/lSBQSAgzdcBx9RSjsoPh4Hj9Hteo4kHpYQ5/w=,tag:lvRba31njS8E0GS5o8jLUg==,type:str] caldav: ENC[AES256_GCM,data:CfWibtX+/BJcpXJNlpO8dpYJsdORzQZX5pEXX82CB2z+ZpIhIF66+x1GsXFFgP+MnQOS6O7hSUgckxtJBh7Bmy9jLmcdf3VMwnaAcg==,iv:bcahyj8MXSxvFOveFnXbEWHG03yHURb2zWelT5MiDo0=,tag:EguaYYuYNZUQlrKE8zjjrQ==,type:str]
blub: ENC[AES256_GCM,data:APKMMw==,iv:ayPFgPyAJB9yJ3437e9CvxvpT6B3YNWmA/vLVDPXBmo=,tag:657hhELqmATY510KpzLdsA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -12,62 +11,71 @@ sops:
- recipient: age1zdjm8qa5t25mca0xxhhkpuh85mgg4l267mqjj2pdttksq7zg4unqdmqyp4 - recipient: age1zdjm8qa5t25mca0xxhhkpuh85mgg4l267mqjj2pdttksq7zg4unqdmqyp4
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhZE1MRHhFV0FUckxicGw1 YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmN3pCM0l5VEQ4ZERDRVBx
czU1VVd6SmxOcUorc3BTUFlkRTZVS3ZNdVZBCnBRUjkyL2tTTWh4Vkg1TTIwL1pP MllTOXQwSEtjeDNSM1JqVFU2YmlzTmYrekFvClp2eG51VXlnb3dQTzJDbmw2czVv
YUwvRmpNck51UG1XTm43dko2VVcyRU0KLS0tIHcrcXBOQjA3dzRBdnB1OFNmTjBj NEM0OHBCNDJmbnIwWkxsYzg0Z3ZteVUKLS0tIDZLTW1GVUtPcUVKNmpvd0swREZF
M2tEdVh3LzdPUXpJRW5kU2FLMFV1cXcKalszCBeFHQF5TltqvSPyY28z3AP2/Bqa ZEF0SCtWNEE4b2FJaVZBdGZLWXJMNGMKAcZCLU47OB8n3RhZOxMqUPxrjp2lXfuX
LN1lRHfhOlGx1zgKf0ZcSvF9VS9pKpBG2plLAPlICYNuhiz21wSVLA== kG4MITOw/lw067YP1REpTqwPj4Ylleqx7KBafEsfzXPuuUh9gPgKKg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
- recipient: age1zlnxraee6tddr07xn59mx5rdexw8qxryd53eqlsajasfhfy78fkq705dfg - recipient: age1zlnxraee6tddr07xn59mx5rdexw8qxryd53eqlsajasfhfy78fkq705dfg
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQeENaMjlINVNtYkFJUmJn YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBMVFoQTFGYmRreVhqQ2Zl
QWhvRjhuSlYrTFlHQ3hlWDdCcXhhMGd0S1VRClRjYXVIMEhBWUlhWXBoRXppU1RD aTZlb3VrZjJzZUp5OUM4SEhGcjg0YlBWdWhBCk1ISzhCZ1FsVjdYaUpKOXlVMkxU
ekx3SFlWWllQTkxSRk9JVHFOUFk4TkEKLS0tIEtmdmhVMDdXZ2crZHNGVG1ZK2Jp b0doSlVKN0hmSTRtTWFnL0JNR0JWSTQKLS0tIFVWZGNqVWVZa3dkSllqZ2Z2emdt
d3NRdW9SMTNaL21XK1dxcURFNXhxVWcKB8GLlzi4a+9yLc/sZ/W5adJxalwDTNtC M3VYZW4yd2hza1pBUGhnSTlsRWJOd0kKebxg9WhWN4PI7GUNZJrKF9z5KWU6ZCS/
p4BvANHSyXyXjUXb8yrlp201PbWrrU7wVv0+rjzUgDz5X5w9GFtmGA== UpnaXNQJVGihJ5QaO+WxyCG5ivAwyToHA2aJEgLrHTF9eK1Rd4Wb6w==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
- recipient: age1hkajkcje5xvg8jd4zj2e0s9tndpv36hwhn7p38x9lyq2z8g7v45q2nhlej - recipient: age1hkajkcje5xvg8jd4zj2e0s9tndpv36hwhn7p38x9lyq2z8g7v45q2nhlej
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkbThaUUNKV0o2cm0xZlV1 YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMdEtIWnJnY0JYMHlRUjZ4
VS82bDBFR09pSVNGRnA3OEZ2VVR4V0FEckVNCk9QWUhCODZQcU9nbTNhMnlMSUxy OGx4MlE3N3JnaURnUU1NTyt0Sm82T3N6ZldBCjRkMkxSRG0rajNQczlOUXdFOVcx
Nkk2Z2lMT3N1REIzaDI4bmZmbUJCUWMKLS0tIDVsZXRJV0lTMHcyYnRicUVaVTV5 VGRhVDJOUW8wN0IvL1lSa3ZSeGlCODQKLS0tIFp3STl1amR5MGd1UDBaRXU4N3J4
TGF4USs2YVNlZnZhM3lZNlpHbm80SzgKxwh4DS1DnV3KFVfPw/8+zGWo/YVnhSYd YzhlVnJRU1VFQkxwQmJQaHAwZy8rK1EKlQCB+gtblDchGxZeMgzRLWzpINXHTo6L
Yi1hpRD8yD0eglGVGaWCItniPLRFDPpHL2B6kkHsYRx3Rl7daSJUVA== UAAHdlvUd3yql5W1RzFvfyepuyG9JzzgP0q5geMoMaQdS4ADUfZ6Ww==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-02-07T16:44:27Z" - recipient: age1s3faa0due0fvp9qu2rd8ex0upg4mcms8wl936yazylv72r6nn3rq2xv5g0
mac: ENC[AES256_GCM,data:Xb4aw7kte69Yh3Fvn1PDWZHquqbhXp/CBtfbXqdqknx/uWJ+PtbiM+sYa3qtWcGwbQ2L+M/eoPpl7Iy6o7Odh+mEaVCvarsDzpUXRy2/tXLnYw5fvj4sZeErukObhvWnc4Rm11hKvUGaEpWll/Yvpu5d50PgPFoP2mFV0mZMZQo=,iv:5RJAn+/iWZIytITWqPE1p5d1NHOjMFCNauSZT0/uXfg=,tag:5huUulGRgrBvU9B1rjiTWw==,type:str] enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyT2xMc2lYWCtHTHU0ZjAz
NUNHRVlnOThJbmFxN1liSTVvVXNMb2lsVVFJCjdES2dES3grVGI1bStrNHltbHFj
M0QwaXhZUEExYUJtVHRLVllIVDc2aDAKLS0tIFcrZkRjckJXc1N6Q3VweFJJYWo2
Q0NTRzR0cFVPT2phTlUyL0phU25TdncKD/4ZFw/oR2FEm0U8hUkF6ts5AkxfdXrS
2KdJTSXqy+UmbMHSoapcMQoeaOkfpIpmHZZzwhHzOBd3YPtBYMc91Q==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-02-07T21:18:21Z"
mac: ENC[AES256_GCM,data:E1mSvKn585SBxhaG/1S8zsRrQx9SiudxqREuyFwURQqnXMLSmiEzzBVg12HzO0JVkl+5FU0JNUR0E/h3oe7ykgbhFx8yk6NkbSJeWbT8YUbnYC6rzkHx6joAAb7zHpOBDyI700dlxCUzDJyEZ+TO1ZlG0qjhzKhGp/apO7wMmVw=,iv:cEXxikWT/Pr9MioELV5SCUg2Es1vy4iHdyozXNQ4aN8=,tag:f9vJFeUdhV9L62RT4FDEDA==,type:str]
pgp: pgp:
- created_at: "2023-12-13T19:27:54Z" - created_at: "2024-02-07T21:17:55Z"
enc: |- enc: |-
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
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
=sMxt =FV09
-----END PGP MESSAGE----- -----END PGP MESSAGE-----
fp: 4BE7925262289B476DBBC17B76FD3810215AE097 fp: 4BE7925262289B476DBBC17B76FD3810215AE097
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted