diff options
Diffstat (limited to 'oni/home/config/data.scm')
| -rw-r--r-- | oni/home/config/data.scm | 281 |
1 files changed, 137 insertions, 144 deletions
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm index 8577a4f..860d4c5 100644 --- a/oni/home/config/data.scm +++ b/oni/home/config/data.scm @@ -52,7 +52,6 @@ #:use-module ((oni home services xdisorg) #:select (home-xss-lock-service-type)) #:use-module (oni home services xsession) - #:use-module (oni home services zsh) #:use-module ((oni packages emacs) #:select (emacs-outli emacs-syncthing-status)) @@ -99,8 +98,7 @@ ;; #:use-module (oni packages hlwm-run-or-raise) #:use-module (oni packages pick-random-wallpaper) #:use-module (oni packages sawfish) - #: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 @@ -171,155 +169,150 @@ gforth))) (services - (list - home-channels-service - home-environment-service - home-rofi-default-service - home-dunst-default-service - home-redshift-service - ;; home-xbindkeys-service - home-zsh-service - home-guile-service - home-xmodmap-service - home-openssh-service - home-kitty-service - data-picom-service + (append + home-zsh-services + (list + home-channels-service + home-environment-service + home-rofi-default-service + home-dunst-default-service + home-redshift-service + ;; home-xbindkeys-service + home-guile-service + home-xmodmap-service + home-openssh-service + home-kitty-service + data-picom-service - ;; This has to be the first extension because it needs to be added to the - ;; 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 + (configuration + (list + (mixed-text-file + "xsession" + "xrdb -cpp m4 -merge \"${HOME}/.config/X11/Xresources\" -I\"${HOME}/.config/X11/Xresources.d\"\n" + "xrandr --setprovideroutputsource modesetting NVIDIA-0\n" + "xrandr --auto\n" + "xrandr --dpi 96\n"))))) - (service home-xsession-service-type - (home-xsession-configuration - (configuration - (list - (mixed-text-file - "xsession" - "xrdb -cpp m4 -merge \"${HOME}/.config/X11/Xresources\" -I\"${HOME}/.config/X11/Xresources.d\"\n" - "xrandr --setprovideroutputsource modesetting NVIDIA-0\n" - "xrandr --auto\n" - "xrandr --dpi 96\n"))))) + ;; (service home-herbstluftwm-service-type + ;; (home-herbstluftwm-configuration + ;; (tags '(dev web game)) + ;; (key-bindings + ;; '(("s-S-q" . "quit") + ;; ("s-S-e" . "reload"))) + ;; (mouse-bindings + ;; '(("s-Button1" . "move") + ;; ("s-Button2" . "zoom") + ;; ("s-Button3" . "resize"))) + ;; (settings + ;; '((default_frame_layout . 2) + ;; (frame_border_active_color . "#3d3d3d") + ;; (frame_border_normal_color . "#222222") + ;; (frame_bg_normal_color . "#111111") + ;; (frame_bg_active_color . "#263f1f") + ;; (frame_border_width . 0) + ;; (window_border_width . 2) + ;; (window_border_inner_width . 0) + ;; (window_border_normal_color . "#222222") + ;; (window_border_active_color . "#1f3f3f") + ;; (window_border_inner_color . "#111111") + ;; (always_show_frame . 0) + ;; (frame_gap . 30) + ;; (window_gap . 30) + ;; (frame_padding . -30) + ;; (frame_bg_transparent . 1) + ;; (smart_window_surroundings . 0) + ;; (smart_frame_surroundings . 0) + ;; (mouse_recenter_gap . 0) + ;; (swap_monitors_to_get_tag . 0) + ;; (update_dragged_clients . 1) + ;; (tree_style . "╾│ ├└╼─┐"))) + ;; (attributes + ;; '(((theme tiling reset) . 1) + ;; ((theme floating reset) . 1))) + ;; (rules + ;; '(("focus=on") + ;; ("class=Emacs" "tag=dev" "index=01" "switchtag=on" "hook=emacs") + ;; ("class~'URxvt|kitty'" "tag=dev" "index=1" "switchtag=on" "hook=urxvt") + ;; ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web" "index=0" "switchtag=on") + ;; ("class=Pinentry" "pseudotile=on") + ;; ("class=Alsaplayer" "pseudotile=on") + ;; ("class=Gcr-prompter" "pseudotile=on") + ;; ("class=Steam" "title='Steam Login'" "pseudotile=on") + ;; ("class=Steam" "title~'Steam - News .*'" "pseudotile=on") + ;; ("class=" "title=Steam" "pseudotile=on") + ;; ("class=xfreerdp" "floating=on" "tag=work" "index=0" "switchtag=on") + ;; ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'" "pseudotile=on") + ;; ("windowtype='_NET_WM_WINDOW_TYPE_DIALOG'" "focus=on") + ;; ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'" "manage=off") + ;; ("class=pinball.exe" "pseudotile=on"))) + ;; (padding '(0 0 0 16 16)) + ;; (layouts + ;; '((web clients max:0) + ;; (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"))))) - ;; (service home-herbstluftwm-service-type - ;; (home-herbstluftwm-configuration - ;; (tags '(dev web game)) - ;; (key-bindings - ;; '(("s-S-q" . "quit") - ;; ("s-S-e" . "reload"))) - ;; (mouse-bindings - ;; '(("s-Button1" . "move") - ;; ("s-Button2" . "zoom") - ;; ("s-Button3" . "resize"))) - ;; (settings - ;; '((default_frame_layout . 2) - ;; (frame_border_active_color . "#3d3d3d") - ;; (frame_border_normal_color . "#222222") - ;; (frame_bg_normal_color . "#111111") - ;; (frame_bg_active_color . "#263f1f") - ;; (frame_border_width . 0) - ;; (window_border_width . 2) - ;; (window_border_inner_width . 0) - ;; (window_border_normal_color . "#222222") - ;; (window_border_active_color . "#1f3f3f") - ;; (window_border_inner_color . "#111111") - ;; (always_show_frame . 0) - ;; (frame_gap . 30) - ;; (window_gap . 30) - ;; (frame_padding . -30) - ;; (frame_bg_transparent . 1) - ;; (smart_window_surroundings . 0) - ;; (smart_frame_surroundings . 0) - ;; (mouse_recenter_gap . 0) - ;; (swap_monitors_to_get_tag . 0) - ;; (update_dragged_clients . 1) - ;; (tree_style . "╾│ ├└╼─┐"))) - ;; (attributes - ;; '(((theme tiling reset) . 1) - ;; ((theme floating reset) . 1))) - ;; (rules - ;; '(("focus=on") - ;; ("class=Emacs" "tag=dev" "index=01" "switchtag=on" "hook=emacs") - ;; ("class~'URxvt|kitty'" "tag=dev" "index=1" "switchtag=on" "hook=urxvt") - ;; ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web" "index=0" "switchtag=on") - ;; ("class=Pinentry" "pseudotile=on") - ;; ("class=Alsaplayer" "pseudotile=on") - ;; ("class=Gcr-prompter" "pseudotile=on") - ;; ("class=Steam" "title='Steam Login'" "pseudotile=on") - ;; ("class=Steam" "title~'Steam - News .*'" "pseudotile=on") - ;; ("class=" "title=Steam" "pseudotile=on") - ;; ("class=xfreerdp" "floating=on" "tag=work" "index=0" "switchtag=on") - ;; ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'" "pseudotile=on") - ;; ("windowtype='_NET_WM_WINDOW_TYPE_DIALOG'" "focus=on") - ;; ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'" "manage=off") - ;; ("class=pinball.exe" "pseudotile=on"))) - ;; (padding '(0 0 0 16 16)) - ;; (layouts - ;; '((web clients max:0) - ;; (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"))))) + (service home-sawfish-service-type) - (service home-sawfish-service-type) + (service home-polybar-service-type + (home-polybar-configuration + (bar "data"))) - (service home-polybar-service-type - (home-polybar-configuration - (bar "data"))) + (service home-kdeconnect-service-type) - (service home-kdeconnect-service-type) + (service home-cmst-service-type) - (service home-cmst-service-type) + (service home-syncthing-service-type) - (service home-syncthing-service-type) + (service home-unclutter-service-type + (home-unclutter-configuration + (package unclutter-xfixes) + (exclude-root #t))) - (service home-unclutter-service-type - (home-unclutter-configuration - (package unclutter-xfixes) - (exclude-root #t))) + (service home-emacs-service-type + (home-emacs-configuration + (helpful-configuration + (home-emacs-helpful-configuration + (configurations + (list + (local-file "../services/emacs/oni-helpful.el"))))) + (yasnippet-capf + (home-emacs-yasnippet-capf-configuration)) + (envrc + (home-emacs-envrc-configuration)) + (configurations + (list + (local-file "../services/emacs/init.el") + (mixed-text-file + "init.el" + "(with-eval-after-load 'project (require 'oni-project))\n" + "(projectile-mode)\n" + "(setq custom-file \"~/.config/emacs/custom.el\")\n" + "(load custom-file)\n" + "(provide 'init)\n" + ";;; init.el ends here\n"))))) + (service home-emacs-eros-service-type) + (service home-emacs-ace-link-service-type + (home-emacs-ace-link-configuration + (default-key "C-S-e") + (goto-address-key "C-S-e") + (org-mode-key "C-S-e"))) + (service home-emacs-golden-ratio-service-type) + (service home-emacs-pinentry-service-type) + (service home-emacs-org-caldav-service-type) - (service home-emacs-service-type - (home-emacs-configuration - (helpful-configuration - (home-emacs-helpful-configuration - (configurations - (list - (local-file "../services/emacs/oni-helpful.el"))))) - (yasnippet-capf - (home-emacs-yasnippet-capf-configuration)) - (envrc - (home-emacs-envrc-configuration)) - (configurations - (list - (local-file "../services/emacs/init.el") - (mixed-text-file - "init.el" - "(with-eval-after-load 'project (require 'oni-project))\n" - "(projectile-mode)\n" - "(setq custom-file \"~/.config/emacs/custom.el\")\n" - "(load custom-file)\n" - "(provide 'init)\n" - ";;; init.el ends here\n"))))) - (service home-emacs-eros-service-type) - (service home-emacs-ace-link-service-type - (home-emacs-ace-link-configuration - (default-key "C-S-e") - (goto-address-key "C-S-e") - (org-mode-key "C-S-e"))) - (service home-emacs-golden-ratio-service-type) - (service home-emacs-pinentry-service-type) - (service home-emacs-org-caldav-service-type) + (service home-xss-lock-service-type) + (service home-cbatticon-service-type) - (service home-xss-lock-service-type) - (service home-cbatticon-service-type) - - (service home-mbsync-service-type)))) + (service home-mbsync-service-type))))) |