diff --git a/home.nix b/home.nix index da73995..ea059e4 100644 --- a/home.nix +++ b/home.nix @@ -20,6 +20,7 @@ pinentry ripgrep sqlite + wakatime ((emacsPackagesNgGen emacs).emacsWithPackages (epkgs: [ epkgs.vterm ])) @@ -34,6 +35,7 @@ oh-my-zsh = { enable = true; plugins = [ + "direnv" "docker" "git" "ssh-agent" diff --git a/home/.default-python-packages b/home/.default-python-packages index d7ced03..e80fb01 100644 --- a/home/.default-python-packages +++ b/home/.default-python-packages @@ -3,3 +3,4 @@ pipenv pylint pytest pytest-cache +wakatime diff --git a/home/.doom.d/config.el b/home/.doom.d/config.el index 5c52543..6e41b04 100644 --- a/home/.doom.d/config.el +++ b/home/.doom.d/config.el @@ -31,7 +31,7 @@ ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/.org" - org-roam-directory "~/.org/roam" + org-roam-directory "~/.org" deft-directory "~/.org" deft-default-extension "org" deft-recursive t) @@ -58,8 +58,12 @@ ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. ;; -;; -;;(global-wakatime-mode) +(after! wakatime-mode + (global-wakatime-mode)) + +(after! pinentry + (pinentry-start)) + (add-hook 'js2-mode-hook 'prettier-js-mode) (add-hook 'typescript-mode-hook 'prettier-js-mode) (add-hook 'web-mode-hook 'prettier-js-mode) diff --git a/home/.doom.d/init.el b/home/.doom.d/init.el index 49ca3c5..ac75d17 100644 --- a/home/.doom.d/init.el +++ b/home/.doom.d/init.el @@ -86,7 +86,7 @@ :tools ;;ansible ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv + direnv docker ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs diff --git a/home/.zshrc b/home/.zshrc index 9f3647e..18bb6b6 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -19,7 +19,7 @@ export ZSH_CUSTOM=$HOME/.zsh/custom # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(asdf aws gcloud extract command-not-found tmux git github ssh-agent docker docker-compose mix) +plugins=(asdf direnv aws gcloud extract command-not-found tmux git github ssh-agent docker docker-compose mix) # ruby if [ -x ruby ]; then