From 30ca3e30aa584a26e6b5780ce5ad11aea0cb994f Mon Sep 17 00:00:00 2001 From: Eric Tossell Date: Sat, 27 Apr 2024 09:56:28 -0400 Subject: [PATCH] chore: flake update, nix fmt, ssh config --- LICENSE | 42 +++--- README.md | 156 ++++++++++++---------- flake.lock | 178 ++++++++++++------------- modules/apps/1password/default.nix | 22 ++- modules/core/nix/default.nix | 6 +- modules/core/nix/nh/default.nix | 3 +- modules/core/terminal/cava/default.nix | 5 +- modules/core/terminal/default.nix | 7 +- modules/core/terminal/fish/default.nix | 9 +- 9 files changed, 209 insertions(+), 219 deletions(-) diff --git a/LICENSE b/LICENSE index e3fe2f78..7226eff4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2024 Eric Tossell - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2024 Eric Tossell + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 13a6f497..f7510712 100644 --- a/README.md +++ b/README.md @@ -74,122 +74,130 @@ This repo has become more opinionated over time and now requires passing down va ```nix Resolved URL: git+file:///home/runner/work/nixflakes/nixflakes?shallow=1 -Locked URL: git+file:///home/runner/work/nixflakes/nixflakes?ref=75e4904ac660e8808bd8aa7c66836d63551f1438&rev=75e4904ac660e8808bd8aa7c66836d63551f1438&shallow=1 +Locked URL: git+file:///home/runner/work/nixflakes/nixflakes?rev=78ba636c54725dfc4cbe55fa313889b9986a0388&shallow=1 Description: Eriim's machine specific configuration flake. -Path: /nix/store/xvcsrm730bag78n7jyjj6x96aj9fpbxr-source -Revision: 75e4904ac660e8808bd8aa7c66836d63551f1438 -Last modified: 2024-03-13 16:56:11 +Path: /nix/store/7d3pc3vijs0xg1gadvnk40ziydr81m18-source +Revision: 78ba636c54725dfc4cbe55fa313889b9986a0388 +Revisions: 1 +Last modified: 2024-05-02 22:45:09 Inputs: -├───NixOS-WSL: github:nix-community/NixOS-WSL/e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9 -│ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 -│ ├───flake-utils: github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26 -│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e +├───NixOS-WSL: github:nix-community/NixOS-WSL/acb893461a4bee4e77b1a27b1410d4995b52174c (2024-04-29 01:58:16) +│ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 (2023-10-04 13:37:54) +│ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) │ └───nixpkgs follows input 'nixpkgs' -├───agenix: github:ryantm/agenix/8cb01a0e717311680e0cbca06a76cbceba6f3ed6 +├───agenix: github:ryantm/agenix/24a7ea390564ccd5b39b7884f597cfc8d7f6f44e (2024-04-26 12:59:12) │ ├───darwin follows input '' -│ ├───home-manager: github:nix-community/home-manager/3bfaacf46133c037bb356193bd2f1765d9dc82c1 +│ ├───home-manager: github:nix-community/home-manager/3bfaacf46133c037bb356193bd2f1765d9dc82c1 (2023-12-20 23:00:17) │ │ └───nixpkgs follows input 'agenix/nixpkgs' │ ├───nixpkgs follows input 'nixpkgs' -│ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -├───eriixpkgs: github:erictossell/eriixpkgs/9e067bb26d510b54345298375044dd629cae70f3 -│ ├───eriixvim: github:erictossell/eriixvim/8479daa78d1be8e765b6a9b458bdbfffd94eb6ad -│ │ ├───flake-parts: github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f -│ │ │ └───nixpkgs-lib: github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib -│ │ ├───nixpkgs: github:nixos/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8 -│ │ └───nixvim: github:nix-community/nixvim/183eac72a9f0ae0032239510d89dbc474b180d33 -│ │ ├───flake-parts: github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f +│ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +├───eriixpkgs: github:erictossell/eriixpkgs/76d40f1792218107e43df2e08f6f34848085d97a (2024-04-30 21:47:32) +│ ├───eriixvim: github:erictossell/eriixvim/9b5d73b84fa3bd2f9e75bd6c6afc53ea93f480d5 (2024-04-30 21:42:18) +│ │ ├───flake-parts: github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d (2024-04-01 23:40:58) +│ │ │ └───nixpkgs-lib: github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?dir=lib (2024-03-29 09:07:56) +│ │ ├───nixpkgs: github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994 (2024-04-27 21:35:43) +│ │ └───nixvim: github:nix-community/nixvim/2483dff03dd326296278213a8e051d375b56d3df (2024-04-30 16:36:11) +│ │ ├───devshell: github:numtide/devshell/12e914740a25ea1891ec619bb53cf5e6ca922e40 (2024-04-19 13:19:58) +│ │ │ ├───flake-utils: github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725 (2023-12-04 08:58:27) +│ │ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' +│ │ ├───flake-compat: https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D (2023-10-04 13:37:54) +│ │ ├───flake-parts: github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d (2024-04-01 23:40:58) │ │ │ └───nixpkgs-lib follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ │ ├───home-manager: github:nix-community/home-manager/5b9156fa9a8b8beba917b8f9adbfd27bf63e16af +│ │ ├───home-manager: github:nix-community/home-manager/9fe79591c1005ce6f93084ae7f7dab0a2891440d (2024-04-28 22:30:45) │ │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ │ ├───nix-darwin: github:lnl7/nix-darwin/bdbae6ecff8fcc322bf6b9053c0b984912378af7 +│ │ ├───nix-darwin: github:lnl7/nix-darwin/230a197063de9287128e2c68a7a4b0cd7d0b50a7 (2024-04-24 08:09:31) │ │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ │ ├───nixpkgs: github:NixOS/nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1 -│ │ └───pre-commit-hooks: github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0 -│ │ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 -│ │ ├───flake-utils: github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725 -│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -│ │ ├───gitignore: github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5 +│ │ ├───nixpkgs: github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994 (2024-04-27 21:35:43) +│ │ └───pre-commit-hooks: github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f (2024-04-24 10:34:06) +│ │ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 (2023-10-04 13:37:54) +│ │ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ │ ├───gitignore: github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394 (2024-02-28 02:28:52) │ │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/pre-commit-hooks/nixpkgs' │ │ ├───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' │ │ └───nixpkgs-stable follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ ├───flake-utils: github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605 -│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -│ ├───go-time: github:erictossell/go-time/d2e5a8c286fde94478e16a597bc78b6954e3b9a8 -│ │ └───nixpkgs: github:NixOS/nixpkgs/c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370 -│ ├───homepage-nix: github:erictossell/homepage-nix/c6620260812bc35ee7209ab2fa0f4899868b86f1 -│ │ ├───naersk: github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9 -│ │ │ └───nixpkgs: github:NixOS/nixpkgs/f945939fd679284d736112d3d5410eb867f3b31c -│ │ ├───nixpkgs: github:NixOS/nixpkgs/f945939fd679284d736112d3d5410eb867f3b31c -│ │ └───utils: github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605 -│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e +│ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ ├───go-time: github:erictossell/go-time/18e4d069522a1ad1e65223ec95daed4baeae5f71 (2024-04-30 21:46:46) +│ │ └───nixpkgs: github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994 (2024-04-27 21:35:43) +│ ├───homepage-nix: github:erictossell/homepage-nix/c6620260812bc35ee7209ab2fa0f4899868b86f1 (2024-03-08 02:17:42) +│ │ ├───naersk: github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9 (2023-10-27 15:31:12) +│ │ │ └───nixpkgs: github:NixOS/nixpkgs/f945939fd679284d736112d3d5410eb867f3b31c (2024-03-07 02:56:54) +│ │ ├───nixpkgs: github:NixOS/nixpkgs/f945939fd679284d736112d3d5410eb867f3b31c (2024-03-07 02:56:54) +│ │ └───utils: github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605 (2024-02-28 13:18:44) +│ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) │ ├───nixpkgs follows input 'nixpkgs' -│ ├───readme-py: github:erictossell/readme-py/912577cbd3ba8c8d22d383ec17d6333bbfd2caf8 -│ │ ├───flake-utils: github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605 -│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -│ │ ├───nixpkgs: github:NixOS/nixpkgs/9df3e30ce24fd28c7b3e2de0d986769db5d6225d -│ │ └───poetry2nix: github:nix-community/poetry2nix/3c92540611f42d3fb2d0d084a6c694cd6544b609 -│ │ ├───flake-utils: github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26 -│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -│ │ ├───nix-github-actions: github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547 +│ ├───readme-py: github:erictossell/readme-py/4cf6b922f5deb3cc9b791d6b6252ba653cbce804 (2024-04-30 21:42:26) +│ │ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ │ ├───nixpkgs: github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994 (2024-04-27 21:35:43) +│ │ └───poetry2nix: github:nix-community/poetry2nix/184960be60652ca7f865123e8394ece988afb566 (2024-04-30 20:37:07) +│ │ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ │ ├───nix-github-actions: github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547 (2023-12-29 15:30:25) │ │ │ └───nixpkgs follows input 'eriixpkgs/readme-py/poetry2nix/nixpkgs' │ │ ├───nixpkgs follows input 'eriixpkgs/readme-py/nixpkgs' -│ │ ├───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -│ │ └───treefmt-nix: github:numtide/treefmt-nix/e504621290a1fd896631ddbc5e9c16f4366c9f65 +│ │ ├───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +│ │ └───treefmt-nix: github:numtide/treefmt-nix/c6aaf729f34a36c445618580a9f95a48f5e4e03f (2024-04-25 15:24:16) │ │ └───nixpkgs follows input 'eriixpkgs/readme-py/poetry2nix/nixpkgs' -│ └───russh: github:erictossell/russh/948dfb643c24c0f029d9917c0fd665b97ade3926 -│ ├───naersk: github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9 -│ │ └───nixpkgs: github:NixOS/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc -│ ├───nixpkgs: github:NixOS/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc -│ └───utils: github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26 -│ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e -├───home-manager: github:nix-community/home-manager/017b12de5b899ef9b64e2c035ce257bfe95b8ae2 +│ └───russh: github:erictossell/russh/dd53274d43199a67f9d192d88b6f77807363657b (2024-04-30 21:45:16) +│ ├───naersk: github:nix-community/naersk/c5037590290c6c7dae2e42e7da1e247e54ed2d49 (2024-04-19 09:58:44) +│ │ └───nixpkgs: path:/nix/store/370qy3d3wg9zhbn5a3dcv6k1q1iigfh4-source?lastModified=0&narHash=sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY%3D (1970-01-01 00:00:00) +│ ├───nixpkgs: github:NixOS/nixpkgs/cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae (2024-04-28 14:22:29) +│ └───utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +├───home-manager: github:nix-community/home-manager/f8e6694edabe4aaa7a85aac47b43ea5d978b116d (2024-04-29 22:41:45) │ └───nixpkgs follows input 'nixpkgs' -├───hyprland: github:hyprwm/hyprland/a065b481f32f4297596a9cd9c538794fd4669b1a -│ ├───hyprcursor: github:hyprwm/hyprcursor/05db7dfd7fc261e0195e54f8a6d655d4f370e70f -│ │ ├───hyprlang: github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2 -│ │ │ ├───nixpkgs follows input 'hyprland/hyprcursor/nixpkgs' -│ │ │ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 +├───hyprland: github:hyprwm/hyprland/70ebc3add3b941a52f460f02129ef0842f580ec7 (2024-04-30 20:59:07) +│ ├───hyprcursor: github:hyprwm/hyprcursor/cab4746180f210a3c1dd3d53e45c510e309e90e1 (2024-04-20 11:23:33) +│ │ ├───hyprlang follows input 'hyprland/hyprlang' +│ │ ├───nixpkgs follows input 'hyprland/nixpkgs' +│ │ └───systems follows input 'hyprland/systems' +│ ├───hyprland-protocols: github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03 (2023-08-11 11:36:36) │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprland-protocols: github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03 +│ ├───hyprlang: github:hyprwm/hyprlang/78fcaa27ae9e1d782faa3ff06c8ea55ddce63706 (2024-04-14 19:00:46) │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprlang: github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2 +│ ├───hyprwayland-scanner: github:hyprwm/hyprwayland-scanner/126dad854f22fe30e6b82cd21808e76903d90ac5 (2024-04-26 22:46:19) │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───nixpkgs: github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34 -│ ├───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 -│ ├───wlroots: gitlab:wlroots/wlroots/50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b -│ └───xdph: github:hyprwm/xdg-desktop-portal-hyprland/2d2fb547178ec025da643db57d40a971507b82fe +│ ├───nixpkgs: github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932 (2024-04-21 15:54:59) +│ ├───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) +│ ├───wlroots: github:hyprwm/wlroots-hyprland/5c1d51c5a2793480f5b6c4341ad0797052aec2ea (2024-04-21 20:33:21) +│ └───xdph: github:hyprwm/xdg-desktop-portal-hyprland/9ace6f969ce495185df34cc6254fb9d297765478 (2024-04-21 18:33:52) │ ├───hyprland-protocols follows input 'hyprland/hyprland-protocols' │ ├───hyprlang follows input 'hyprland/hyprlang' │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ └───systems follows input 'hyprland/systems' -├───hyprlock: github:hyprwm/hyprlock/5c91621ad2a068793c7844942867ddc297f37c58 -│ ├───hyprlang: github:hyprwm/hyprlang/11d5ccda071c153dfdc18ef65338956a51cef96a -│ │ └───nixpkgs follows input 'hyprlock/nixpkgs' +├───hyprlock: github:hyprwm/hyprlock/415262065fff0a04b229cd00165f346a86a0a73a (2024-04-24 17:06:14) +│ ├───hyprlang: github:hyprwm/hyprlang/78fcaa27ae9e1d782faa3ff06c8ea55ddce63706 (2024-04-14 19:00:46) +│ │ ├───nixpkgs follows input 'hyprlock/nixpkgs' +│ │ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) │ ├───nixpkgs follows input 'nixpkgs' -│ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 -├───hyprpicker: github:hyprwm/hyprpicker/2ef703474fb96e97e03e66e8820f213359f29382 +│ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) +├───hyprpicker: github:hyprwm/hyprpicker/e2472f499d67568edb1b727736c587b877e85344 (2024-04-15 15:49:59) │ └───nixpkgs follows input 'nixpkgs' -└───nixpkgs: github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34 +└───nixpkgs: github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994 (2024-04-27 21:35:43) ``` ### Flake Outputs ```nix -git+file:///home/runner/work/nixflakes/nixflakes?ref=75e4904ac660e8808bd8aa7c66836d63551f1438&rev=75e4904ac660e8808bd8aa7c66836d63551f1438&shallow=1 +git+file:///home/runner/work/nixflakes/nixflakes?rev=78ba636c54725dfc4cbe55fa313889b9986a0388&shallow=1 ├───devShells │ └───x86_64-linux │ └───default: development environment 'nix-shell' ├───formatter -│ └───x86_64-linux: package 'nixfmt-0.6.0' +│ └───x86_64-linux: package 'nixfmt-unstable-2024-03-01' ├───nixosConfigurations +│ ├───arkhitekton: NixOS configuration │ ├───live-image: NixOS configuration -│ ├───principium: NixOS configuration │ ├───terminus: NixOS configuration -│ ├───virtualis: NixOS configuration +│ ├───vm-temp: NixOS configuration │ └───winix: NixOS configuration └───templates └───default: template: The default template for Eriim's nixflakes. diff --git a/flake.lock b/flake.lock index d9fc19dd..2de16e21 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1714134704, - "narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=", + "lastModified": 1714355896, + "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c", + "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "russh": "russh" }, "locked": { - "lastModified": 1713658787, - "narHash": "sha256-tVoBAy3uBnmQvGumGJh27oeAJ7yGGu3x/uh9yVy2Rd0=", + "lastModified": 1714513652, + "narHash": "sha256-htbPwBPVp0rtD1YvpOvtWHPYDC0ILlXhliMWRz8AAek=", "owner": "erictossell", "repo": "eriixpkgs", - "rev": "b3936e85fe6b1d559d0346a9cb39a8bbdb6bcb49", + "rev": "76d40f1792218107e43df2e08f6f34848085d97a", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1711559397, - "narHash": "sha256-4IQ8iq/EWGQbmCxU9oqOOxyqdwwqMp58/iDrdPRFTGI=", + "lastModified": 1714513338, + "narHash": "sha256-SuAJekvvvHekTdtVwefkvWztqpyQl0uETT19evCZYTY=", "owner": "erictossell", "repo": "eriixvim", - "rev": "729321128a872bccbe7320ba25a7b6708590cf4d", + "rev": "9b5d73b84fa3bd2f9e75bd6c6afc53ea93f480d5", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711318104, - "narHash": "sha256-aEmUMpjHrnzqiPPd4hW/Adc3et2fCm+gWMx4ajFYLPo=", + "lastModified": 1714513606, + "narHash": "sha256-ywVb2EpZC9bhtTho3V4wy7tg8ftM+vFYAhHJMxVVuCA=", "owner": "erictossell", "repo": "go-time", - "rev": "8c3f36400edb3fb5957c73610f1a311c21f6d98b", + "rev": "18e4d069522a1ad1e65223ec95daed4baeae5f71", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1710974515, - "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "lastModified": 1714343445, + "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1714042918, - "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", + "lastModified": 1714430505, + "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", + "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1714155088, - "narHash": "sha256-supUaxz/TH6a/mTO01/6Oh3VzrOcRp2lnhBEN+9XJvI=", + "lastModified": 1714510747, + "narHash": "sha256-A0d89ML8BPw2lGpBsgcQKVSwcH44Xh/6hZhj/4cifb4=", "owner": "hyprwm", "repo": "hyprland", - "rev": "f94264928a8ab4da8759d4ded25a46af44451d38", + "rev": "70ebc3add3b941a52f460f02129ef0842f580ec7", "type": "github" }, "original": { @@ -616,11 +616,11 @@ ] }, "locked": { - "lastModified": 1713989318, - "narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=", + "lastModified": 1714171579, + "narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45", + "rev": "126dad854f22fe30e6b82cd21808e76903d90ac5", "type": "github" }, "original": { @@ -653,11 +653,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1698420672, - "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", + "lastModified": 1713520724, + "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", "owner": "nix-community", "repo": "naersk", - "rev": "aeb58d5e8faead8980a807c840232697982d47b9", + "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", "type": "github" }, "original": { @@ -677,11 +677,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -732,11 +732,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -749,11 +749,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -826,11 +826,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -842,12 +842,10 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", - "type": "github" + "lastModified": 0, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "path": "/nix/store/370qy3d3wg9zhbn5a3dcv6k1q1iigfh4-source", + "type": "path" }, "original": { "id": "nixpkgs", @@ -856,11 +854,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", + "lastModified": 1714314149, + "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", + "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", "type": "github" }, "original": { @@ -897,11 +895,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711124705, - "narHash": "sha256-vgFQxvs6T9RcaV9sd9Io+RxQuRKovauMvueGajWWanw=", + "lastModified": 1714494971, + "narHash": "sha256-7RsTiRKMMrlwuert1QNFvnoPIwl1q1cepR4H8jv2iok=", "owner": "nix-community", "repo": "nixvim", - "rev": "822ec15646b8f7b621468b503118921d644acf39", + "rev": "2483dff03dd326296278213a8e051d375b56d3df", "type": "github" }, "original": { @@ -923,11 +921,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1708589824, - "narHash": "sha256-2GOiFTkvs5MtVF65sC78KNVxQSmsxtk0WmV1wJ9V2ck=", + "lastModified": 1714509427, + "narHash": "sha256-YTcd6n7BeAVxBNhzOgUHMmsgBkfQ2Cz9ZcFotXrpEg8=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "3c92540611f42d3fb2d0d084a6c694cd6544b609", + "rev": "184960be60652ca7f865123e8394ece988afb566", "type": "github" }, "original": { @@ -955,11 +953,11 @@ ] }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1713954846, + "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", "type": "github" }, "original": { @@ -975,11 +973,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1713658311, - "narHash": "sha256-7XqTZJ3n7jHFjdsZDl7S2gLEtiYoHYtGuw6jn4P3t9U=", + "lastModified": 1714513346, + "narHash": "sha256-eNTC89wfqESHSyQoSdnMvt/97jtYICtGODDG6MheNto=", "owner": "erictossell", "repo": "readme-py", - "rev": "1b066e83f280c9f22b3203390326e4065867476b", + "rev": "4cf6b922f5deb3cc9b791d6b6252ba653cbce804", "type": "github" }, "original": { @@ -1007,11 +1005,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1706142009, - "narHash": "sha256-nfQuooSBmsfh3WGva3qCli4BK/2KIXMBtDvgrbmjuQQ=", + "lastModified": 1714513516, + "narHash": "sha256-yMraLEZubQI4Fd4d2YJvfnQFGVBDfQSvwBbKcDjqr8E=", "owner": "erictossell", "repo": "russh", - "rev": "948dfb643c24c0f029d9917c0fd665b97ade3926", + "rev": "dd53274d43199a67f9d192d88b6f77807363657b", "type": "github" }, "original": { @@ -1224,11 +1222,11 @@ ] }, "locked": { - "lastModified": 1708335038, - "narHash": "sha256-ETLZNFBVCabo7lJrpjD6cAbnE11eDOjaQnznmg/6hAE=", + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e504621290a1fd896631ddbc5e9c16f4366c9f65", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", "type": "github" }, "original": { @@ -1260,11 +1258,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/modules/apps/1password/default.nix b/modules/apps/1password/default.nix index 8812ff41..816ade34 100644 --- a/modules/apps/1password/default.nix +++ b/modules/apps/1password/default.nix @@ -1,20 +1,16 @@ +{ username, ... }: { - pkgs, - home-manager, - username, - ... -}: -{ - - # home-manager.users.${username} = { home.file = { - # Configuration for 1password SSH Agent. - ".ssh/config".text = '' - Host * - IdentityAgent ~/.1password/agent.sock - ''; + #".ssh/config".text = '' + # Host * + # IdentityAgent ~/.1password/agent.sock + + # Host git.eriim.dev + # HostName eriim.dev + # Port 23231 + # ''; # Configure 1password to handle SSH commit signing ".gitconfig".text = '' diff --git a/modules/core/nix/default.nix b/modules/core/nix/default.nix index fb1ecd60..1132e215 100644 --- a/modules/core/nix/default.nix +++ b/modules/core/nix/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - username, - ... -}: +{ pkgs, username, ... }: { imports = [ ./nh ]; diff --git a/modules/core/nix/nh/default.nix b/modules/core/nix/nh/default.nix index 7ef7d619..790100a2 100644 --- a/modules/core/nix/nh/default.nix +++ b/modules/core/nix/nh/default.nix @@ -1,10 +1,9 @@ { username, ... }: { - programs.nh = { + programs.nh = { enable = true; clean.enable = true; clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/${username}/repos/nix/nixflakes"; - }; } diff --git a/modules/core/terminal/cava/default.nix b/modules/core/terminal/cava/default.nix index 2874caa4..ae29a5d8 100644 --- a/modules/core/terminal/cava/default.nix +++ b/modules/core/terminal/cava/default.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: +{ pkgs, ... }: { imports = [ ./dots ]; environment.systemPackages = with pkgs; [ cava ]; diff --git a/modules/core/terminal/default.nix b/modules/core/terminal/default.nix index ad0dc379..de346627 100644 --- a/modules/core/terminal/default.nix +++ b/modules/core/terminal/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - username, - ... -}: +{ pkgs, username, ... }: { imports = [ ./cava @@ -36,6 +32,7 @@ ripgrep todoist unzip + wishlist zoxide ]; } diff --git a/modules/core/terminal/fish/default.nix b/modules/core/terminal/fish/default.nix index c5f060a2..740177a8 100644 --- a/modules/core/terminal/fish/default.nix +++ b/modules/core/terminal/fish/default.nix @@ -11,10 +11,13 @@ ${pkgs.zoxide}/bin/zoxide init fish | source ''; shellAliases = { - + b = "btop"; c = "clear"; e = "exit"; + n = "nvim"; + t = "tmux"; + r = "ranger"; g = "git"; ga = "git add"; @@ -61,10 +64,6 @@ gor = "go run ."; gob = "go build ."; - n = "nvim"; - t = "tmux"; - r = "ranger"; - nf = "nix flake"; nfu = "nix flake update"; nfc = "nix flake check";