diff options
Diffstat (limited to 'oni')
| -rw-r--r-- | oni/home/config/rincewind.scm | 22 | ||||
| -rw-r--r-- | oni/home/services/emacs.scm | 6 | ||||
| -rw-r--r-- | oni/home/services/gnuzilla.scm | 85 | ||||
| -rw-r--r-- | oni/home/services/stumpwm/config | 2 | ||||
| -rw-r--r-- | oni/packages/emacs-config.scm | 4 |
5 files changed, 113 insertions, 6 deletions
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index d93956a..444b76f 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -102,6 +102,9 @@ #:select (home-environment-service)) #:use-module ((oni home services flameshot) #:select (home-flameshot-service-type)) + #:use-module ((oni home services gnuzilla) + #:select (home-icecat-service-type + home-icecat-configuration)) #:use-module ((oni home services kdeconnect) #:select (home-kdeconnect-service-type)) #:use-module ((oni home services mpd) @@ -538,4 +541,21 @@ (ssh-support? #f) (extra-content "allow-emacs-pinentry\n"))) - (service home-ssh-agent-service-type)))) + (service home-ssh-agent-service-type) + + (service home-icecat-service-type + (home-icecat-configuration + (settings + '(("extensions.pocket.enabled" #f) + ("view_source.editor.args" "--no-wait") + ("view_source.editor.external" #t) + ("view_source.editor.path" "/home/chelys/.guix-home/profile/bin/emacsclient") + ("browser.display.background_color" "#222424") + ("browser.display.foreground_color" "#bfbfbf") + ("browser.display.document_color_use" 2) + ("browser.anchor_color" "#ff9800") + ("browser.visited_color" "#0babab") + ("browser.display.use_document_fonts" 0) + ;; Change the accelerator key (modifier key for most keyboard + ;; shortcuts) to the super key (from control). + ("ui.key.accelKey" 91)))))))) diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm index 2018be5..1752b40 100644 --- a/oni/home/services/emacs.scm +++ b/oni/home/services/emacs.scm @@ -504,8 +504,10 @@ "fi\n" (if (maybe-value-set? (home-emacs-vterm-configuration-buffer-name-string config)) (string-append - "autoload -U add-zsh-hook\n" - "add-zsh-hook -Uz chpwd (){ print -Pn \"\\e]2;%m:%2~\\a\" }\n") + "vterm_chpwd(){ print -Pn \"\\e]2;%m:%2~\\a\" }\n" + "if [[ \"$INSIDE_EMACS\" = 'vterm' ]]; then\n" + " chpwd_functions+=(vterm_chpwd)\n" + "fi\n") "") "vterm_prompt_end() {\n" " vterm_printf \"51;A$(whoami)@$(hostname):$(pwd)\"\n" diff --git a/oni/home/services/gnuzilla.scm b/oni/home/services/gnuzilla.scm new file mode 100644 index 0000000..61b9c36 --- /dev/null +++ b/oni/home/services/gnuzilla.scm @@ -0,0 +1,85 @@ +(define-module (oni home services gnuzilla) + #:use-module ((ice-9 match) + #:select (match)) + #:use-module ((gnu services configuration) + #:select (serialize-package + define-configuration)) + #:use-module ((gnu packages gnuzilla) + #:select (icecat)) + #:use-module ((gnu home services) + #:select (service-type + service-extension + home-profile-service-type + home-files-service-type)) + #:use-module ((guix packages) + #:select (package?)) + #:use-module ((guix gexp) + #:select (gexp + mixed-text-file)) + + #:export (home-icecat-service-type + home-icecat-configuration)) + +(define (serialize-setting pair) + (match pair + ((key (? boolean? value)) + (format #f "user_pref(~s, ~a);" key (if value "true" "false"))) + ((key (? number? value)) + (format #f "user_pref(~s, ~a);" key value)) + ((key (? string? value)) + (format #f "user_pref(~s, ~s);" key value)))) + +(define (serialize-alist field value) + (string-join (map serialize-setting value) "\n")) + +(define (alist? value) + (or (null? value) + (and (list? value) + (list? (car value))))) + +(define-configuration home-icecat-configuration + (package + (package icecat) + "Package to use for setting up icecat.") + (settings + (alist '()) + "Settings to specify for the generated profile.")) + +(define (add-icecat-packages config) + (list (home-icecat-configuration-package config))) + +(define (home-icecat-configuration-files config) + `((".mozilla/icecat/profiles.ini" + ,(mixed-text-file + "profiles.ini" + "[Install4F96D1932A9F858E]\n" + "Default=default\n" + "Locked=1\n" + "\n" + "[Profile0]\n" + "Name=default\n" + "IsRelative=1\n" + "Path=default\n" + "Default=1\n" + "\n" + "[General]\n" + "StartWithLastProfile=1\n" + "Version=2\n")) + (".mozilla/icecat/default/user.js" + ,(mixed-text-file + "user.js" + (serialize-alist config (home-icecat-configuration-settings config)))))) + +(define home-icecat-service-type + (service-type + (name 'home-icecat) + (extensions + (list (service-extension + home-profile-service-type + add-icecat-packages) + (service-extension + home-files-service-type + home-icecat-configuration-files))) + (compose identity) + (default-value (home-icecat-configuration)) + (description "Install and configure icecat."))) diff --git a/oni/home/services/stumpwm/config b/oni/home/services/stumpwm/config index 82907aa..81ab3ca 100644 --- a/oni/home/services/stumpwm/config +++ b/oni/home/services/stumpwm/config @@ -39,7 +39,7 @@ after it has been unlocked." (defcommand raise-terminal () () "Open or show my terminal" - (run-or-raise "kitty" '(:class "kitty"))) + (run-or-raise "kitty" '(:class "kitty|org\.wezfurlong\.wezterm"))) (define-key *top-map* (kbd "C-M-l") "lock-screen") (define-key *top-map* (kbd "s-b") "raise-browser") diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index 2b5fa49..4feca7a 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -14,7 +14,7 @@ #:use-module (oni packages emacs)) (define-public emacs-oni-config - (let ((commit "89f4dc62348a347ca6d8e0391d33639aef87d965") + (let ((commit "f404ee603285efc62c73f03b178bd367d115fcbc") (revision "0")) (package (name "emacs-oni-config") @@ -27,7 +27,7 @@ (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "07r4vgp27mwa1ianwz0vf5ip5vd52m5czskygkbf9c9pa5hmr31n")))) + (base32 "1q9qh3b9r06j87pwscabj5mqjhbnysiw1a0xb31c4wn24bnmm143")))) (build-system emacs-build-system) (home-page "https://code.ryuslash.org/emacs-config/about/") (synopsis "My Emacs configuration") |