diff options
Diffstat (limited to 'tw/home')
| -rw-r--r-- | tw/home/btl.scm | 3 | ||||
| -rw-r--r-- | tw/home/cern.scm | 33 | ||||
| -rw-r--r-- | tw/home/files/zshrc | 24 | ||||
| -rw-r--r-- | tw/home/frm.scm | 3 | ||||
| -rw-r--r-- | tw/home/lap.scm | 3 |
5 files changed, 30 insertions, 36 deletions
diff --git a/tw/home/btl.scm b/tw/home/btl.scm index 200153ea..3c370eef 100644 --- a/tw/home/btl.scm +++ b/tw/home/btl.scm @@ -12,7 +12,6 @@ #:use-module (gnu home services pm) #:use-module (gnu home services ssh) #:use-module (gnu packages finance) - #:use-module (gnu packages networking) #:use-module (gnu services) #:use-module (guix gexp) #:use-module (tw home) @@ -27,7 +26,7 @@ (packages ;; These packages will show up in the home profile, under ~/.guix-home/profile. ;; Graphical applications - (list blueman electrum)) + (list electrum)) ;; To search for available home services, run 'guix home search KEYWORD'. (services diff --git a/tw/home/cern.scm b/tw/home/cern.scm index d86ef727..9b79c3b1 100644 --- a/tw/home/cern.scm +++ b/tw/home/cern.scm @@ -11,17 +11,10 @@ #:use-module (gnu home services guix) #:use-module (gnu home services pm) #:use-module (gnu home services ssh) - #:use-module (gnu packages) - #:use-module (gnu packages calendar) - #:use-module (gnu packages dav) - #:use-module (gnu packages mail) - #:use-module (gnu packages networking) - #:use-module (gnu packages web-browsers) #:use-module (gnu services) #:use-module (guix gexp) #:use-module (tw home) #:use-module (tw gexp) - #:use-module ((tw packages mail) #:select (mutt_oauth2.py)) #:use-module (tw services desktop) #:use-module (tw services dev-env) #:use-module (tw services git) @@ -29,39 +22,19 @@ (define-public %cern-home (home-environment - ;; These packages will show up in the home profile, under ~/.guix-home/profile. - (packages (list blueman)) ;; To search for available home services, run 'guix home search KEYWORD'. (services (list (simple-service 'remote-desktop-config home-files-service-type `((".local/share/vinagre/vinagre-bookmarks.xml" ,(local-file "files/vinagre-bookmarks.xml")))) - ;; Redshift: make the screen turn redder at night. - (service home-redshift-service-type - (home-redshift-configuration - (location-provider 'manual) - ;; Approximate location - (latitude 46.0) - (longitude 6.0) - ;; (location-provider 'geoclue2) ; TODO: currently waits forever for a location -- not sure why geoclue doesn't work - (daytime-brightness 1.0) - (nighttime-brightness 0.7) - (extra-content "fade=0"))) ; with fade=1, restarting redshift causes flickering for a few secs - (service home-dbus-service-type) (service tw-home-service-type) - (service home-desktop-service-type - (home-desktop-configuration - (battery-name "BAT0") - (ac-adapter-name "AC") - (thermal-zone "0") - (monitors - (list (home-monitor-configuration - (name "eDP-1") - (xrandr-options '("--primary" "--auto"))))))) + (service home-wayland-desktop-service-type + (home-wayland-desktop-configuration + (num-cores 12))) (service home-full-dev-env-service-type) diff --git a/tw/home/files/zshrc b/tw/home/files/zshrc index ca4481e2..8a658173 100644 --- a/tw/home/files/zshrc +++ b/tw/home/files/zshrc @@ -189,3 +189,27 @@ fi load_plugin fast-syntax-highlighting || load_plugin zsh-syntax-highlighting + +## Terminal integration with foot +# https://codeberg.org/dnkl/foot/wiki#shell-integration +if [ "$TERM" = foot ]; then + function foot-osc7-pwd () { + (( ZSH_SUBSHELL )) && return 0 + emulate -L zsh # also sets localoptions for us + setopt extendedglob + local LC_ALL=C + printf '\e]7;file://%s%s\e\' "$HOST" "${PWD//(#m)([^@-Za-z&-;_~])/%${(l:2::0:)$(([##16]#MATCH))}}" + } + function foot-precmd () { + print -Pn '\e]133;A\e\' + if ! builtin zle; then + print -n '\e]133;D\e\' + fi + } + function foot-preexec () { + print -n '\e]133;C\e\' + } + add-zsh-hook -Uz chpwd foot-osc7-pwd + add-zsh-hook -Uz precmd foot-precmd + add-zsh-hook -Uz preexec foot-preexec +fi diff --git a/tw/home/frm.scm b/tw/home/frm.scm index 2a0e5481..27b0ccbb 100644 --- a/tw/home/frm.scm +++ b/tw/home/frm.scm @@ -12,7 +12,6 @@ #:use-module (gnu home services pm) #:use-module (gnu home services ssh) #:use-module (gnu packages finance) - #:use-module (gnu packages networking) #:use-module (gnu services) #:use-module (guix gexp) #:use-module (tw home) @@ -27,7 +26,7 @@ (packages ;; These packages will show up in the home profile, under ~/.guix-home/profile. ;; Graphical applications - (list blueman electrum)) + (list electrum)) ;; To search for available home services, run 'guix home search KEYWORD'. (services diff --git a/tw/home/lap.scm b/tw/home/lap.scm index e0ee5980..1ece6f19 100644 --- a/tw/home/lap.scm +++ b/tw/home/lap.scm @@ -12,7 +12,6 @@ #:use-module (gnu home services pm) #:use-module (gnu home services ssh) #:use-module (gnu packages finance) - #:use-module (gnu packages networking) #:use-module (gnu services) #:use-module (guix gexp) #:use-module (tw home) @@ -27,7 +26,7 @@ (packages ;; These packages will show up in the home profile, under ~/.guix-home/profile. ;; Graphical applications - (list blueman electrum)) + (list electrum)) ;; To search for available home services, run 'guix home search KEYWORD'. (services |