From 366ad323f24bc49ffe01e4819fd26dd5084a3629 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 29 Nov 2023 15:22:33 -0500 Subject: [PATCH] add 1pass --- nix/home-manager/flake.lock | 44 +++++++++---------- nix/home-manager/modules/packages/default.nix | 1 + nix/setup.sh | 10 +---- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 02dd608..a1dbff8 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -316,12 +316,12 @@ ] }, "locked": { - "lastModified": 1700118404, - "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", - "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", - "revCount": 3113, + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "revCount": 3143, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3113%2Brev-c1a033122df8a3c74fda3780c83a104a7d60873c/018bda63-b756-7baf-9ba3-11d2bd3ac0a1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3143%2Brev-db1878f013b52ba5e4034db7c1b63e8d04173a86/018c0fc0-4040-75d8-9a92-046db53b783d/source.tar.gz" }, "original": { "type": "tarball", @@ -399,11 +399,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1697814738, - "narHash": "sha256-mwQmykamvRuHmO6I2VTm8+TOIhhmgy2g5YrMjoCHawY=", + "lastModified": 1701264882, + "narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "c1c99cf41694440d76e31126dc394f52faeb691e", + "rev": "f7413022370f24bb53cb450bfb2803233510113e", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1699760693, - "narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=", + "lastModified": 1700968077, + "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113", + "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", "type": "github" }, "original": { @@ -502,11 +502,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1700144544, - "narHash": "sha256-z1zX2p/u5URWQzqXChukJA5VGymKy4WC+siCkf1w+P0=", + "lastModified": 1701008358, + "narHash": "sha256-5PRSmLr5SnGkNjgUYsgEdPwqkiiJyS6PxF1FqbsvW/I=", "owner": "nixneovim", "repo": "nixneovim", - "rev": "0e43ea62b9d447439bccd9b35596d5f45d48d2d1", + "rev": "cf33ad90d1a34c41109db847944fa1d19eaf5ac5", "type": "github" }, "original": { @@ -528,11 +528,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1700144454, - "narHash": "sha256-tXitUD9i7BVIPbCS5v2dfQ3MQEFELpIrA/aLQnDz75Q=", + "lastModified": 1701008267, + "narHash": "sha256-bZCDtg5HYO3knvYdMVZj/ASQOrD9sS1qdpgEnAtWm0c=", "owner": "nixneovim", "repo": "nixneovimplugins", - "rev": "1353ff2fdc59c1ac8f4578532a72b610a5e62d7d", + "rev": "817fc0ca520c1dee6811e320e66b487933af12b1", "type": "github" }, "original": { @@ -606,12 +606,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", - "revCount": 547201, + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", + "revCount": 553283, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.547201%2Brev-bf744fe90419885eefced41b3e5ae442d732712d/018bd91a-bdb4-7f8c-8ae5-ecf4777646ce/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.553283%2Brev-8cfef6986adfb599ba379ae53c9f5631ecd2fd9c/018c18d1-b364-7bfd-aced-a123b87538af/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 15e5b31..2fab3f1 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -20,6 +20,7 @@ in { ]; home.packages = with pkgs; [ + _1password bandwhich bat bottom diff --git a/nix/setup.sh b/nix/setup.sh index a232ec9..6962bfb 100755 --- a/nix/setup.sh +++ b/nix/setup.sh @@ -10,13 +10,5 @@ nix-channel --update nix-shell '' -A install nix flake update -if [[ $(uname) == "Darwin" ]]; then - # we're modern macOS - home-manager switch --flake "$PWD/home-manager#aarch64-darwin-acicchetti" -else - # we're linux - home-manager switch --flake "$PWD/home-manager#x86_64-linux-acicchetti" -fi -git clone https://github.com/doomemacs/doomemacs ~/.emacs.d -~/.emacs.d/bin/doom install +./update.sh -a