diff options
Diffstat (limited to 'tw/home.scm')
| -rw-r--r-- | tw/home.scm | 54 |
1 files changed, 15 insertions, 39 deletions
diff --git a/tw/home.scm b/tw/home.scm index 12a4d226..a0fa14df 100644 --- a/tw/home.scm +++ b/tw/home.scm @@ -91,12 +91,17 @@ auto-expand-secmem ,@(map make-own-ssh-host (map (compose wireguardify car) %ssh-ports) (map cdr %ssh-ports)) ,(openssh-host (name "*.fritz.box") (proxy-command "ssh -W '[%h]:%p' lud.twilken.net")) ;; Git hosts - ,@(map (lambda (host) (openssh-host (name host) (user "git"))) - '("github.com" "ssh.github.com" "bitbucket.org")) - ,(openssh-host (name "gitlab.cern.ch") (port 7999) (user "git") (proxy-command "none")) + ,(openssh-host (name "github.com") (user "git")) + ,(openssh-host (name "ssh.github.com") (user "git")) + ,(openssh-host + (name "gitlab.cern.ch") + (user "git") + (port 7999) + (proxy-command "none")) ;; BitBucket apparently only supports ssh-rsa. ,(openssh-host (name "bitbucket.org") + (user "git") (host-key-algorithms '("+ssh-rsa")) (accepted-key-types '("+ssh-rsa"))) ;; CERN stuff @@ -107,16 +112,12 @@ auto-expand-secmem (name "lxplus.cern.ch") (proxy-command "none") ; no jump needed (extra-content "GSSAPIDelegateCredentials yes")) ; needed for EOS home mount - ,(openssh-host - (name "aiadm.cern.ch") - (extra-content "GSSAPIDelegateCredentials yes")) ; needed for EOS home mount - ,(openssh-host - (name "cvmfs-alice.cern.ch") - (extra-content "GSSAPIDelegateCredentials yes")) ; needed for EOS home mount - ,(openssh-host - (name "tw-mailproc.cern.ch") - (user "root") - (identity-file "~/.local/share/ssh-keys/openstack_personal_id_rsa")) + ;; Needed for EOS home mount. + ,@(map (lambda (host) + (openssh-host + (name host) + (extra-content "GSSAPIDelegateCredentials yes"))) + '("aiadm.cern.ch" "cvmfs-alice.cern.ch")) ,(openssh-host (name "twilkendesktop.cern.ch") (port 22022) @@ -272,32 +273,6 @@ auto-expand-secmem ("_JAVA_OPTIONS" . "$_JAVA_OPTIONS${_JAVA_OPTIONS:+ }-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java"))))) -(define-public %pim-packages - (list newsboat vdirsyncer khal khard aerc lynx)) ; lynx for HTML mail - -(define-public %pim-services - (list - (simple-service 'pim-config home-xdg-configuration-files-service-type - `(("khal/config" ,(local-file "home/files/khal.conf")) - ("khard/khard.conf" ,(local-file "home/files/khard.conf")) - ("aerc" ,(local-file "home/files/aerc" #:recursive? #t)) - ("newsboat/config" ,(local-file "home/files/newsboat.conf")) - ("newsboat/config.catppuccin" ,catppuccin-newsboat) - ("vdirsyncer/config" ,(local-file "home/files/vdirsyncer.conf")))) - - ;; These cron jobs are annoying because they pop up a password prompt every time they run. - ;; (simple-service 'pim-cronjobs home-mcron-service-type - ;; (list #~(job "15 */4 * * *" ; every four hours at HH:15 - ;; (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " metasync")) - ;; #~(job "0,30 * * * *" ; every half hour - ;; (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " sync")))) - - (simple-service 'mail-files home-files-service-type - `(;; The file from git main is newer than the one bundled with the - ;; packaged neomutt version and contains a few fixes. - (".local/bin/mutt_oauth2.py" - ,(local-file "home/files/neomutt/contrib/oauth2/mutt_oauth2.py" #:recursive? #t)))))) - (define polybar-wrapper (program-file "polybar-wrapper" @@ -339,6 +314,7 @@ auto-expand-secmem s3cmd python-alibuild python-alidistlint hashicorp-levant-bin hashicorp-nomad-bin hashicorp-consul-bin hashicorp-vault-bin hashicorp-packer-bin + vinagre gnome-screenshot ;; i3 and Xorg. i3 itself must be installed system-wide for gdm to pick it up. ;; acpilight is a drop-in xbacklight replacement, as xbacklight doesn't work on my system. |