diff options
Diffstat (limited to 'oni/home/data/config.scm')
| -rw-r--r-- | oni/home/data/config.scm | 247 |
1 files changed, 12 insertions, 235 deletions
diff --git a/oni/home/data/config.scm b/oni/home/data/config.scm index a4cc54d..74a33cf 100644 --- a/oni/home/data/config.scm +++ b/oni/home/data/config.scm @@ -1,9 +1,7 @@ (define-module (oni home data config) #:use-module (gnu home) #:use-module (gnu home services) - #:use-module (gnu home services shells) #:use-module (gnu home services desktop) - #:use-module (gnu home services ssh) #:use-module (gnu services) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -12,10 +10,7 @@ #:use-module (gnu packages xdisorg) #:use-module (guix gexp) #:use-module (oni home services rofi) - #:use-module (oni home services xmodmap) - #:use-module (oni home services kitty) #:use-module (oni home services xsession) - #:use-module (oni home services compton) #:use-module (oni home services xbindkeys) #:use-module (oni home services zsh) #:use-module (oni home services herbstluftwm) @@ -25,10 +20,10 @@ #:use-module (oni home services syncthing) #: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)) + #:use-module (oni packages pick-random-wallpaper) + #:use-moudle (oni home common config)) (home-environment (packages (list (specification->package+output "glibc-locales") @@ -41,107 +36,21 @@ (list home-environment-service home-rofi-default-service - - (service home-redshift-service-type - (home-redshift-configuration - (location-provider 'manual) - (latitude 49.2127205) - (longitude 122.9267927))) - - (service home-zsh-service-type - (home-zsh-configuration - (environment-variables - '(("HISTFILE" . "$HOME/.zsh/histfile") - ("HISTSIZE" . "1000") - ("SAVEHIST" . "1000"))) - (zshrc - (list - (mixed-text-file - "zshrc" - "fpath=($HOME/.zsh/functions $fpath)\n" - "autoload -U $HOME/.zsh/functions/*(:t)\n" - "alias csi=\"rlwrap csi\"\n" - "alias scsh=\"rlwrap scsh\"\n" - "alias sbcl=\"rlwrap sbcl\"\n" - "alias hc=herbstclient\n" - "setopt SHARE_HISTORY\n" - "setopt HIST_IGNORE_ALL_DUPS\n" - "setopt PROMPT_SUBST\n" - "zle -N x-copy-region-as-kill\n" - "zle -N x-kill-region\n" - "zle -N x-yank\n" - "bindkey -e '^[w' x-copy-region-as-kill\n" - "bindkey -e '^W' x-kill-region\n" - "bindkey -e '^Y' x-yank\n" - "autoload -Uz compinit\n" - "compinit\n" - "PROMPT=\"%T \\$(spwd) %B%(?.%F{2}.%F{1}[%?])>%b%f \""))))) + 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 + home-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-xmodmap-service-type - (home-xmodmap-configuration - (pointer '(3 2 1)) - (extra '("remove Mod5 = ISO_Level3_Shift" - "keycode 108 = Alt_L" - "add Mod1 = Alt_L")))) - - (service home-kitty-service-type - (home-kitty-configuration - (configuration - '((font-family . "Fantasque Sans Mono") - (bold-font . "Fantasque Sans Mono Bold") - (italic-font . "Fantasque Sans Mono Italic") - (bold-italic-font . "Fantasque Sans Mono Bold Italic") - (font-size . 14) - (symbol-map . "U+f002 Font Awesome 5 Free Solid") - (cursor-shape . beam) - (cursor-blink-interval . 0) - (url-style . single) - (open-url-with . firefox) - (copy-on-select . #f) - (enable-audio-bell . #f) - (visual-bell-duration . 0) - (window-padding-width . 11.25) - (active-tab-font-style . normal) - (editor . emacsclient) - (allow-remote-control . #t) - (enabled-layouts vertical stack tall fat grid horizontal) - (cursor . "#969696") - (url-color . "#a88654") - (active-border-color . "#1f2c3f") - (inactive-border-color . "#3d3d3d") - (bell-border-color . "#3f1a1a") - (active-tab-foreground . "#65a854") - (active-tab-background . "#1f2c3f") - (inactive-tab-foreground . "#65a854") - (inactive-tab-background . "#3d3d3d") - (foreground . "#bfbfbf") - (background . "#222424") - (selection-foreground . "#222424") - (selection-background . "#7126a3f0f01f") - (color0 . "#222222") - (color8 . "#3d3d3d") - (color1 . "#ca3c828e828e") - (color9 . "#f01f71267126") - (color2 . "#90e4ca3c828e") - (color10 . "#8a8bf01f7126") - (color3 . "#bbe6ca3c828e") - (color11 . "#d6baf01f7126") - (color4 . "#828e9f3aca3c") - (color12 . "#7126a3f0f01f") - (color5 . "#bbe6828eca3c") - (color13 . "#d6ba7126f01f") - (color6 . "#828eca3cca3c") - (color14 . "#7126f01ff01f") - (color7 . "#969696") - (color15 . "#ededed"))))) - (service home-xsession-service-type (home-xsession-configuration (configuration @@ -153,66 +62,6 @@ "xrandr --auto\n" "xrandr --dpi 96\n"))))) - (service home-picom-service-type - (home-picom-configuration - (config - '((detect-transient . #t) - (shadow . #t) - (wintypes ((dnd ((shadow . #f))) - (dock ((shadow . #f))))) - (shadow-radius . 10) - (shadow-exclude ("name = 'mowedline'" - "class_g = 'trayer'" - "bounding_shaped")))))) - - (service home-xbindkeys-service-type - (home-xbindkeys-configuration - (keybindings - '(((mod4 k) . "hersbtclient close") - ((mod4 mod1 k) . "herbstclient remove") - ((mod4 Return) . "herbstclient spawn kitty") - ((mod4 t) . "herbstclient spawn hlwm-run-or-raise \"\\(URxct\\|Hyper\\|kitty\\)\" kitty") - ((mod4 b) . "herbstclient spawn hlwm-run-or-raise \"\\(Conkeror\\|[Ff]irefox\\|Chromium\\|Next\\|qutebrowser\\)\" firefox") - ((mod4 e) . "herbstclient spawn hlwm-run-or-raise Emacs emacsclient --create-frame") - ((control mod1 l) . "herbstclient spawn i3lock --color=000000") - ((mod4 x) . "herbstclient spawn hlwm-switch-tags") - ((mod4 shift b) . "herbstclient shift left") - ((mod4 shift n) . "herbstclient shift down") - ((mod4 shift p) . "herbstclient shift up") - ((mod4 shift f) . "herbstclient shift right") - ((mod4 control b) . "herbstclient resize left +0.05") - ((mod4 control n) . "herbstclient resize down +0.05") - ((mod4 control p) . "herbstclient resize up +0.05") - ((mod4 control f) . "herbstclient resize right +0.05") - ((mod4 shift underscore) . "herbstclient split bottom 0.5") - ((mod4 shift bar) . "herbstclient split right 0.5") - ((mod4 period) . "herbstclient use_index +1 --skip-visible") - ((mod4 comma) . "herbstclient use_index -1 --skip-visible") - ((mod4 shift control f) . "herbstclient floating toggle") - ((mod4 f) . "herbstclient cycle_layout 1 vertical max") - ((mod4 m) . "herbstclient fullscreen toggle") - ((mod4 p) . "herbstclient pseudotile toggle") - ((mod4 space) . "herbstclient or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1") - ((mod4 BackSpace) . "herbstclient cycle_monitor") - ((mod4 u) . "herbstclient jumpto urgent") - ((XF86AudioPlay) . "herbstclient spawn mpc toggle") - ((XF86AudioNext) . "herbstclient spawn mpc next") - ((XF86AudioPrev) . "herbstclient spawn mpc prev") - ((mod4 c) - ("1" . "herbstclient move_index 0") - ("2" . "herbstclient move_index 1") - ("3" . "herbstclient move_index 2") - ("4" . "herbstclient move_index 3") - ("5" . "herbstclient move_index 4") - ("6" . "herbstclient move_index 5") - ("7" . "herbstclient move_index 6") - ("8" . "herbstclient move_index 7") - ("9" . "herbstclient move_index 8") - ("0" . "herbstclient move_index 9")) - ((mod4 s) - ("f" . "flameshot full ~/pictures/screenshots/") - ("c" . "flameshot gui")))))) - (service home-herbstluftwm-service-type (home-herbstluftwm-configuration (tags '(dev web game)) @@ -292,76 +141,4 @@ (service home-unclutter-service-type (home-unclutter-configuration (package unclutter-xfixes) - (exclude-root #t))) - - (service home-openssh-service-type - (home-openssh-configuration - (hosts (list (openssh-host - (name "ryuslash") - (host-name "ryuslash.org") - (user "slash") - (port 4511) - (extra-content "LocalForward 8090 localhost:8090 -LocalForward 2812 localhost:2812")) - (openssh-host - (name "rincewind") - (host-name "192.168.1.135") - (port 4511)))))) - - (service home-dunst-service-type - (home-dunst-configuration - (font "Fantasque Sans Mono 15") - (markup 'full) - (format "<u>%s</u>\\n\\n%b") - (width '(0 600)) - (idle-threshold 120) - (padding 15) - (horizontal-padding 15) - (separator-color 'auto) - (dmenu "rofi -dmenu -p dunst:") - (browser "firefox") - (icon-path '("/usr/share/icons/gnome/24x24/status/" - "/usr/share/icons/gnome/24x24/devices/" - "/usr/share/icons/hicolor/24x24/apps/")) - (frame-width 2) - (frame-color "#3d3d3d") - (max-icon-size 24) - (corner-radius 10) - (rules - '(("urgency_low" - (background "#405c2e") - (foreground "#eeeeec") - (timeout 10)) - ("urgency_normal" - (background "#222224") - (foreground "#eeeeec") - (timeout 10)) - ("urgency_critical" - (background "#973732") - (foreground "#eeeeec") - (timeout 0)) - ("Emacs" - (appname "Emacs") - (background "#7f5ab6") - (foreground "#fafafa")) - ("Metal Express Radio" - (appname "Metal Express Radio") - (background "#ef4136") - (foreground "#ffffff")) - ("Syncthing" - (appname "Syncthing GTK") - (background "#337ab7") - (foreground "#ffffff")) - ("Lollypop" - (appname "Lollypop") - (background "#fd3e75") - (foreground "#ffffff")) - ("gPodder" - (appname "gPodder") - (background "#7f5785") - (foreground "#ffffff")))))) - - (service home-guile-service-type - (home-guile-configuration - (use-readline #t) - (use-colorized #t)))))) + (exclude-root #t)))))) |