ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ryuslash:5755831bb64b1f6152057b3b5055e9dddc7ecc70
Branches Tags
ryuslash:master
..
compare: ryuslash:cc136633268aad35c604ae616e3fddd0c80aea83
Branches Tags
ryuslash:master

No commits in common. "5755831bb64b1f6152057b3b5055e9dddc7ecc70" and "cc136633268aad35c604ae616e3fddd0c80aea83" have entirely different histories.
5755831bb6 ... cc13663326

7 changed files with 67 additions and 140 deletions
Show stats Expand all files Collapse all files

5
oni/home/config/data.scm
View file

@ -43,8 +43,7 @@
#:use-module (oni home services xsession) #:use-module (oni home services xsession)
#:use-module (oni home services zsh) #:use-module (oni home services zsh)
#:use-module ((oni packages emacs) #:use-module ((oni packages emacs)
#:select (emacs-outli #:select (emacs-syncthing-status))
emacs-syncthing-status))
#:use-module ((oni packages emacs-config) #:use-module ((oni packages emacs-config)
#:select (emacs-oni-org-roam #:select (emacs-oni-org-roam
emacs-oni-vterm emacs-oni-vterm
@ -82,6 +81,8 @@
emacs-oni-tramp emacs-oni-tramp
emacs-oni-embrace emacs-oni-embrace
emacs-oni-git-commit)) emacs-oni-git-commit))
#:use-module ((oni packages emacs-outli)
#:select (emacs-outli))
#:use-module (oni packages hlwm-run-or-raise) #:use-module (oni packages hlwm-run-or-raise)
#:use-module (oni packages pick-random-wallpaper) #:use-module (oni packages pick-random-wallpaper)
#:use-module (oni packages sawfish) #:use-module (oni packages sawfish)

35
oni/home/config/rincewind.scm
View file

@ -88,8 +88,6 @@
home-emacs-eros-service-type home-emacs-eros-service-type
home-emacs-ace-link-service-type home-emacs-ace-link-service-type
home-emacs-ace-link-configuration home-emacs-ace-link-configuration
home-emacs-ace-link-notmuch-service-type
home-emacs-ace-link-notmuch-configuration
home-emacs-golden-ratio-service-type home-emacs-golden-ratio-service-type
home-emacs-pinentry-service-type home-emacs-pinentry-service-type
home-emacs-vterm-service-type home-emacs-vterm-service-type
@ -140,7 +138,6 @@
#:use-module ((oni packages emacs) #:use-module ((oni packages emacs)
#:select (emacs-inkplate #:select (emacs-inkplate
oni-emacs-notmuch oni-emacs-notmuch
emacs-outli
emacs-syncthing-status)) emacs-syncthing-status))
#:use-module ((oni packages emacs-config) #:use-module ((oni packages emacs-config)
#:select (emacs-oni-org-roam #:select (emacs-oni-org-roam
@ -205,6 +202,8 @@
#:select (shutdown-rofi)) #:select (shutdown-rofi))
#:use-module ((oni packages stumpwm) #:use-module ((oni packages stumpwm)
#:select (stumpwm+swank)) #:select (stumpwm+swank))
#:use-module ((oni packages emacs-outli)
#:select (emacs-outli))
#:use-module ((oop goops) #:use-module ((oop goops)
#:select (make))) #:select (make)))
@ -237,9 +236,30 @@
'((dnd (shadow . #f)) '((dnd (shadow . #f))
(dock (shadow . #f)))) (dock (shadow . #f))))
(corner-radius 15) (corner-radius 15)
(blur-background #f) (inactive-opacity 75)
(blur-background-frame #f) (active-opacity 95)
(fading #f)))) (frame-opacity 100)
(inactive-opacity-override #t)
(opacity-rule
'("100:name *?= '(Meeting) | Microsoft Teams'"
"100:name *?= 'freerdp'"))
(blur-background #t)
(blur-background-frame #t)
(blur
'((method . "dual_kawase")
(strength . 6.9)))
(blur-background-fixed #t)
(blur-background-exclude
'("name *= 'rofi'"
"class_g = 'i3lock'"))
(focus-exclude
'("name *= 'rofi'"
"class_g = 'i3lock'"))
(fading #t)
(fade-exclude
`("class_g = 'i3lock'"))
(fade-in-step 3)
(fade-out-step 3))))
(define my-emacs emacs-next-tree-sitter) (define my-emacs emacs-next-tree-sitter)
@ -425,9 +445,6 @@
(default-key "C-S-e") (default-key "C-S-e")
(goto-address-key "C-S-e") (goto-address-key "C-S-e")
(org-mode-key "C-S-e"))) (org-mode-key "C-S-e")))
(service home-emacs-ace-link-notmuch-service-type
(home-emacs-ace-link-notmuch-configuration
(default-key "C-S-e")))
(service home-emacs-golden-ratio-service-type) (service home-emacs-golden-ratio-service-type)
(service home-emacs-pinentry-service-type) (service home-emacs-pinentry-service-type)
(service home-emacs-vterm-service-type (service home-emacs-vterm-service-type

51
oni/home/services/emacs.scm
View file

@ -36,8 +36,7 @@
#:select (package?)) #:select (package?))
#:use-module ((oni packages emacs) #:use-module ((oni packages emacs)
#:select (emacs-yasnippet-capf #:select (emacs-yasnippet-capf
emacs-golden-ratio emacs-golden-ratio))
emacs-ace-link-notmuch))
#:export (home-emacs-service-type #:export (home-emacs-service-type
home-emacs-configuration home-emacs-configuration
@ -57,9 +56,6 @@
home-emacs-ace-link-service-type home-emacs-ace-link-service-type
home-emacs-ace-link-configuration home-emacs-ace-link-configuration
home-emacs-ace-link-notmuch-service-type
home-emacs-ace-link-notmuch-configuration
home-emacs-golden-ratio-service-type home-emacs-golden-ratio-service-type
home-emacs-golden-ratio-configuration home-emacs-golden-ratio-configuration
@ -329,47 +325,6 @@
(default-value (home-emacs-ace-link-configuration)) (default-value (home-emacs-ace-link-configuration))
(description "Install and configure emacs-ace-link."))) (description "Install and configure emacs-ace-link.")))
;;; Emacs Ace-link notmuch
(define-configuration/no-serialization home-emacs-ace-link-notmuch-configuration
(package
(package emacs-ace-link-notmuch)
"Package to use for setting emacs-ace-link-notmuch.")
(default-key
(string "o")
"Key to use as the default keybinding.")
(configurations
(text-config '())
"Configuration for emacs-ace-link-notmuch."))
(define (add-emacs-ace-link-notmuch config)
(home-emacs-extension
(configurations
(append
(list (mixed-text-file "ace-link-notmuch-config"
";;;;; ace-link-notmuch-config starts here.\n"
(format #f "(ace-link-notmuch-setup-default (kbd ~s))~%"
(home-emacs-ace-link-notmuch-configuration-default-key config))
";;;;; ace-link-notmuch-config ends here.\n"))
(home-emacs-ace-link-notmuch-configuration-configurations config)))))
(define (add-emacs-ace-link-notmuch-packages config)
(list (home-emacs-ace-link-notmuch-configuration-package config)))
(define home-emacs-ace-link-notmuch-service-type
(service-type
(name 'home-emacs-ace-link-notmuch)
(extensions
(list (service-extension
home-emacs-service-type
add-emacs-ace-link-notmuch)
(service-extension
home-profile-service-type
add-emacs-ace-link-notmuch-packages)))
(compose identity)
(default-value (home-emacs-ace-link-notmuch-configuration))
(description "Install and configure emacs-ace-link-notmuch.")))
;;; Emacs Golden Ratio ;;; Emacs Golden Ratio
(define-configuration/no-serialization home-emacs-golden-ratio-configuration (define-configuration/no-serialization home-emacs-golden-ratio-configuration
@ -511,8 +466,8 @@
"vterm_cmd() {\n" "vterm_cmd() {\n"
" local vterm_elisp\n" " local vterm_elisp\n"
" vterm_elisp=\"\"\n" " vterm_elisp=\"\"\n"
" while [ $# -gt 0 ]; do\n" " while [ $# -gt 0]; do\n"
" vterm_elisp=\"$vterm_elisp\"\"$(printf '\"%s\" ' \"$(printf \"%s\" \"$1\" | sed -e 's|\\\\|\\\\\\\\|g' -e 's|\"|\\\\\"|g')\")\"\n" " vterm_elisp=\"vterm_elisp\"\"$(printf '\"%s\" ' \"$(printf \"%s\" \"$1\" | sed -e 's|\\\\|\\\\\\\\|g' -e 's|\"|\\\\\"|g')\")\"\n"
" shift\n" " shift\n"
" done\n" " done\n"
" vterm_printf \"51;E$vterm_elisp\"\n" " vterm_printf \"51;E$vterm_elisp\"\n"

23
oni/home/services/stumpwm/config
View file

@ -49,27 +49,8 @@ after it has been unlocked."
(define-key *top-map* (kbd "s-w") "exec rofi -show window") (define-key *top-map* (kbd "s-w") "exec rofi -show window")
(define-remapped-keys (define-remapped-keys
`(("teams-for-linux" '(("teams-for-linux"
;; Mute microphone in meetings. ("C-M-Break" . "C-S-m"))))
("XF86Launch6" . "C-S-m"))
("[Ff]irefox"
;; Generally cancel action.
("XF86Launch6" . "ESC"))
("[Ee]macs"
;; Save document.
("XF86Launch5" . ("C-x" "C-s"))
;; Save some documents.
("S-XF86Launch5" . ("C-x" "s"))
;; Quit command.
("XF86Launch6" . "C-g")
;; Revert (reload) file.
("XF86Launch7" . ("C-x" "x" "g")))
;; Portal: Revolution
("revolution"
;; Quick Save
("XF86Launch5" . "F6")
;; Quick Load
("XF86Launch7" . "F7"))))
(set-bg-color "#222424") (set-bg-color "#222424")
(set-border-color "#3f4242") (set-border-color "#3f4242")

15
oni/home/services/utilities.scm
View file

@ -6,9 +6,6 @@
#:select (service-type #:select (service-type
service-extension service-extension
home-profile-service-type)) home-profile-service-type))
#:use-module ((gnu home services mcron)
#:select (home-mcron-service-type
home-mcron-configuration))
#:use-module ((gnu home services shepherd) #:use-module ((gnu home services shepherd)
#:select (home-shepherd-service-type #:select (home-shepherd-service-type
shepherd-service)) shepherd-service))
@ -48,13 +45,6 @@
#~(make-forkexec-constructor #~(make-forkexec-constructor
'(#$(file-append inkplate-display "/bin/inkplate-display"))))))) '(#$(file-append inkplate-display "/bin/inkplate-display")))))))
(define (home-inkplate-display-mcron-service config)
(list #~(job '(next-day)
(lambda ()
(system* "herd" "start" "inkplate-display"))
;; "herd start inkplate-display"
"Get new email and process it via the Notmuch hook scripts.")))
(define home-inkplate-display-service-type (define home-inkplate-display-service-type
(service-type (service-type
(name 'home-inkplate-display) (name 'home-inkplate-display)
@ -64,10 +54,7 @@
add-inkplate-display-packages) add-inkplate-display-packages)
(service-extension (service-extension
home-shepherd-service-type home-shepherd-service-type
home-inkplate-display-shepherd-service) home-inkplate-display-shepherd-service)))
(service-extension
home-mcron-service-type
home-inkplate-display-mcron-service)))
(compose identity) (compose identity)
(default-value (home-inkplate-display-configuration)) (default-value (home-inkplate-display-configuration))
(description "Install and configure Inkplate display."))) (description "Install and configure Inkplate display.")))

32
oni/packages/emacs-outli.scm Normal file
View file

@ -0,0 +1,32 @@
(define-module (oni packages emacs-outli)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system emacs)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages emacs-xyz))
(define-public emacs-outli
(let ((commit "bfaa2ff7b777dd7c7b383e79ade061fda25fc282")
(revision "0"))
(package
(name "emacs-outli")
(version (git-version "0.0.0" revision commit))
(source
(origin
(uri (git-reference
(url "https://github.com/jdtsmith/outli")
(commit commit)))
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32 "17gnz77x9xgkvg1452dshd10i445ayfjyvrpq6vb240blj5sbrc8"))))
(build-system emacs-build-system)
(home-page "https://github.com/jdtsmith/outli")
(synopsis "Simple comment-based outlines for Emacs")
(description "outli is a simple Emacs outliner for code, documents, and more which styles your
headings, and emulates org-mode navigation and structure editing. It is based on
the built-in outline-minor-mode and is simple by design, providing just a few
key features.")
(license license:gpl3+))))

46
oni/packages/emacs.scm
View file

@ -497,49 +497,3 @@ the way, but at the same time will be readable enough to know it's content.")
Syncthing REST API and request package to get this data and display it in an Syncthing REST API and request package to get this data and display it in an
Emacs buffer.") Emacs buffer.")
(license license:expat)))) (license license:expat))))
(define-public emacs-outli
(package
(name "emacs-outli")
(version "0.1.0")
(source
(origin
(uri (git-reference
(url "https://github.com/jdtsmith/outli")
(commit (string-append "v" version))))
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32 "1yyh334r26pjgcx51rrxacwiranysnhbdz83xgpjwaby280xwlgb"))))
(build-system emacs-build-system)
(home-page "https://github.com/jdtsmith/outli")
(synopsis "Simple comment-based outlines for Emacs")
(description "outli is a simple Emacs outliner for code, documents, and more which styles your
headings, and emulates org-mode navigation and structure editing. It is based on
the built-in outline-minor-mode and is simple by design, providing just a few
key features.")
(license license:gpl3+)))
(define-public emacs-ace-link-notmuch
(let ((commit "fb09673881ef0f7b7ad744c576a19f578df7c51d")
(revision "0"))
(package
(name "emacs-ace-link-notmuch")
(version (git-version "0.0.0" revision commit))
(source
(origin
(uri (git-reference
(url "https://git.sr.ht/~ryuslash/ace-link-notmuch")
(commit commit)))
(method git-fetch)
(sha256
(base32 "1wpdimvwkrbic0hybsp5pqaql066yvl1aar37fr5kcm19gbgvcf6"))
(file-name (git-file-name name version))))
(propagated-inputs
(list emacs-ace-link))
(build-system emacs-build-system)
(synopsis "ace-link functionality for notmuch")
(description
"ace-link functionality for notmuch")
(license license:gpl3+)
(home-page "https://sr.ht/~ryuslash/ace-link-notmuch/"))))