From ec994d09d5a82bd721489d10a6d9c3cc08aaf5ed Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 20 Sep 2023 11:55:42 -0400 Subject: [PATCH] oh boy --- TODO.md | 4 +-- emacs/emacs.doom/config.el | 2 ++ emacs/emacs.doom/packages.el | 1 + flake.lock | 14 ++++----- nix/home-manager/flake.lock | 16 +++++----- nix/home-manager/modules/packages/default.nix | 2 +- zsh/zshrc | 29 ++++++++++--------- 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/TODO.md b/TODO.md index 10f4949..12eaa81 100644 --- a/TODO.md +++ b/TODO.md @@ -1,3 +1 @@ -🗹 Use [Delta](https://github.com/dandavison/delta) - -❎ Convert to [Home-Manager](https://github.com/rycee/home-manager) +Lay down ssh_config with list of my_domains pointing to 1password agent socket diff --git a/emacs/emacs.doom/config.el b/emacs/emacs.doom/config.el index e03900a..adf295a 100644 --- a/emacs/emacs.doom/config.el +++ b/emacs/emacs.doom/config.el @@ -98,6 +98,8 @@ (evil-define-key 'normal 'global (kbd "g") 'magit-file-dispatch) (evil-define-key 'normal 'global (kbd "r") 'magit-status)) +(use-package! 1password :demand t :init (message "Enabling 1password...") :config (1password-auth-source-enable)) + (use-package! org-transclusion :after org :init diff --git a/emacs/emacs.doom/packages.el b/emacs/emacs.doom/packages.el index 205ba34..387bdfd 100644 --- a/emacs/emacs.doom/packages.el +++ b/emacs/emacs.doom/packages.el @@ -52,3 +52,4 @@ (package! org-transclusion) (package! jsonnet-mode) (package! org-modern) +(package! auth-source-1password) diff --git a/flake.lock b/flake.lock index 0732f84..3d1df3a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1694422554, - "narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=", + "lastModified": 1695196688, + "narHash": "sha256-4C+HSXd69qQe12m8Pc6PgLmJGDKURcqkhVdwRu0xrBw=", "owner": "cachix", "repo": "devenv", - "rev": "63d20fe09aa09060ea9ec9bb6d582c025402ba15", + "rev": "d3b37c5d6fce8919b9a86c4a3bcacd2d0534341a", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs_2": { "locked": { - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", - "revCount": 525972, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "revCount": 526521, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.525972%2Brev-ace5093e36ab1e95cb9463863491bee90d5a4183/018a9c7a-fe00-720a-a2e4-6725bca1d098/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.526521%2Brev-970a59bd19eff3752ce552935687100c46e820a5/018aabed-d05c-7478-b3db-bed61902efec/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index dc3bd8e..63b6c26 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -334,11 +334,11 @@ ] }, "locked": { - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", - "revCount": 3012, + "narHash": "sha256-bLenMfnHKs0O7kQyLqnLGfrywFMa9BGcJ5Uk9+d0tkU=", + "rev": "6f88243322c315360c1f31a8fc6c43006db51465", + "revCount": 3022, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3012%2Brev-d9b88b43524db1591fb3d9410a21428198d75d49/018a94c1-1ec2-7028-a144-2f795d1470a4/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3022%2Brev-6f88243322c315360c1f31a8fc6c43006db51465/018ab114-07b7-7ce8-9693-4c3ac0e4703c/source.tar.gz" }, "original": { "type": "tarball", @@ -623,11 +623,11 @@ }, "nixpkgs_3": { "locked": { - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", - "revCount": 525972, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "revCount": 526521, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.525972%2Brev-ace5093e36ab1e95cb9463863491bee90d5a4183/018a9c7a-fe00-720a-a2e4-6725bca1d098/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.526521%2Brev-970a59bd19eff3752ce552935687100c46e820a5/018aabed-d05c-7478-b3db-bed61902efec/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index 50e1cdb..15e5b31 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -44,7 +44,7 @@ in { kondo litecli magic-wormhole-rs - # ncdu + ncdu ov pdm poetry diff --git a/zsh/zshrc b/zsh/zshrc index 3a87619..5102f32 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -116,7 +116,6 @@ compinit znap source oh-my-zsh plugins/{gitignore,git,helm,mvn,gradle} -alias exa="eza -l --git" if [[ $(uname -s) =~ 'Linux' ]]; then alias cp="cp --reflink=auto" fi @@ -157,18 +156,6 @@ if [[ -d $HOME/.anyenv ]]; then fi fi -CTRL_R_PICKER="atuin" -if [[ "${CTRL_R_PICKER}" == "mcfly" ]]; then - znap eval mcfly 'mcfly init zsh' - export MCFLY_KEY_SCHEME=vim - export MCFLY_FUZZY=true - export MCFLY_RESULTS=50 - export MCFLY_USED=1 -fi - -if [[ "${CTRL_R_PICKER}" == "atuin" ]]; then - znap eval atuin 'atuin init zsh' -fi if (_command-exists direnv); then eval "$(direnv hook zsh)" @@ -186,6 +173,22 @@ else fi LS_PICKER="eza" +CTRL_R_PICKER="atuin" +alias exa="eza -l --git" +alias eza="eza -l --git" + for funcfile in $HOME/.zsh.d/* ; do source "${funcfile}" done + +if [[ "${CTRL_R_PICKER}" == "mcfly" ]]; then + znap eval mcfly 'mcfly init zsh' + export MCFLY_KEY_SCHEME=vim + export MCFLY_FUZZY=true + export MCFLY_RESULTS=50 + export MCFLY_USED=1 +fi + +if [[ "${CTRL_R_PICKER}" == "atuin" ]]; then + znap eval atuin 'atuin init zsh' +fi