aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--oni/home/data/config.scm93
-rw-r--r--oni/home/rincewind/config.scm48
-rw-r--r--oni/home/services/environment.scm16
-rw-r--r--oni/home/services/rofi.scm88
4 files changed, 154 insertions, 91 deletions
diff --git a/oni/home/data/config.scm b/oni/home/data/config.scm
index a81bd1e..a4cc54d 100644
--- a/oni/home/data/config.scm
+++ b/oni/home/data/config.scm
@@ -26,6 +26,7 @@
#:use-module (oni home services unclutter)
#:use-module (oni home services dunst)
#:use-module (oni home services guile)
+ #:use-module (oni home services environment)
#:use-module (oni packages hlwm-run-or-raise)
#:use-module (oni packages pick-random-wallpaper))
@@ -38,15 +39,8 @@
(services
(list
- (simple-service 'some-useful-env-vars-service
- home-environment-variables-service-type
- `(("LESS" . "FXRSi")
- ("MY_GUIX_CONFIGURED" . "1")
- ("DOTNET_CLI_TELEMETRY_OPTOUT" . "1")
- ("EDITOR" . "emacsclient")
- ("CALIBRE_USE_DARK_PALETTE" . "1")
- ("GUIX_LOCPATH" . "$HOME/.guix-home/profile/lib/locale")
- ("XDG_DATA_DIRS" . "${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}/usr/local/share:/usr/share")))
+ home-environment-service
+ home-rofi-default-service
(service home-redshift-service-type
(home-redshift-configuration
@@ -88,88 +82,7 @@
(service home-zsh-syntax-highlighting-service-type)
(service home-zsh-autosuggestions-service-type)
- (service home-rofi-service-type
- (home-rofi-configuration
- (config
- '((kb-cancel . "Escape,Control+g")
- (window-format . "{c} {t}")))
- (theme
- '((* ((text-color . "#bfbfbf")
- (background-color . "#3f4242")
- (lightbg . "#5b6161")
- (red . "#a85454")
- (orange . "#faa41a")
- (blue . "#1f2c3f")
-
- (selected-normal-foreground . "@text-color")
- (normal-foreground . "@text-color")
- (alternate-normal-background . "@background-color")
- (selected-urgent-foreground . "@text-color")
- (urgent-foreground . "@text-color")
- (alternate-urgent-background . "@background-color")
- (active-foreground . "@text-color")
- (selected-active-foreground . "@text-color")
- (alternate-normal-foreground . "@text-color")
- (alternate-active-background . "@blue")
- (bordercolor . "@text-color")
- (normal-background . "@background-color")
- (selected-normal-background . "@blue")
- (separatorcolor . "@orange")
- (spacing . 2)
- (urgent-background . "@red")
- (alternate-urgent-foreground . "@text-color")
- (selected-urgent-background . "@red")
- (alternate-active-foreground . "@text-color")
- (selected-active-background . "@blue")
- (active-background . "@red")
- (font . "Fantasque Sans Mono 14")))
- (window ((border . 0)
- (text-color . "@text-color")
- (background-color . "rgba(0, 0, 0, 0%)")
- (padding . 5)
- (text-color . "@bordercolor")
- (background-color . "@background-color")))
- (mainbox ((border . 0)
- (padding . 0)))
- (message ((border . "1px dash 0px 0px")
- (text-color . "@separatorcolor")
- (padding . "2px 0px 0px")))
- (textbox ((text-color . "@text-color")))
- (listview ((fixed-height . 0)
- (border . "2px 0px 0px")
- (padding . "2px 0px 0px")
- (text-color . "@separatorcolor")))
- (element ((border . 0)
- (children "element-icon" "element-text")
- (spacing . "5px")))
- (element.normal.normal ((text-color . "@normal-foreground")
- (background-color . "@normal-background")))
- (element.normal.urgent ((text-color . "@urgent-foreground")
- (background-color . "@urgent-background")))
- (element.normal.active ((text-color . "@active-foreground")
- (background-color . "@active-background")))
- (element.selected.urgent ((text-color . "@selected-urgent-foreground")
- (background-color . "@selected-urgent-background")))
- (element.selected.active ((text-color . "@selected-active-foreground")
- (background-color . "@selected-active-foreground")))
- (element.alternate.normal ((text-color . "@alternate-normal-foreground")
- (background-color . "@alternate-normal-background")))
- (element.alternate.urgent ((text-color . "@alternate-urgent-foreground")
- (background-color . "@alternate-urgent-background")))
- (element.alternate.active ((text-color . "@alternate-active-foreground")
- (background-color . "@alternate-active-background")))
- (mode-switcher ((border . "1px dash 0px 0px")))
- (#{button selected}# ((text-color . "@selected-normal-foreground")
- (background-color . "@selected-normal-background")))
- (inputbar ((spacing . 0)
- (border . "0px")
- (children "prompt" "textbox-prompt-colon" "entry" "case-indicator")))
- (#{button normal}# ((text-color . "@text-color")))
- (text-prompt-color ((expand . #f)
- (str . ":")
- (margin . "0px 0.3em 0em 0em")
- (text-color . "@normal-foreground")))))))
(service home-xmodmap-service-type
(home-xmodmap-configuration
diff --git a/oni/home/rincewind/config.scm b/oni/home/rincewind/config.scm
new file mode 100644
index 0000000..a08caa6
--- /dev/null
+++ b/oni/home/rincewind/config.scm
@@ -0,0 +1,48 @@
+(define-module (oni home data config)
+ #:use-module (gnu home)
+ #:use-module (gnu home services)
+ #:use-module (gnu home services guix)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages music)
+ #:use-module (gnu services)
+ #:use-module (guix packages)
+ #:use-module (guix gexp)
+ #:use-module (guix store)
+ #:use-module (guix derivations)
+ #:use-module (guix channels)
+ #:use-module (oni home services environment)
+ #:use-module (oni home services rofi))
+
+(home-environment
+ (packages (list mpv mpv-mpris easytag))
+
+ (services
+ (list
+ home-environment-service
+ home-rofi-default-service
+
+ ;; (simple-service 'test-config
+ ;; home-xdg-configuration-files-service-type
+ ;; #~(list `("mpv/scripts/mpv-mpris"
+ ;; ;; (run-with-store (open-connection) (package-file
+ ;; ;; mpv-mpris #:output "out"))
+ ;; #$(file-append mpv-mpris "/lib/mpris.so"))))
+ (simple-service 'my-channel-service
+ home-channels-service-type
+ (list
+ (channel
+ (name 'oni)
+ (url "https://git.sr.ht/~ryuslash/guix-packages")
+ (introduction
+ (make-channel-introduction
+ "646573578b7adfbff415645fed201269076cebf6"
+ (openpgp-fingerprint
+ "061C C5C4 D936 C9A8 AECC 1A17 7D5C 407B 4350 25C1"))))
+ (channel
+ (name 'guix-gaming-games)
+ (url "https://gitlab.com/guix-gaming-channels/games.git")
+ (introduction
+ (make-channel-introduction
+ "c23d64f1b8cc086659f8781b27ab6c7314c5cca5"
+ (openpgp-fingerprint
+ "50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F")))))))))
diff --git a/oni/home/services/environment.scm b/oni/home/services/environment.scm
new file mode 100644
index 0000000..4c52c07
--- /dev/null
+++ b/oni/home/services/environment.scm
@@ -0,0 +1,16 @@
+(define-module (oni home services environment)
+ #:use-module (gnu services)
+ #:use-module (gnu home services)
+
+ #:export (home-environment-service))
+
+(define home-environment-service
+ (simple-service 'home-environment-service
+ home-environment-variables-service-type
+ `(("LESS" . "FXRSi")
+ ("MY_GUIX_CONFIGURED" . "1")
+ ("DOTNET_CLI_TELEMETRY_OPTOUT" . "1")
+ ("EDITOR" . "emacsclient")
+ ("CALIBRE_USE_DARK_PALETTE" . "1")
+ ("GUIX_LOCPATH" . "$HOME/.guix-home/profile/lib/locale")
+ ("XDG_DATA_DIRS" . "${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}/usr/local/share:/usr/share"))))
diff --git a/oni/home/services/rofi.scm b/oni/home/services/rofi.scm
index 83a5598..56b08a8 100644
--- a/oni/home/services/rofi.scm
+++ b/oni/home/services/rofi.scm
@@ -17,7 +17,9 @@
#:use-module (ice-9 common-list)
#:export (home-rofi-service-type
- home-rofi-configuration))
+ home-rofi-configuration
+
+ home-rofi-default-service))
;;; This module has been copied from
;;; https://github.com/nouun/jayu/blob/92ff6629da686f0ddc96a4d6cb2a657c76795bc6/jayu/home/services/xdisorg.scm
@@ -169,3 +171,87 @@
`((home-rofi-configuration
,home-rofi-configuration-fields))
'home-rofi-configuration))
+
+(define-public home-rofi-default-service
+ (service home-rofi-service-type
+ (home-rofi-configuration
+ (config
+ '((kb-cancel . "Escape,Control+g")
+ (window-format . "{c} {t}")))
+ (theme
+ '((* ((text-color . "#bfbfbf")
+ (background-color . "#3f4242")
+ (lightbg . "#5b6161")
+ (red . "#a85454")
+ (orange . "#faa41a")
+ (blue . "#1f2c3f")
+
+ (selected-normal-foreground . "@text-color")
+ (normal-foreground . "@text-color")
+ (alternate-normal-background . "@background-color")
+ (selected-urgent-foreground . "@text-color")
+ (urgent-foreground . "@text-color")
+ (alternate-urgent-background . "@background-color")
+ (active-foreground . "@text-color")
+ (selected-active-foreground . "@text-color")
+ (alternate-normal-foreground . "@text-color")
+ (alternate-active-background . "@blue")
+ (bordercolor . "@text-color")
+ (normal-background . "@background-color")
+ (selected-normal-background . "@blue")
+ (separatorcolor . "@orange")
+ (spacing . 2)
+ (urgent-background . "@red")
+ (alternate-urgent-foreground . "@text-color")
+ (selected-urgent-background . "@red")
+ (alternate-active-foreground . "@text-color")
+ (selected-active-background . "@blue")
+ (active-background . "@red")
+
+ (font . "Fantasque Sans Mono 14")))
+ (window ((border . 0)
+ (text-color . "@text-color")
+ (background-color . "rgba(0, 0, 0, 0%)")
+ (padding . 5)
+ (text-color . "@bordercolor")
+ (background-color . "@background-color")))
+ (mainbox ((border . 0)
+ (padding . 0)))
+ (message ((border . "1px dash 0px 0px")
+ (text-color . "@separatorcolor")
+ (padding . "2px 0px 0px")))
+ (textbox ((text-color . "@text-color")))
+ (listview ((fixed-height . 0)
+ (border . "2px 0px 0px")
+ (padding . "2px 0px 0px")
+ (text-color . "@separatorcolor")))
+ (element ((border . 0)
+ (children "element-icon" "element-text")
+ (spacing . "5px")))
+ (element.normal.normal ((text-color . "@normal-foreground")
+ (background-color . "@normal-background")))
+ (element.normal.urgent ((text-color . "@urgent-foreground")
+ (background-color . "@urgent-background")))
+ (element.normal.active ((text-color . "@active-foreground")
+ (background-color . "@active-background")))
+ (element.selected.urgent ((text-color . "@selected-urgent-foreground")
+ (background-color . "@selected-urgent-background")))
+ (element.selected.active ((text-color . "@selected-active-foreground")
+ (background-color . "@selected-active-foreground")))
+ (element.alternate.normal ((text-color . "@alternate-normal-foreground")
+ (background-color . "@alternate-normal-background")))
+ (element.alternate.urgent ((text-color . "@alternate-urgent-foreground")
+ (background-color . "@alternate-urgent-background")))
+ (element.alternate.active ((text-color . "@alternate-active-foreground")
+ (background-color . "@alternate-active-background")))
+ (mode-switcher ((border . "1px dash 0px 0px")))
+ (#{button selected}# ((text-color . "@selected-normal-foreground")
+ (background-color . "@selected-normal-background")))
+ (inputbar ((spacing . 0)
+ (border . "0px")
+ (children "prompt" "textbox-prompt-colon" "entry" "case-indicator")))
+ (#{button normal}# ((text-color . "@text-color")))
+ (text-prompt-color ((expand . #f)
+ (str . ":")
+ (margin . "0px 0.3em 0em 0em")
+ (text-color . "@normal-foreground"))))))))