home-environments: radio: Various changes, forgot about commiting

impermanence
Luis Guilherme Coelho 2024-03-26 17:21:58 -03:00
parent 1a3f8c84a9
commit 682d5e8c81
No known key found for this signature in database
GPG Key ID: 1F2E76ACE3F531C8
2 changed files with 75 additions and 30 deletions

View File

@ -37,7 +37,6 @@
#:use-module (gnu packages suckless) #:use-module (gnu packages suckless)
#|T|# #:use-module (gnu packages telegram) #|T|# #:use-module (gnu packages telegram)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages text-editors)
#:use-module (gnu packages tor-browsers) #:use-module (gnu packages tor-browsers)
#:use-module (gnu packages toys) #:use-module (gnu packages toys)
#|V|# #:use-module (gnu packages version-control) #|V|# #:use-module (gnu packages version-control)
@ -69,7 +68,9 @@
#|Radix packages|# #|Radix packages|#
#|D|# #:use-module (radix packages disk) #|D|# #:use-module (radix packages disk)
#|I|# #:use-module (radix packages image-viewers) #|I|# #:use-module (radix packages image-viewers)
#|F|# #:use-module (radix packages fonts) #|F|# #:use-module (radix packages freedesktop)
#:use-module (radix packages fonts)
#|P|# #:use-module (radix packages pdf)
#|S|# #:use-module (radix packages seninha) #|S|# #:use-module (radix packages seninha)
#:use-module (radix packages syndication) #:use-module (radix packages syndication)
#|T|# #:use-module (radix packages toys) #|T|# #:use-module (radix packages toys)
@ -80,7 +81,23 @@
#|G|# #:use-module (radix home services gnupg) #|G|# #:use-module (radix home services gnupg)
#|S|# #:use-module (radix home services shells) #|S|# #:use-module (radix home services shells)
#:export (home-environment)) #:export (home-environment
browser
editor
pager
reader
shell
terminal
wm))
#|Default applications|#
(define browser "mullvadbrowser")
(define editor "kak")
(define pager "less")
(define reader "sioyek")
(define shell "fish")
(define terminal "foot")
(define wm "river")
(define home-environment (define home-environment
(user-home-environment (user-home-environment
@ -97,6 +114,7 @@
font-juliamono font-liberation font-meslo-lg-dz font-juliamono font-liberation font-meslo-lg-dz
font-misc-misc font-un font-wqy-zenhei font-misc-misc font-un font-wqy-zenhei
#|freedesktop |# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr #|freedesktop |# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr
xdg-terminal-exec
#|games |# minetest supertuxkart xonotic #|games |# minetest supertuxkart xonotic
#|gnome |# adwaita-icon-theme #|gnome |# adwaita-icon-theme
#|gnu-doc |# gnu-standards #|gnu-doc |# gnu-standards
@ -107,7 +125,7 @@
#|linux |# wireplumber #|linux |# wireplumber
#|math |# libqalculate #|math |# libqalculate
#|password-utils|# keepassxc #|password-utils|# keepassxc
#|pdf |# poppler sioyek #|pdf |# poppler sioyek/wayland
#|pulseaudio |# pamixer pavucontrol #|pulseaudio |# pamixer pavucontrol
#|scheme |# sicp #|scheme |# sicp
#|seninha |# fmutils #|seninha |# fmutils
@ -119,7 +137,7 @@
#|toys |# wayneko #|toys |# wayneko
#|vesion-control|# git #|vesion-control|# git
#|video |# ffmpeg ffmpegthumbnailer mpv yt-dlp #|video |# ffmpeg ffmpegthumbnailer mpv yt-dlp
#|wm |# fnott rivercarro swww waybar #|wm |# fnott rivercarro riverguile river-bnf swww waybar
#|xdisorg |# fuzzel wl-clipboard wlsunset #|xdisorg |# fuzzel wl-clipboard wlsunset
#|zig-xyz |# river)) #|zig-xyz |# river))
@ -138,6 +156,15 @@
(service home-xdg-mime-applications-service-type (service home-xdg-mime-applications-service-type
(home-xdg-mime-applications-configuration (home-xdg-mime-applications-configuration
(desktop-entries
(list (xdg-desktop-entry
(name "foot")
(file "org.codeberg.dnkl.foot.desktop")
(type 'application)
(config `((exec . "foot")
(terminal . "true")
(exec-arg . "")
(startup-wm-class . "foot"))))))
(default (associate-right (default (associate-right
('mullvadbrowser.desktop ('mullvadbrowser.desktop
`("text/html" `("text/html"
@ -290,7 +317,7 @@
#|Code areas|# #|Code areas|#
((symbol-prefix-proc '~/areas/code/scm/) ((symbol-prefix-proc '~/areas/code/scm/)
'(guix radix zero)) '(guix misako radix riverguile saayix zero))
#|Radix|# #|Radix|#
((partial @radix '/radix/) ((partial @radix '/radix/)
@ -312,20 +339,35 @@
(a . "aria2c -j 10 '%'") (a . "aria2c -j 10 '%'")
(i . "ipfs get %") (i . "ipfs get %")
(m . "yt-dlp --prefer-free-formats -x '%'") (m . "yt-dlp --prefer-free-formats -x '%'")
(v . "yt-dlp --prefer-free-formats '%'") (u . "curl -F file=@% https://0x0.st | wl-copy")
(z . "curl -F file=@% https://0x0.st | xsel -b"))) (v . "yt-dlp --prefer-free-formats '%'")))
#|Shell history|#
,@(list (abbreviation
(name "!!")
(pattern "[^\\']*!!.*")
(position 'anywhere)
(expansion
(fish-function "bang-bang")))
(abbreviation
(name "!$")
(pattern "[^\\']*!\\$.*")
(position 'anywhere)
(expansion
(fish-function "bang-dollar")))
(abbreviation
(name "!*")
(pattern "[^\\']*!\\*.*")
(position 'anywhere)
(expansion
(fish-function "bang-star"))))
,@(map (match-lambda ,@(map (match-lambda
((x . y) (abbreviation ((x . y) (abbreviation
(name x) (name x)
(position 'anywhere) (position 'anywhere)
(expansion y)))) (expansion y))))
`(#|Shell history|# `(#|Guix|#
(!! . ,(fish-function "bang-bang"))
(!$ . ,(fish-function "bang-dollar"))
(!* . ,(fish-function "bang-star"))
#|Guix|#
(!dgen . "guix % delete-generations 2w") (!dgen . "guix % delete-generations 2w")
(!repair . "doas guix build --repair") (!repair . "doas guix build --repair")
(!pull . "guix pull") (!pull . "guix pull")
@ -342,13 +384,13 @@
(:todo . ,(edit "~/areas/meta/todo"))))))))) (:todo . ,(edit "~/areas/meta/todo")))))))))
#|Environment variables services|# #|Environment variables services|#
(simple-service 'shell-environment-variables (simple-service 'home-shell-environment-variables
home-environment-variables-service-type home-environment-variables-service-type
`(("PATH" . "$HOME/.local/bin:$PATH") `(("PATH" . "$HOME/.local/bin:$PATH")
("ENV" . "$XDG_CONFIG_HOME/dash/init.sh") ("ENV" . "$XDG_CONFIG_HOME/dash/init.sh")
("INPUTRC" . "$XDG_CONFIG_HOME/readline/inputrc") ("INPUTRC" . "$XDG_CONFIG_HOME/readline/inputrc")
("XINITRC" . "$XDG_CONFIG_HOME/x11/xinitrc"))) ("XINITRC" . "$XDG_CONFIG_HOME/x11/xinitrc")))
(simple-service 'guile-environment-variables (simple-service 'home-guile-environment-variables
home-environment-variables-service-type home-environment-variables-service-type
`(("GUILE_WARN_DEPRECATED" . "detailed") `(("GUILE_WARN_DEPRECATED" . "detailed")
("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history") ("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history")
@ -363,22 +405,25 @@
'($HOME/.guix-home/profile '($HOME/.guix-home/profile
$XDG_CONFIG_HOME/guix/current $XDG_CONFIG_HOME/guix/current
/run/current-system/profile))))) /run/current-system/profile)))))
(simple-service 'language-environment-variables (simple-service 'home-wayland-environment-variables
home-environment-variables-service-type
`(("QT_QPA_PLATFORM" . "wayland;xcb")
("QT_WAYLAND_DISABLE_WINDOWDECORATION" . "1")))
(simple-service 'home-language-environment-variables
home-environment-variables-service-type home-environment-variables-service-type
`(("LANG" . "en_US.UTF-8") `(("LANG" . "en_US.UTF-8")
("LANGUAGE" . "en_US.UTF-8") ("LANGUAGE" . "en_US.UTF-8")
("LC_COLLATE" . "C"))) ("LC_COLLATE" . "C")))
(simple-service 'defaut-applications-environment-variables (simple-service 'home-default-applications-environment-variables
home-environment-variables-service-type home-environment-variables-service-type
`(("BROWSER" . "mullvadbrowser") `(("BROWSER" . ,browser)
("EDITOR" . "kak") ("EDITOR" . ,editor)
("FCEDIT" . "kak") ("PAGER" . ,pager)
("PAGER" . "less") ("READER" . ,reader)
("READER" . "sioyek") ("SHELL" . ,shell)
("SHELL" . "fish") ("TERMINAL" . ,terminal)
("TERMINAL" . "foot") ("VISUAL" . ,editor)
("VISUAL" . "kak") ("WM" . ,wm)))
("WM" . "awesome")))
#|SSH service|# #|SSH service|#
(service home-openssh-service-type (service home-openssh-service-type

View File

@ -5,7 +5,7 @@ function xdg-user-directory
end end
function bang-bang function bang-bang
echo "$history[1]" string replace '!!' "$history[1]" $argv[1]
end end
function bang-bang-k function bang-bang-k
@ -16,10 +16,10 @@ end
function bang-dollar function bang-dollar
set -l arr (string replace -ra '([^\\\ ])( |\n)+' '$1\n' $history[1]) set -l arr (string replace -ra '([^\\\ ])( |\n)+' '$1\n' $history[1])
echo $arr[-1] string replace '!$' "$arr[-1]" $argv[1]
end end
function bang-star function bang-star
set -l arr (string replace -ra '([^\\\ ])( |\n)+' '$1\n' $history[1]) set -l arr (string replace -ra '([^\\\ ])( |\n)+' '$1\n' $history[1])
echo $arr[..-2] string replace '!*' "$arr[..-2]" $argv[1]
end end