diff --git a/..gitignore.un~ b/..gitignore.un~ new file mode 100644 index 0000000..c455975 Binary files /dev/null and b/..gitignore.un~ differ diff --git a/.gitignore b/.gitignore index 997c622..084e3da 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,6 @@ filezilla/ obsidian/ sqlitebrowser/ pdfarranger/ +abiword/ +kalk/ +netsurf/ diff --git a/doom/config.el b/doom/config.el index 49ce4d6..6a97e94 100644 --- a/doom/config.el +++ b/doom/config.el @@ -4,8 +4,8 @@ (setq display-line-numbers-type t) (setq doom-font (font-spec :family "JetBrainsMono" :size 11.0)) (setq doom-theme 'doom-material) -(setq default-frame-alist '((undecorated . t))) -(add-to-list 'default-frame-alist '(fullscreen . maximized)) +;;(setq default-frame-alist '((undecorated . t))) +;;(add-to-list 'default-frame-alist '(fullscreen . maximized)) (scroll-bar-mode 0) ;; org mode diff --git a/doom/init.el b/doom/init.el index 25eb397..bdb1ced 100644 --- a/doom/init.el +++ b/doom/init.el @@ -113,7 +113,7 @@ ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics + ess ; emacs speaks statistics ;;factor ;;faust ; dsp, but you get to keep your soul ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) diff --git a/shell/profile.d/path.sh b/shell/profile.d/path.sh index ca3c5dd..e665a7d 100644 --- a/shell/profile.d/path.sh +++ b/shell/profile.d/path.sh @@ -9,3 +9,4 @@ PATH="$HOME/.local/bin${PATH:+:${PATH}}" PATH="$HOME/.local/state/nix/profile/bin${PATH:+:${PATH}}" PATH="$HOME/.config/emacs/bin${PATH:+:${PATH}}" PATH="$HOME/.local/share/go/bin${PATH:+:${PATH}}" +PATH="$HOME/.local/share/pyenv/shims${PATH:+:${PATH}}" diff --git a/shell/profile.d/pyenv.sh b/shell/profile.d/pyenv.sh new file mode 100644 index 0000000..80bd4b5 --- /dev/null +++ b/shell/profile.d/pyenv.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# export PYENV_ROOT="$HOME/.pyenv" # Already in xdgspec.sh +[ -d $PYENV_ROOT/bin ] && export PATH="$PYENV_ROOT/bin:$PATH" +# export PATH="$HOME/.pyenv/shims:${PATH}" # Already set in path.sh +export PYENV_SHELL=bash +command pyenv rehash 2>/dev/null + +pyenv() { + local command=${1:-} + [ "$#" -gt 0 ] && shift + case "$command" in + rehash|shell) eval "$(pyenv "sh-$command" "$@")";; + *) command pyenv "$command" "$@";; + esac +} diff --git a/shell/profile.d/xdgspec.sh b/shell/profile.d/xdgspec.sh index 38cb98a..0b3f159 100644 --- a/shell/profile.d/xdgspec.sh +++ b/shell/profile.d/xdgspec.sh @@ -29,4 +29,5 @@ export \ GIT_SSH_COMMAND="ssh -F ${XDG_CONFIG_HOME}/ssh/config" \ ZDOTDIR="$XDG_CONFIG_HOME/shell" \ NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc \ - IPYTHONDIR="$XDG_CONFIG_HOME/ipython" + IPYTHONDIR="$XDG_CONFIG_HOME/ipython" \ + PYENV_ROOT="$XDG_DATA_HOME"/pyenv