diff options
| -rw-r--r-- | oni/home/config/common.scm | 13 | ||||
| -rw-r--r-- | oni/home/config/data.scm | 44 | ||||
| -rw-r--r-- | oni/home/config/rincewind.scm | 12 | ||||
| -rw-r--r-- | oni/packages/emacs-outli.scm | 32 |
4 files changed, 71 insertions, 30 deletions
diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm index 44962d6..f83dece 100644 --- a/oni/home/config/common.scm +++ b/oni/home/config/common.scm @@ -189,16 +189,3 @@ LocalForward 2812 localhost:2812")) (color14 . "#7126f01ff01f") (color7 . "#969696") (color15 . "#ededed")))))) - -(define home-picom-service - (service home-picom-service-type - (home-picom-configuration - (config - '((detect-transient . #t) - (shadow . #t) - (wintypes ((dnd ((shadow . #f))) - (dock ((shadow . #f))))) - (shadow-radius . 10) - (shadow-exclude ("name = 'mowedline'" - "class_g = 'trayer'" - "bounding_shaped"))))))) diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm index 97d5e4f..11628f3 100644 --- a/oni/home/config/data.scm +++ b/oni/home/config/data.scm @@ -1,31 +1,47 @@ (define-module (oni home config data) - #:use-module (gnu home) - #:use-module (gnu home services) #:use-module (gnu home services desktop) - #:use-module (gnu services) - #:use-module (gnu packages) + #:use-module (gnu home services) + #:use-module (gnu home) #:use-module (gnu packages admin) #:use-module (gnu packages shellutils) #:use-module (gnu packages wm) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages) + #:use-module (gnu services) #:use-module (guix gexp) - #:use-module (oni home services rofi) - #:use-module (oni home services xsession) - #:use-module (oni home services xbindkeys) - #:use-module (oni home services zsh) + #:use-module (oni home config common) + #:use-module (oni home services cmst) + #:use-module ((oni home services compton) + #:select (home-picom-service-type + home-picom-configuration)) + #:use-module (oni home services dunst) + #:use-module (oni home services environment) #:use-module (oni home services herbstluftwm) - #:use-module (oni home services polybar) #:use-module (oni home services kdeconnect) - #:use-module (oni home services cmst) + #:use-module (oni home services polybar) + #:use-module (oni home services rofi) #:use-module (oni home services syncthing) #:use-module (oni home services unclutter) - #:use-module (oni home services dunst) - #:use-module (oni home services environment) + #:use-module (oni home services xbindkeys) + #:use-module (oni home services xsession) + #:use-module (oni home services zsh) #:use-module (oni packages hlwm-run-or-raise) #:use-module (oni packages pick-random-wallpaper) - #:use-module (oni home config common) #:use-module (oni packages shutdown-rofi)) +(define data-picom-service + (service home-picom-service-type + (home-picom-configuration + (config + '((detect-transient . #t) + (shadow . #t) + (wintypes ((dnd ((shadow . #f))) + (dock ((shadow . #f))))) + (shadow-radius . 10) + (shadow-exclude ("name = 'mowedline'" + "class_g = 'trayer'" + "bounding_shaped"))))))) + (home-environment (packages (list (specification->package+output "glibc-locales") (specification->package+output "font-fantasque-sans") @@ -46,7 +62,7 @@ home-xmodmap-service home-openssh-service home-kitty-service - home-picom-service + data-picom-service ;; This has to be the first extension because it needs to be added to the ;; configuration last. diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index 4e4cacc..cd7adc8 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -9,6 +9,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages music) #:use-module (gnu packages video) + #:use-module (gnu packages wm) #:use-module (gnu packages) #:use-module (gnu services) #:use-module (guix channels) @@ -23,19 +24,21 @@ #:use-module (oni home services environment) #:use-module (oni home services flameshot) #:use-module (oni home services kdeconnect) + #:use-module (oni home services mpd) #:use-module (oni home services polybar) #:use-module (oni home services rofi) #:use-module (oni home services syncthing) #:use-module (oni home services zsh) #:use-module (oni packages count-emails) + #:use-module (oni packages emacs) #:use-module (oni packages hlwm-run-or-raise) #:use-module (oni packages inbox-size) + #:use-module (oni packages mpd-random-albums) #:use-module (oni packages notmuch-collect-tasks) #:use-module (oni packages notmuch-tag-mailinglists) #:use-module (oni packages pick-random-wallpaper) #:use-module (oni packages shutdown-rofi) - #:use-module (oni packages mpd-random-albums) - #:use-module (oni home services mpd) + #:use-module (oni packages emacs-outli) #:use-module (oop goops)) (define (with-master-branch package) @@ -61,7 +64,10 @@ fakeroot ; Needed for build arch packages tmsu mpd-random-albums - )) + emacs-inkplate + emacs-outli + emacs-litable + stumpwm)) (services (list diff --git a/oni/packages/emacs-outli.scm b/oni/packages/emacs-outli.scm new file mode 100644 index 0000000..67fcd01 --- /dev/null +++ b/oni/packages/emacs-outli.scm @@ -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+)))) |