From 14003a8016ef6572a85541010e8e0b955d4bc9cd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 4 May 2022 08:35:52 +0200 Subject: ... --- _sources.gup | 2 +- accounts/gkleen@sif/default.nix | 6 +-- accounts/gkleen@sif/emacs.el | 44 ++++++++++----------- accounts/gkleen@sif/ssh-hosts.nix | 19 ---------- accounts/gkleen@sif/zshrc | 80 +++++++++++++++++++-------------------- all.gup | 1 + user-profiles/tmux/default.nix | 5 ++- 7 files changed, 71 insertions(+), 86 deletions(-) diff --git a/_sources.gup b/_sources.gup index c483e204..259ef2a5 100644 --- a/_sources.gup +++ b/_sources.gup @@ -1,6 +1,6 @@ #!/usr/bin/env zsh -gup --always gup -u nvfetcher.toml +gup --contents <(nvfetcher --version) [[ -d $2 ]] && cp -a $2 $1 nvfetcher -o $1 diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 7853bd5d..0ee62708 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -1,7 +1,7 @@ { flake, flakeInputs, userName, pkgs, customUtils, lib, config, sources, ... }@inputs: let cfg = config.home-manager.users.${userName}; - xmonad = import ./xmonad pkgs.haskellPackages; + xmonad = import ./xmonad pkgs.haskell.packages.ghc8107; emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec { phases = [ "installPhase" ]; @@ -89,7 +89,7 @@ in { evil evil-dvorak undo-tree magit haskell-mode nix-mode yaml-mode json-mode shakespeare-mode smart-mode-line highlight-parentheses highlight-symbol - notmuch ag sass-mode lua-mode fira-code-mode use-package + ag sass-mode lua-mode fira-code-mode use-package # notmuch use-package-ensure-system-package git-gutter emacsScratch edit-server mediawiki ]; @@ -184,7 +184,7 @@ in { }; taffybar = { enable = true; - package = import ./taffybar { inherit (pkgs) haskellPackages; }; + package = import ./taffybar { haskellPackages = pkgs.haskell.packages.ghc8107; }; }; status-notifier-watcher.enable = true; xembed-sni-proxy.enable = true; diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el index fbbd1ec9..d4b1a092 100644 --- a/accounts/gkleen@sif/emacs.el +++ b/accounts/gkleen@sif/emacs.el @@ -100,28 +100,28 @@ (setq edit-server-new-frame nil) (setq edit-server-url-major-mode-alist '(("rzint\\.mathinst\\.loc" . mediawiki-mode))) -(setq notmuch-address-internal-completion '(received nil)) -(setq notmuch-always-prompt-for-sender t) -(setq notmuch-command "notmuch-ssh") -(setq notmuch-crypto-process-mime t) -(setq notmuch-draft-tags '("+draft" "-inbox")) -(setq notmuch-fcc-dirs nil) -(setq notmuch-hello-sections '(notmuch-hello-insert-header notmuch-hello-insert-saved-searches)) -(setq notmuch-hello-thousands-separator " ") -(setq notmuch-identities '("gkleen@yggdrasil.li" "g@141.li" "kleen@cip.ifi.lmu.de" "Gregor.Kleen@stud.ifi.lmu.de" "G.Kleen@campus.lmu.de" "G.Kleen@lmu.de" "gregor.kleen@ifi.lmu.de" "uni2work@ifi.lmu.de" "gregor@kleen.li")) -(setq notmuch-message-headers '("Subject" "To" "Cc" "Date")) -(setq notmuch-message-replied-tags '("+replied" "-unread" "-inbox")) -(setq notmuch-saved-searches - (quote - ((:name "inbox" :query "tag:inbox" :key "i") - (:name "unread" :query "tag:unread AND tag:inbox" :key "u") - (:name "drafts" :query "tag:draft" :key "d") - (:name "all mail" :query "date:month.." :key "a" :count-query "*") - (:name "sent" :query "is:sent" :key "s" :count-query "is:sent") - ))) -(setq notmuch-search-oldest-first nil) -(setq notmuch-show-all-tags-list t) -(setq notmuch-show-logo nil) +;; (setq notmuch-address-internal-completion '(received nil)) +;; (setq notmuch-always-prompt-for-sender t) +;; (setq notmuch-command "notmuch-ssh") +;; (setq notmuch-crypto-process-mime t) +;; (setq notmuch-draft-tags '("+draft" "-inbox")) +;; (setq notmuch-fcc-dirs nil) +;; (setq notmuch-hello-sections '(notmuch-hello-insert-header notmuch-hello-insert-saved-searches)) +;; (setq notmuch-hello-thousands-separator " ") +;; (setq notmuch-identities '("gkleen@yggdrasil.li" "g@141.li" "kleen@cip.ifi.lmu.de" "Gregor.Kleen@stud.ifi.lmu.de" "G.Kleen@campus.lmu.de" "G.Kleen@lmu.de" "gregor.kleen@ifi.lmu.de" "uni2work@ifi.lmu.de" "gregor@kleen.li")) +;; (setq notmuch-message-headers '("Subject" "To" "Cc" "Date")) +;; (setq notmuch-message-replied-tags '("+replied" "-unread" "-inbox")) +;; (setq notmuch-saved-searches +;; (quote +;; ((:name "inbox" :query "tag:inbox" :key "i") +;; (:name "unread" :query "tag:unread AND tag:inbox" :key "u") +;; (:name "drafts" :query "tag:draft" :key "d") +;; (:name "all mail" :query "date:month.." :key "a" :count-query "*") +;; (:name "sent" :query "is:sent" :key "s" :count-query "is:sent") +;; ))) +;; (setq notmuch-search-oldest-first nil) +;; (setq notmuch-show-all-tags-list t) +;; (setq notmuch-show-logo nil) (setq send-mail-function 'sendmail-send-it) (setq mail-envelope-from 'header) diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix index 72bf6520..44b5fa63 100644 --- a/accounts/gkleen@sif/ssh-hosts.nix +++ b/accounts/gkleen@sif/ssh-hosts.nix @@ -174,25 +174,6 @@ user = "uni2work"; identityFile = "~/.ssh/letz"; }; - "git.odin" = - { hostname = "odin.asgard.yggdrasil"; - user = "gitolite"; - }; - "notmuch.odin" = - { hostname = "odin.asgard.yggdrasil"; - identityFile = "~/.ssh/notmuch.odin.asgard.yggdrasil"; - }; - "status.odin" = - { hostname = "odin.asgard.yggdrasil"; - identityFile = "~/.ssh/status.odin.asgard.yggdrasil"; - extraOptions.ControlPath = "~/.ssh/status-%r@%n:%p"; - }; - "moden" = - { hostname = "oristano.tcs.ifi.lmu.de"; - user = "gkleen"; - port = 30363; - identityFile = "~/.ssh/gkleen@oristano.tcs.ifi.lmu.de"; - }; "ubuntu1804" = { hostname = "192.168.122.30"; identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil"; diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc index bcdc662a..712ec690 100644 --- a/accounts/gkleen@sif/zshrc +++ b/accounts/gkleen@sif/zshrc @@ -111,7 +111,7 @@ dir() { forceShell=false wormhole=false gitWorktree="" - notmuchMsg="" + # notmuchMsg="" quickserve=false while getopts ':t:a:s:Sd:ir:wqg:n:' arg; do @@ -132,7 +132,7 @@ dir() { "r") repoUrl=${OPTARG} ;; "w") wormhole=true ;; "g") gitWorktree=${OPTARG} ;; - "n") notmuchMsg=${OPTARG} ;; + # "n") notmuchMsg=${OPTARG} ;; "q") quickserve=true ;; *) printf "Invalid option: %s\n" $arg >&2; exit 2 ;; esac @@ -189,56 +189,56 @@ dir() { fi - if [[ -n ${notmuchMsg} ]]; then - getMimeTypes() { - nix-shell -p mailcap --run "find \${buildInputs} -path '*/etc/mime.types' | head -n 1 | xargs -- cat" - } + # if [[ -n ${notmuchMsg} ]]; then + # getMimeTypes() { + # nix-shell -p mailcap --run "find \${buildInputs} -path '*/etc/mime.types' | head -n 1 | xargs -- cat" + # } - typeset -a messages - messages=(${(z)$(notmuch search --output=messages ${notmuchMsg})}) + # typeset -a messages + # messages=(${(z)$(notmuch search --output=messages ${notmuchMsg})}) - for message (${messages}); do - typeset -A notmuchAtts - notmuchAtts=() + # for message (${messages}); do + # typeset -A notmuchAtts + # notmuchAtts=() - while IFS= read -r -d $'\n' line; do - [[ ${line} =~ '(attachment|part)\{ ID: ([0-9]+)' ]] || continue - attId=${match[2]} + # while IFS= read -r -d $'\n' line; do + # [[ ${line} =~ '(attachment|part)\{ ID: ([0-9]+)' ]] || continue + # attId=${match[2]} - [[ ${line} =~ 'Content-type: multipart/' ]] && continue + # [[ ${line} =~ 'Content-type: multipart/' ]] && continue - fName="part_${attId}" - [[ ${line} =~ 'Filename: (([^,]|,[^ ])+)' ]] && fName=${match[1]} + # fName="part_${attId}" + # [[ ${line} =~ 'Filename: (([^,]|,[^ ])+)' ]] && fName=${match[1]} - if [[ ${#messages} -gt 1 ]]; then - fName="${message}/${fName}" - fi + # if [[ ${#messages} -gt 1 ]]; then + # fName="${message}/${fName}" + # fi - fExt="${fName:e}" - [[ -n "${fExt}" ]] && fName="${fName:r}" + # fExt="${fName:e}" + # [[ -n "${fExt}" ]] && fName="${fName:r}" - if [[ -z "${fExt}" && ${line} =~ 'Content-type: (([^,]|,[^ ])+)$' ]]; then - fExt=$(getMimeTypes | grep ${match[1]}$'\t' | head -n 1 | awk '{ print $2; }') - fi + # if [[ -z "${fExt}" && ${line} =~ 'Content-type: (([^,]|,[^ ])+)$' ]]; then + # fExt=$(getMimeTypes | grep ${match[1]}$'\t' | head -n 1 | awk '{ print $2; }') + # fi - mkdir -p ${fName:h} - if [[ -n "${fExt}" ]]; then - fName=$(mktemp -p . "${fName}.XXXXXX.${fExt}") - else - fName=$(mktemp -p . "${fName}.XXXXXX") - fi + # mkdir -p ${fName:h} + # if [[ -n "${fExt}" ]]; then + # fName=$(mktemp -p . "${fName}.XXXXXX.${fExt}") + # else + # fName=$(mktemp -p . "${fName}.XXXXXX") + # fi - notmuchAtts[${attId}]=${fName} - done <<(notmuch show --decrypt=false -- ${message} | tr -d $'\f') + # notmuchAtts[${attId}]=${fName} + # done <<(notmuch show --decrypt=false -- ${message} | tr -d $'\f') - for attId fName in ${(kv)notmuchAtts}; do - [[ -d ${fName:h} ]] || mkdir -p ${fName:h} - printf "#%d → ‘%s’\n" "${attId}" "${fName}" >&2 + # for attId fName in ${(kv)notmuchAtts}; do + # [[ -d ${fName:h} ]] || mkdir -p ${fName:h} + # printf "#%d → ‘%s’\n" "${attId}" "${fName}" >&2 - notmuch show --decrypt=false --part=${attId} -- ${message} | pv -W -D 2 -i 0.1 >${fName} - done - done - fi + # notmuch show --decrypt=false --part=${attId} -- ${message} | pv -W -D 2 -i 0.1 >${fName} + # done + # done + # fi ${wormhole} && wormhole receive diff --git a/all.gup b/all.gup index b4789368..e9f4b2e7 100644 --- a/all.gup +++ b/all.gup @@ -3,3 +3,4 @@ gup --always gup -u _sources gup -u flake.lock +gup -u _sources diff --git a/user-profiles/tmux/default.nix b/user-profiles/tmux/default.nix index 9e66cadd..4252c099 100644 --- a/user-profiles/tmux/default.nix +++ b/user-profiles/tmux/default.nix @@ -20,7 +20,10 @@ substituteAll $src $out ''; }); - tmuxp.enable = true; }; + + # home.packages = [ + # (pkgs.tmuxp.override { python3Packages = pkgs.python37Packages; }) + # ]; }; } -- cgit v1.2.3