Compare commits
No commits in common. "2cd30670d8395dc832747a4a0295ffd1bfb256b4" and "21d8c958e83cab295a528fe141231149f3804077" have entirely different histories.
2cd30670d8
...
21d8c958e8
11 changed files with 18 additions and 224 deletions
|
|
@ -12,7 +12,6 @@
|
|||
(outline-heading-end-regexp . ":\n")
|
||||
(outline-regexp . "##+"))
|
||||
(scheme-mode
|
||||
(geiser-guile-binary . ("guix" "repl"))
|
||||
(projectile-project-compilation-cmd . "guix home build config.scm")
|
||||
(eval . (put 'eval-when 'scheme-indent-function 1))
|
||||
(eval . (put 'call-with-prompt 'scheme-indent-function 1))
|
||||
|
|
|
|||
|
|
@ -163,8 +163,6 @@ endif
|
|||
check:
|
||||
$(SCHEME_IMPLEMENTATION) --no-auto-compile test.scm
|
||||
|
||||
new-dotfiles:
|
||||
|
||||
# Local Variables:
|
||||
# outline-regexp: "##+"
|
||||
# End:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
(add-to-load-path (dirname (current-filename)))
|
||||
|
||||
(system* "make" "new-dotfiles")
|
||||
|
||||
(load-from-path "secrets.scm")
|
||||
(load-from-path (string-append "oni/home/config/" (gethostname) ".scm"))
|
||||
|
|
|
|||
|
|
@ -9,4 +9,3 @@
|
|||
sendmailcmd = /usr/bin/msmtp
|
||||
[init]
|
||||
defaultBranchname = main
|
||||
defaultBranch = main
|
||||
|
|
|
|||
|
|
@ -89,8 +89,7 @@
|
|||
(environment-variables
|
||||
'(("HISTFILE" . "$HOME/.zsh/histfile")
|
||||
("HISTSIZE" . "1000")
|
||||
("SAVEHIST" . "1000")
|
||||
("WORDCHARS" . "")))
|
||||
("SAVEHIST" . "1000")))
|
||||
(zshrc
|
||||
(list
|
||||
(mixed-text-file
|
||||
|
|
@ -113,10 +112,6 @@
|
|||
"bindkey -e '^[w' x-copy-region-as-kill\n"
|
||||
"bindkey -e '^W' x-kill-region\n"
|
||||
"bindkey -e '^Y' x-yank\n"
|
||||
"bindkey -e '^[f' emacs-forward-word\n"
|
||||
"bindkey -e '^[F' emacs-forward-word\n"
|
||||
"bindkey -e '^[b' emacs-backward-word\n"
|
||||
"bindkey -e '^[B' emacs-backward-word\n"
|
||||
"autoload -Uz compinit\n"
|
||||
"compinit\n"
|
||||
"function horizontal-rule() {\n"
|
||||
|
|
@ -155,8 +150,7 @@
|
|||
(user "slash")
|
||||
(port 4511)
|
||||
(extra-content "LocalForward 8090 localhost:8090
|
||||
LocalForward 2812 localhost:2812
|
||||
LocalForward 19999 localhost:19999"))
|
||||
LocalForward 2812 localhost:2812"))
|
||||
(openssh-host
|
||||
(name "rincewind")
|
||||
(host-name "192.168.1.135")
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
home-msmtp-configuration
|
||||
msmtp-configuration
|
||||
msmtp-account))
|
||||
#:use-module ((gnu home services guix)
|
||||
#:select (home-channels-service-type))
|
||||
#:use-module ((gnu home services gnupg)
|
||||
#:select (home-gpg-agent-service-type
|
||||
home-gpg-agent-configuration))
|
||||
|
|
@ -31,8 +33,6 @@
|
|||
#:select (gforth))
|
||||
#:use-module ((gnu packages gnome)
|
||||
#:select (hicolor-icon-theme))
|
||||
#:use-module ((gnu packages librewolf)
|
||||
#:select (librewolf))
|
||||
#:use-module ((gnu packages linux)
|
||||
#:select (fakeroot))
|
||||
#:use-module ((gnu packages mail)
|
||||
|
|
@ -48,8 +48,7 @@
|
|||
tree-sitter-json
|
||||
tree-sitter-css))
|
||||
#:use-module ((gnu packages)
|
||||
#:select (specification->package+output
|
||||
specification->package))
|
||||
#:select (specification->package+output))
|
||||
#:use-module ((gnu services)
|
||||
#:select (service
|
||||
simple-service))
|
||||
|
|
@ -74,8 +73,7 @@
|
|||
home-guile-service
|
||||
home-xmodmap-service
|
||||
home-openssh-service
|
||||
home-kitty-service
|
||||
home-channels-service))
|
||||
home-kitty-service))
|
||||
#:use-module ((oni home services autokey)
|
||||
#:select (home-autokey-service-type))
|
||||
#:use-module ((oni home services copyq)
|
||||
|
|
@ -99,9 +97,7 @@
|
|||
home-emacs-pinentry-service-type
|
||||
home-emacs-vterm-service-type
|
||||
home-emacs-vterm-configuration
|
||||
home-emacs-org-modern-service-type
|
||||
home-wakatime-service-type
|
||||
home-wakatime-configuration))
|
||||
home-emacs-org-modern-service-type))
|
||||
#:use-module ((oni home services environment)
|
||||
#:select (home-environment-service))
|
||||
#:use-module ((oni home services flameshot)
|
||||
|
|
@ -204,8 +200,7 @@
|
|||
emacs-oni-yaml
|
||||
emacs-oni-python
|
||||
emacs-oni-git-commit
|
||||
emacs-oni-php
|
||||
emacs-oni-web-mode))
|
||||
emacs-oni-php))
|
||||
#:use-module ((oni packages inbox-size)
|
||||
#:select (inbox-size))
|
||||
#:use-module ((oni packages mpd)
|
||||
|
|
@ -218,9 +213,6 @@
|
|||
#:select (pick-random-wallpaper))
|
||||
#:use-module ((oni packages shutdown-rofi)
|
||||
#:select (shutdown-rofi))
|
||||
#:use-module ((oni packages snes-games)
|
||||
#:select (snes-blackthorne
|
||||
snes-blackthorne-icons))
|
||||
#:use-module ((oni packages stumpwm)
|
||||
#:select (stumpwm+swank))
|
||||
#:use-module ((oni packages terminals)
|
||||
|
|
@ -234,11 +226,6 @@
|
|||
`((with-branch . ,(string-append (package-name package) "=master"))))
|
||||
package))
|
||||
|
||||
(define (with-source package source)
|
||||
((options->transformation
|
||||
`((with-source . ,(format #f "~a=~a" (package-name package) source))))
|
||||
package))
|
||||
|
||||
(define rincewind-picom-service
|
||||
(service home-picom-service-type
|
||||
(home-picom-configuration
|
||||
|
|
@ -272,10 +259,6 @@
|
|||
(specification->package+output "glibc-locales")
|
||||
(specification->package+output "font-fantasque-sans")
|
||||
(specification->package+output "font-comic-neue")
|
||||
(specification->package+output "font-dosis")
|
||||
(specification->package "zathura")
|
||||
(specification->package "zathura-ps")
|
||||
(specification->package "zathura-pdf-mupdf")
|
||||
pick-random-wallpaper
|
||||
notmuch-collect-tasks
|
||||
notmuch-tag-mailinglists
|
||||
|
|
@ -346,7 +329,6 @@
|
|||
emacs-nginx-mode
|
||||
emacs-oni-git-commit
|
||||
emacs-oni-php
|
||||
emacs-oni-web-mode
|
||||
|
||||
tree-sitter-bash
|
||||
tree-sitter-scheme
|
||||
|
|
@ -362,12 +344,7 @@
|
|||
;; Might be needed for cetrificates
|
||||
nss-certs
|
||||
|
||||
tym
|
||||
|
||||
(with-source snes-blackthorne-icons
|
||||
(format #f "~a/pictures/icons/Blackthorne/blackthorne_icons.tar.gz" (getenv "HOME")))
|
||||
(with-source snes-blackthorne
|
||||
(format #f "~a/downloads/Blackthorne.7z" (getenv "HOME")))))
|
||||
tym))
|
||||
|
||||
(services
|
||||
(list
|
||||
|
|
@ -395,7 +372,7 @@
|
|||
;; (home-polybar-configuration
|
||||
;; (bar "rincewind")))
|
||||
|
||||
(service home-kdeconnect-service-type)
|
||||
;; (service home-kdeconnect-service-type)
|
||||
(service home-syncthing-service-type)
|
||||
|
||||
(service home-emacs-service-type
|
||||
|
|
@ -439,11 +416,6 @@
|
|||
(home-emacs-vterm-configuration
|
||||
(buffer-name-string "*vterm* %s")))
|
||||
(service home-emacs-org-modern-service-type)
|
||||
(service home-wakatime-service-type
|
||||
(home-wakatime-configuration
|
||||
(api-url "https://waka.ryuslash.org/api")
|
||||
(exclude '("COMMIT_EDITMSG$"
|
||||
"TAG_EDITMSG$"))))
|
||||
|
||||
(service home-flameshot-service-type)
|
||||
|
||||
|
|
@ -537,30 +509,18 @@
|
|||
|
||||
(service home-icecat-service-type
|
||||
(home-icecat-configuration
|
||||
(package librewolf)
|
||||
(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")
|
||||
;; Visual modifications. Don't let websites pick the colors or
|
||||
;; the fonts, use mine instead.
|
||||
("browser.display.document_color_use" 2)
|
||||
("browser.display.use_document_fonts" 0)
|
||||
("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)
|
||||
("browser.newtabpage.activity-stream.showWeather" #f)
|
||||
("font.default.x-western" "sans-serif")
|
||||
("font.minimum-size.x-western" 18)
|
||||
("font.name.monospace.x-western" "Fantasque Sans Mono")
|
||||
("font.name.sans-serif.x-western" "Dosis")
|
||||
;; Sadly, with this option on it won't accept my color
|
||||
;; modifications, so I turn it off, even though I would prefer
|
||||
;; being able to leave everything (except the forced light
|
||||
;; theme) on.
|
||||
("privacy.resistFingerprinting" #f)
|
||||
;; Change the accelerator key (modifier key for most keyboard
|
||||
;; shortcuts) to the super key (from control).
|
||||
("ui.key.accelKey" 91))))))))
|
||||
|
|
|
|||
|
|
@ -39,12 +39,6 @@
|
|||
#:select (emacs-yasnippet-capf
|
||||
emacs-golden-ratio
|
||||
emacs-ace-link-notmuch))
|
||||
#:use-module ((rosenthal packages binaries)
|
||||
#:select (wakatime-cli-bin))
|
||||
#:use-module ((rosenthal packages emacs-xyz)
|
||||
#:select (emacs-wakatime-mode))
|
||||
#:use-module ((srfi srfi-1)
|
||||
#:select (every))
|
||||
|
||||
#:export (home-emacs-service-type
|
||||
home-emacs-configuration
|
||||
|
|
@ -77,20 +71,10 @@
|
|||
home-emacs-vterm-configuration
|
||||
|
||||
home-emacs-org-modern-service-type
|
||||
home-emacs-org-modern-configuration
|
||||
|
||||
home-wakatime-service-type
|
||||
home-wakatime-configuration))
|
||||
home-emacs-org-modern-configuration))
|
||||
|
||||
(define-maybe string)
|
||||
|
||||
(define (list-of-strings? obj)
|
||||
(and (list? obj)
|
||||
(every string? obj)))
|
||||
|
||||
(define (serialize-list-of-strings field value)
|
||||
(string-append " " (string-join value "\n ")))
|
||||
|
||||
;;; Emacs
|
||||
|
||||
(define-configuration/no-serialization home-emacs-extension
|
||||
|
|
@ -409,7 +393,6 @@
|
|||
"(golden-ratio-mode)\n"
|
||||
"(with-eval-after-load 'ace-window\n"
|
||||
" (advice-add 'ace-window :after #'golden-ratio))\n"
|
||||
"(add-to-list 'golden-ratio-exclude-modes 'calculator-mode)\n"
|
||||
";;;;; golden-ratio-config ends here.\n"))
|
||||
(home-emacs-golden-ratio-configuration-configurations config)))))
|
||||
|
||||
|
|
@ -598,70 +581,3 @@
|
|||
(compose identity)
|
||||
(default-value (home-emacs-org-modern-configuration))
|
||||
(description "Install and configure emacs-org-modern.")))
|
||||
|
||||
;;; Wakatime
|
||||
|
||||
(define-configuration/no-serialization home-wakatime-configuration
|
||||
(package
|
||||
(package wakatime-cli-bin)
|
||||
"Package to use for the wakatime-cli program")
|
||||
(emacs-package
|
||||
(package emacs-wakatime-mode)
|
||||
"Package to use for setting emacs-wakatime-mode")
|
||||
(api-url
|
||||
maybe-string
|
||||
"URL where the API lives")
|
||||
;; (api-key
|
||||
;; maybe-string
|
||||
;; "API key for connecting to wakatime")
|
||||
(debug
|
||||
(boolean #f)
|
||||
"Run in debug mode?")
|
||||
(exclude
|
||||
(list-of-strings '())
|
||||
"Filename patterns to exclude"))
|
||||
|
||||
(define (add-wakatime-emacs-configuration config)
|
||||
(home-emacs-extension
|
||||
(configurations
|
||||
(append
|
||||
(list (mixed-text-file "wakatime-config"
|
||||
";;;;; wakatime-config starts here.\n"
|
||||
;; (if (maybe-value-set? (home-wakatime-configuration-api-key config))
|
||||
;; (format #f "(setq wakatime-api-key ~s)~%" (home-wakatime-configuration-api-key config))
|
||||
;; "")
|
||||
"(setq wakatime-cli-path \"" (home-wakatime-configuration-package config) "/bin/wakatime-cli\")\n"
|
||||
"(global-wakatime-mode)\n"
|
||||
";;;;; wakatime-config ends here.\n"))))))
|
||||
|
||||
(define (add-wakatime-configuration-file config)
|
||||
`((".wakatime.cfg"
|
||||
,(mixed-text-file
|
||||
"wakatime.cfg"
|
||||
"[settings]\n"
|
||||
"api_url = " (home-wakatime-configuration-api-url config) "\n"
|
||||
"api_key_vault_cmd = secret-tool lookup service wakatime host " (home-wakatime-configuration-api-url config) "\n"
|
||||
"debug = " (if (home-wakatime-configuration-debug config) "true" "false") "\n"
|
||||
"exclude =\n"
|
||||
(serialize-list-of-strings 'exclude (home-wakatime-configuration-exclude config))))))
|
||||
|
||||
(define (add-wakatime-packages config)
|
||||
(list (home-wakatime-configuration-package config)
|
||||
(home-wakatime-configuration-emacs-package config)))
|
||||
|
||||
(define home-wakatime-service-type
|
||||
(service-type
|
||||
(name 'home-wakatime)
|
||||
(extensions
|
||||
(list (service-extension
|
||||
home-emacs-service-type
|
||||
add-wakatime-emacs-configuration)
|
||||
(service-extension
|
||||
home-profile-service-type
|
||||
add-wakatime-packages)
|
||||
(service-extension
|
||||
home-files-service-type
|
||||
add-wakatime-configuration-file)))
|
||||
(compose identity)
|
||||
(default-value (home-wakatime-configuration))
|
||||
(description "Install and configure wakatime.")))
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@
|
|||
home-profile-service-type
|
||||
home-files-service-type))
|
||||
#:use-module ((guix packages)
|
||||
#:select (package?
|
||||
package-name))
|
||||
#:select (package?))
|
||||
#:use-module ((guix gexp)
|
||||
#:select (gexp
|
||||
mixed-text-file))
|
||||
|
|
@ -50,8 +49,7 @@
|
|||
(list (home-icecat-configuration-package config)))
|
||||
|
||||
(define (home-icecat-configuration-files config)
|
||||
`((;; ,(string-append ".mozilla/" (package-name (home-icecat-configuration-package config)) "/profiles.ini")
|
||||
".librewolf/profiles.ini"
|
||||
`((".mozilla/icecat/profiles.ini"
|
||||
,(mixed-text-file
|
||||
"profiles.ini"
|
||||
"[Install4F96D1932A9F858E]\n"
|
||||
|
|
@ -67,8 +65,7 @@
|
|||
"[General]\n"
|
||||
"StartWithLastProfile=1\n"
|
||||
"Version=2\n"))
|
||||
(;; ,(string-append ".mozilla/" (package-name (home-icecat-configuration-package config)) "/default/user.js")
|
||||
".librewolf/default/user.js"
|
||||
(".mozilla/icecat/default/user.js"
|
||||
,(mixed-text-file
|
||||
"user.js"
|
||||
(serialize-alist config (home-icecat-configuration-settings config))))))
|
||||
|
|
|
|||
|
|
@ -20,20 +20,10 @@
|
|||
|
||||
(define (home-kdeconnect-shepherd-service config)
|
||||
(list
|
||||
(shepherd-service
|
||||
(documentation "Start kdeconnectd")
|
||||
(provision '(kdeconnectd))
|
||||
(auto-start? #t)
|
||||
(start
|
||||
#~(make-forkexec-constructor
|
||||
(list #$(file-append (home-kdeconnect-configuration-package config) "/bin/kdeconnectd"))
|
||||
#:log-file (format #f "~a/.local/var/log/kdeconnectd.log" (getenv "HOME"))))
|
||||
(stop #~(make-kill-destructor)))
|
||||
(shepherd-service
|
||||
(documentation "Start kdeconnect")
|
||||
(provision '(kdeconnect))
|
||||
(requirement '(kdeconnectd))
|
||||
;; (requirement '(statusbar))
|
||||
(requirement '(statusbar))
|
||||
(auto-start? #t)
|
||||
(start
|
||||
#~(make-forkexec-constructor
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@
|
|||
home-profile-service-type
|
||||
home-xdg-configuration-files-service-type
|
||||
home-run-on-change-service-type))
|
||||
#:use-module ((gnu home services shepherd)
|
||||
#:select (home-shepherd-service-type
|
||||
shepherd-service))
|
||||
#:use-module ((guix gexp)
|
||||
#:select (local-file
|
||||
gexp
|
||||
|
|
@ -40,9 +37,6 @@
|
|||
home-stumpwm-stumptray-service-type
|
||||
home-stumpwm-stumptray-configuration))
|
||||
|
||||
(define (serialize-integer field value)
|
||||
"")
|
||||
|
||||
(define-configuration/no-serialization home-stumpwm-extension
|
||||
(configurations
|
||||
(text-config '())
|
||||
|
|
@ -55,9 +49,6 @@
|
|||
(configurations
|
||||
(text-config '())
|
||||
"The configuration to apply.")
|
||||
(startup-delay
|
||||
(integer 10)
|
||||
"The number of seconds to wait for stumpwm to start up.")
|
||||
(stumpish-package
|
||||
(package stumpish)
|
||||
"Package to use for setting Stumpish"))
|
||||
|
|
@ -84,36 +75,6 @@
|
|||
`(("files/.config/stumpwm/config"
|
||||
,#~(system* #$(file-append stumpish "/bin/stumpish") "reload"))))
|
||||
|
||||
;; (define (stumpwm-mode-line-service config)
|
||||
;; (list (shepherd-service
|
||||
;; (documentation "Try and find out if the stumpwm mode line is enabled.")
|
||||
;; (provision '(stumpwm-mode-line statusbar))
|
||||
;; (modules '((ice-9 textual-ports)
|
||||
;; (srfi srfi-1)))
|
||||
;; (start
|
||||
;; #~(lambda ()
|
||||
;; (let loop ((attempts #$(home-stumpwm-configuration-startup-delay config)))
|
||||
;; (let* ((input+output (pipe))
|
||||
;; ;; Use the timeout command here to stop it.
|
||||
;; (pid (spawn "timeout" '("timeout" "1" "stumpish" "eval" "(print (let ((ml (stumpwm::head-mode-line (current-head)))) (and ml (not (eq (stumpwm::mode-line-mode ml) :hidden)))))")
|
||||
;; #:output (cdr input+output))))
|
||||
;; (let ((result (string= "T" (string-trim-right (get-string-all (car input+output))))))
|
||||
;; (close-port (car input+output))
|
||||
;; (close-port (cdr input+output))
|
||||
;; (waitpid pid)
|
||||
;; (if result
|
||||
;; result
|
||||
;; (if (zero? attempts)
|
||||
;; (begin
|
||||
;; (format (current-error-port)
|
||||
;; "Stumpwm mode line did not show up; giving up.\n")
|
||||
;; #f)
|
||||
;; (begin
|
||||
;; (sleep 1)
|
||||
;; (loop (- attemps 1))))))))))
|
||||
;; (stop #~(lambda (_) #f))
|
||||
;; (respawn? #f))))
|
||||
|
||||
(define home-stumpwm-service-type
|
||||
(service-type
|
||||
(name 'home-stumpwm)
|
||||
|
|
@ -126,11 +87,7 @@
|
|||
home-stumpwm-config-files)
|
||||
(service-extension
|
||||
home-run-on-change-service-type
|
||||
reload-stumpwm-config-gexp)
|
||||
;; (service-extension
|
||||
;; home-shepherd-service-type
|
||||
;; stumpwm-mode-line-service)
|
||||
))
|
||||
reload-stumpwm-config-gexp)))
|
||||
(compose identity)
|
||||
(extend home-stumpwm-extensions)
|
||||
(default-value (home-stumpwm-configuration))
|
||||
|
|
|
|||
|
|
@ -932,16 +932,3 @@ Emacs")))
|
|||
emacs-xcscope))
|
||||
(synopsis "My configuration for php-mode.")
|
||||
(description "This package provides my configuration for editing PHP files.")))
|
||||
|
||||
(define-public emacs-oni-web-mode
|
||||
(package
|
||||
(inherit emacs-oni-config)
|
||||
(name "emacs-oni-web-mode")
|
||||
(arguments
|
||||
'(#:include '("oni-web\\.el$")))
|
||||
(propagated-inputs
|
||||
(list
|
||||
emacs-web-mode
|
||||
emacs-oni-flycheck))
|
||||
(synopsis "My configuration for web-mode.")
|
||||
(description "This package provides my configuration for editing Web template files.")))
|
||||
|
|
|
|||
Loading…
Reference in a new issue