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

Compare commits

base: ryuslash:b98c93c159ac3213442d9581a8ef54244fa814fc
Branches Tags
ryuslash:master
..
compare: ryuslash:75190437c43fa9e1146ed53c7f4c9bddd548f8b2
Branches Tags
ryuslash:master

No commits in common. "b98c93c159ac3213442d9581a8ef54244fa814fc" and "75190437c43fa9e1146ed53c7f4c9bddd548f8b2" have entirely different histories.
b98c93c159 ... 75190437c4

5 changed files with 15 additions and 84 deletions
Show stats Expand all files Collapse all files

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

@ -27,8 +27,7 @@
#:use-module (oni home services zsh)
#:use-module (oni packages hlwm-run-or-raise)
#:use-module (oni packages pick-random-wallpaper)
#:use-module (oni packages shutdown-rofi)
#:use-module (oni packages zsh))
#:use-module (oni packages shutdown-rofi))
(define data-picom-service
(service home-picom-service-type
@ -68,7 +67,6 @@
;; configuration last.
(service home-zsh-syntax-highlighting-service-type)
(service home-zsh-autosuggestions-service-type)
(service home-zsh-contextual-abbrevs-service-type)
(service home-xsession-service-type
(home-xsession-configuration
@ -139,15 +137,13 @@
(dev split horizontal:0.54:1 (clients max:0) (clients vertical:0))))
(extra
(list
(mixed-text-file
"autostart"
"set_monitors 1920x1080+0+0\n"
"focus_edge left\n"
"keybind Mod4-apostrophe spawn dunstctl close\n"
"keybind Mod4-quotedbl spawn dunstctl close-all\n"
"keybind Mod4-Control-apostrophe spawn dunstctl history-pop\n"
"keybind Mod4-Mod1-apostrophe spawn dunstctl context\n"
"spawn pick-random-wallpaper\n")))))
"set_monitors 1920x1080+0+0"
"focus_edge left"
"keybind Mod4-apostrophe spawn dunstctl close"
"keybind Mod4-quotedbl spawn dunstctl close-all"
"keybind Mod4-Control-apostrophe spawn dunstctl history-pop"
"keybind Mod4-Mod1-apostrophe spawn dunstctl context"
"spawn pick-random-wallpaper"))))
(service home-polybar-service-type
(home-polybar-configuration

7
oni/home/services/herbstluftwm.scm
View file

@ -46,7 +46,7 @@
(alist '())
"Layouts to load for tags")
(extra
(text-config '())
(list '())
"Extra commands"))
(define (add-herbstluftwm-packages config)
@ -105,9 +105,8 @@
(car layout-pair)
(cdr layout-pair)))
(home-herbstluftwm-configuration-layouts config))
(list (serialize-text-config
config
(home-herbstluftwm-configuration-extra config)))))))
(map (λ (line) (format #f "herbstclient ~a\n" line))
(home-herbstluftwm-configuration-extra config))))))
(define (add-herbstluftwm-executable config)
(home-xinit-extension

6
oni/home/services/unclutter.scm
View file

@ -50,9 +50,9 @@
#~(make-forkexec-constructor
'#$(append
(delete #f
(list (file-append (home-unclutter-configuration-package config) "/bin/unclutter")
"--timeout" (number->string (home-unclutter-configuration-timeout config))
"--jitter" (number->string (home-unclutter-configuration-jitter config))
(list (file-append (home-unclutter-configuration-package config) "/bin/unclutter")
"--timeout" (home-unclutter-configuration-timeout config)
"--jitter" (home-unclutter-configuration-jitter config)
(and (home-unclutter-configuration-exclude-root config) "--exclude-root")
(and (home-unclutter-configuration-ignore-scrolling config) "--ignore-scrolling")
(and (home-unclutter-configuration-hide-on-touch config) "--hide-on-touch")

35
oni/home/services/zsh.scm
View file

@ -6,14 +6,11 @@
#:use-module (gnu home services utils)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (oni packages zsh)
#:export (home-zsh-autosuggestions-service-type
home-zsh-autosuggestions-configuration
home-zsh-syntax-highlighting-service-type
home-zsh-syntax-highlighting-configuration
home-zsh-contextual-abbrevs-service-type
home-zsh-contextual-abbrevs-configuration))
home-zsh-syntax-highlighting-configuration))
(define-configuration/no-serialization home-zsh-autosuggestions-configuration
(package
@ -75,33 +72,3 @@
(compose identity)
(default-value (home-zsh-syntax-highlighting-configuration))
(description "Install and configure zsh-syntax-highlighting.")))
(define-configuration/no-serialization home-zsh-contextual-abbrevs-configuration
(package
(package zsh-contextual-abbrevs)
"Package to use for setting zsh-contexual-abbrevs."))
(define (add-zsh-contextual-abbrevs config)
(home-zsh-extension
(zshrc
(list
(mixed-text-file
"zshrc"
"source " (home-zsh-contextual-abbrevs-configuration-package config) "/share/zsh/plugins/zsh-contextual-abbrevs/contextual-abbrevs.zsh")))))
(define (add-zsh-contextual-abbrevs-packages config)
(list (home-zsh-contextual-abbrevs-configuration-package config)))
(define home-zsh-contextual-abbrevs-service-type
(service-type
(name 'home-zsh-contextual-abbrevs)
(extensions
(list (service-extension
home-zsh-service-type
add-zsh-contextual-abbrevs)
(service-extension
home-profile-service-type
add-zsh-contextual-abbrevs-packages)))
(compose identity)
(default-value (home-zsh-contextual-abbrevs-configuration))
(description "Install and configure zsh-contextual-abbrevs.")))

31
oni/packages/zsh.scm
View file

@ -1,31 +0,0 @@
(define-module (oni packages zsh)
#:use-module ((guix licenses) #:prefix license:)
#:use-module ((guix packages) #:select (package origin base32))
#:use-module ((guix git-download) #:select (git-version
git-reference
git-fetch
git-file-name))
#:use-module ((guix build-system copy) #:select (copy-build-system)))
(define-public zsh-contextual-abbrevs
(let ((commit "232ac42d70dba257fa904fc9a96f2a3bfed16585")
(revision "0"))
(package
(name "zsh-contextual-abbrevs")
(version (git-version "0.0.0" revision commit))
(source (origin
(uri (git-reference
(url "https://github.com/langston-barrett/zsh-contextual-abbrevs.git")
(commit commit)))
(method git-fetch)
(sha256
(base32 "02r6k0bhdbj585mchz8m9z5yjzk7xd48mz4mamirb9nap4n870zh"))
(file-name (git-file-name name version))))
(build-system copy-build-system)
(arguments
'(#:install-plan '(("src"
"/share/zsh/plugins/zsh-contextual-abbrevs"))))
(synopsis "Auto")
(description "Something")
(license license:expat)
(home-page "https://example.org"))))