diff --git a/README.md b/README.md index 13a6f49..41c0cdc 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=a8433c38f283d9e29bbb6a974828a64755801d80&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/psqvdbmrckjc4ixfa9h2lkcyv6dcm6c1-source +Revision: a8433c38f283d9e29bbb6a974828a64755801d80 +Revisions: 1 +Last modified: 2024-04-27 13:56:35 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/4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c (2024-04-26 12:31:44) +│ ├───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/b3936e85fe6b1d559d0346a9cb39a8bbdb6bcb49 (2024-04-21 00:19:47) +│ ├───eriixvim: github:erictossell/eriixvim/729321128a872bccbe7320ba25a7b6708590cf4d (2024-03-27 17:09:57) +│ │ ├───flake-parts: github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2 (2024-03-01 23:36:56) +│ │ │ └───nixpkgs-lib: github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib (2024-02-29 20:09:43) +│ │ ├───nixpkgs: github:nixos/nixpkgs/20f77aa09916374aa3141cbc605c955626762c9a (2024-03-21 06:18:55) +│ │ └───nixvim: github:nix-community/nixvim/822ec15646b8f7b621468b503118921d644acf39 (2024-03-22 16:25:05) +│ │ ├───devshell: github:numtide/devshell/2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8 (2024-03-22 09:23:46) +│ │ │ ├───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/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2 (2024-03-01 23:36:56) │ │ │ └───nixpkgs-lib follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ │ ├───home-manager: github:nix-community/home-manager/5b9156fa9a8b8beba917b8f9adbfd27bf63e16af +│ │ ├───home-manager: github:nix-community/home-manager/1c2acec99933f9835cc7ad47e35303de92d923a4 (2024-03-20 22:41:55) │ │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ │ ├───nix-darwin: github:lnl7/nix-darwin/bdbae6ecff8fcc322bf6b9053c0b984912378af7 +│ │ ├───nix-darwin: github:lnl7/nix-darwin/bcc8afd06e237df060c85bad6af7128e05fd61a3 (2024-03-17 23:13:25) │ │ │ └───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/20f77aa09916374aa3141cbc605c955626762c9a (2024-03-21 06:18:55) +│ │ └───pre-commit-hooks: github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673 (2024-03-20 08:24:28) +│ │ ├───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/8c3f36400edb3fb5957c73610f1a311c21f6d98b (2024-03-24 22:08:24) +│ │ └───nixpkgs: github:NixOS/nixpkgs/c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370 (2024-01-15 10:54:13) +│ ├───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/1b066e83f280c9f22b3203390326e4065867476b (2024-04-21 00:11:51) +│ │ ├───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/5c24cf2f0a12ad855f444c30b2421d044120c66f (2024-04-19 14:35:08) +│ │ └───poetry2nix: github:nix-community/poetry2nix/3c92540611f42d3fb2d0d084a6c694cd6544b609 (2024-02-22 08:17:04) +│ │ ├───flake-utils: github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26 (2024-01-15 09:00:34) +│ │ │ └───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/e504621290a1fd896631ddbc5e9c16f4366c9f65 (2024-02-19 09:30:38) │ │ └───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/948dfb643c24c0f029d9917c0fd665b97ade3926 (2024-01-25 00:20:09) +│ ├───naersk: github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9 (2023-10-27 15:31:12) +│ │ └───nixpkgs: github:NixOS/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc (2024-01-19 20:59:21) +│ ├───nixpkgs: github:NixOS/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc (2024-01-19 20:59:21) +│ └───utils: github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26 (2024-01-15 09:00:34) +│ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) +├───home-manager: github:nix-community/home-manager/c1609d584a6b5e9e6a02010f51bd368cb4782f8e (2024-04-27 07:40:03) │ └───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/bca7804bb6e1bf5ce5a99b9ae4806be25e36993c (2024-04-27 11:43:12) +│ ├───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/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856 (2024-04-25 20:15:41) ``` ### Flake Outputs ```nix -git+file:///home/runner/work/nixflakes/nixflakes?ref=75e4904ac660e8808bd8aa7c66836d63551f1438&rev=75e4904ac660e8808bd8aa7c66836d63551f1438&shallow=1 +git+file:///home/runner/work/nixflakes/nixflakes?rev=a8433c38f283d9e29bbb6a974828a64755801d80&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 864db4c..f6dc8a2 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1710519878, - "narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=", + "lastModified": 1714134704, + "narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592", + "rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1714136352, + "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "russh": "russh" }, "locked": { - "lastModified": 1711844410, - "narHash": "sha256-aGa1FAAOzKPGQ6uThJZuTFIqJ7FuLCUw4cxg0XVD8XI=", + "lastModified": 1713658787, + "narHash": "sha256-tVoBAy3uBnmQvGumGJh27oeAJ7yGGu3x/uh9yVy2Rd0=", "owner": "erictossell", "repo": "eriixpkgs", - "rev": "f9e7177107ecee90026c9621b05d9bc371068561", + "rev": "b3936e85fe6b1d559d0346a9cb39a8bbdb6bcb49", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "systems": "systems" }, "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": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1712212014, - "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -438,7 +438,10 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -449,11 +452,11 @@ ] }, "locked": { - "lastModified": 1711466786, - "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -466,18 +469,19 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_9", - "systems": "systems_12", + "systems": "systems_11", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1712253037, - "narHash": "sha256-9Ej7MCILxOTzXcznI3mt7avKzbv9nKQXru2DLrSlK2E=", + "lastModified": 1714218192, + "narHash": "sha256-VA4R9WcMRsMguy0mIDwUEZck2Lx/bLwjedllhNa/chk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "0569b9c30099be32f5e0d3b56a050059b9e5a8c1", + "rev": "bca7804bb6e1bf5ce5a99b9ae4806be25e36993c", "type": "github" }, "original": { @@ -515,17 +519,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_11" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -537,20 +543,17 @@ "hyprlang_2": { "inputs": { "nixpkgs": [ - "hyprland", + "hyprlock", "nixpkgs" ], - "systems": [ - "hyprland", - "systems" - ] + "systems": "systems_12" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -559,67 +562,70 @@ "type": "github" } }, - "hyprlang_3": { + "hyprlock": { "inputs": { + "hyprlang": "hyprlang_2", "nixpkgs": [ - "hyprlock", "nixpkgs" ], "systems": "systems_13" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713978374, + "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "repo": "hyprlock", + "rev": "415262065fff0a04b229cd00165f346a86a0a73a", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprlock", "type": "github" } }, - "hyprlock": { + "hyprpicker": { "inputs": { - "hyprlang": "hyprlang_3", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems_14" + ] }, "locked": { - "lastModified": 1711884603, - "narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=", + "lastModified": 1713196199, + "narHash": "sha256-ifdAQO9wcw/zlAyg8fCpf5I0TtufdRS6YZoTVk1VzLM=", "owner": "hyprwm", - "repo": "hyprlock", - "rev": "071ebcefb9070e4397d75103f5f535b58dacf250", + "repo": "hyprpicker", + "rev": "e2472f499d67568edb1b727736c587b877e85344", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlock", + "repo": "hyprpicker", "type": "github" } }, - "hyprpicker": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ + "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1711283076, - "narHash": "sha256-Cda+XbHpvyz3HhdJ7FlXFoaazOWtdBoOWmEaj4ZFwRM=", + "lastModified": 1714171579, + "narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=", "owner": "hyprwm", - "repo": "hyprpicker", - "rev": "0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56", + "repo": "hyprwayland-scanner", + "rev": "126dad854f22fe30e6b82cd21808e76903d90ac5", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprpicker", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -743,11 +749,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -820,11 +826,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -866,11 +872,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -969,11 +975,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1711843955, - "narHash": "sha256-ip8KP9LPCnrx10Ndbt9xzi/WJAfztDf35nSdXrPbSKI=", + "lastModified": 1713658311, + "narHash": "sha256-7XqTZJ3n7jHFjdsZDl7S2gLEtiYoHYtGuw6jn4P3t9U=", "owner": "erictossell", "repo": "readme-py", - "rev": "8c7da04705e2fa7aba761d0f9375af104d446cee", + "rev": "1b066e83f280c9f22b3203390326e4065867476b", "type": "github" }, "original": { @@ -1089,21 +1095,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1285,20 +1276,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" } }, "xdph": { @@ -1321,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { diff --git a/modules/core/nix/default.nix b/modules/core/nix/default.nix index f9c6511..fb1ecd6 100644 --- a/modules/core/nix/default.nix +++ b/modules/core/nix/default.nix @@ -1,10 +1,11 @@ { - home-manager, pkgs, username, ... }: { + imports = [ ./nh ]; + # https://github.com/lovesegfault/nix-config/blob/e412cd01cda084c7e3f5c1fbcf7d99665999949e/core/nixos.nix#L39 system = { extraSystemBuilderCmds = '' diff --git a/modules/core/nix/nh/default.nix b/modules/core/nix/nh/default.nix new file mode 100644 index 0000000..7ef7d61 --- /dev/null +++ b/modules/core/nix/nh/default.nix @@ -0,0 +1,10 @@ +{ username, ... }: +{ + 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/bash/default.nix b/modules/core/terminal/bash/default.nix index ab39e5b..c883e81 100644 --- a/modules/core/terminal/bash/default.nix +++ b/modules/core/terminal/bash/default.nix @@ -1,9 +1,3 @@ -{ - pkgs, - home-manager, - username, - ... -}: { # Shell Aliases inspired by: # https://github.com/donovanglover/nix-config @@ -16,6 +10,7 @@ cp = "cp -ia"; ls = "ls -la"; mv = "mv -i"; + z = "zoxide"; b = "btop"; c = "clear"; @@ -97,8 +92,6 @@ crmd = "cargo remove --dev"; cc = "cargo clippy"; cf = "cargo fmt"; - - py = "${pkgs.python312}/bin/python3"; }; }; } diff --git a/modules/core/terminal/cava/default.nix b/modules/core/terminal/cava/default.nix index 48d870a..2874caa 100644 --- a/modules/core/terminal/cava/default.nix +++ b/modules/core/terminal/cava/default.nix @@ -1,7 +1,5 @@ { pkgs, - home-manager, - username, ... }: { diff --git a/modules/core/terminal/cava/dots/default.nix b/modules/core/terminal/cava/dots/default.nix index a8ad451..121f203 100644 --- a/modules/core/terminal/cava/dots/default.nix +++ b/modules/core/terminal/cava/dots/default.nix @@ -1,4 +1,4 @@ -{ home-manager, username, ... }: +{ username, ... }: { home-manager.users.${username} = _: { home.file = { diff --git a/modules/core/terminal/default.nix b/modules/core/terminal/default.nix index 13289bb..ad0dc37 100644 --- a/modules/core/terminal/default.nix +++ b/modules/core/terminal/default.nix @@ -1,13 +1,12 @@ { pkgs, - home-manager, username, ... }: { imports = [ - ./bash ./cava + ./fish ./fonts ./foot ./nvim @@ -18,7 +17,6 @@ # ---- Home Configuration ---- home-manager.users.${username} = { programs.git.enable = true; - programs.vim.enable = true; }; # ---- System Configuration ---- @@ -38,6 +36,6 @@ ripgrep todoist unzip - wget + zoxide ]; } diff --git a/modules/core/terminal/fish/default.nix b/modules/core/terminal/fish/default.nix new file mode 100644 index 0000000..c5f060a --- /dev/null +++ b/modules/core/terminal/fish/default.nix @@ -0,0 +1,97 @@ +{ pkgs, ... }: +{ + # Shell Aliases inspired by: + # https://github.com/donovanglover/nix-config + # ---- System Configuration ---- + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting + nitch + ${pkgs.zoxide}/bin/zoxide init fish | source + ''; + shellAliases = { + + b = "btop"; + c = "clear"; + e = "exit"; + + g = "git"; + ga = "git add"; + gaa = "git add --all"; + gap = "git add --patch"; + gapp = "git apply"; + gb = "git branch --verbose"; + gbr = "git branch --verbose --remotes"; + gbd = "git branch --delete"; + gbD = "git branch --delete --force"; + gc = "git commit -m"; + gca = "git commit --amend"; + gcl = "git clone"; + gco = "git checkout"; + gcot = "git checkout --theirs"; + gcp = "git cherry-pick --strategy-option theirs"; + gcpx = "git cherry-pick --strategy-option theirs -x"; + gd = "git diff"; + gds = "git diff --staged"; + gf = "git fetch"; + gi = "git init"; + gl = "git log --oneline --decorate --graph -n 10"; + gm = "git merge"; + gp = "git push"; + gpu = "git pull"; + gr = "git reset HEAD~"; + gR = "git restore"; + gRs = "git restore --staged"; + gra = "git remote add"; + gre = "git remote --verbose"; + grh = "git reset HEAD"; + grr = "git reset --hard HEAD~"; + grb = "git rebase --interactive"; + grbc = "git rebase --continue"; + gs = "git status"; + gsma = "git submodule add"; + gsmu = "git submodule update --init --remote --recursive"; + gst = "git stash"; + gstp = "git stash pop"; + gsw = "git switch"; + gt = "git tag"; + gts = "git tag -s"; + + gor = "go run ."; + gob = "go build ."; + + n = "nvim"; + t = "tmux"; + r = "ranger"; + + nf = "nix flake"; + nfu = "nix flake update"; + nfc = "nix flake check"; + nd = "nix develop"; + nb = "nix build"; + ns = "nix shell"; + nr = "nix run"; + ncg = "sudo nix-collect-garbage -d"; + sw = "sudo nixos-rebuild switch --flake ."; + vm = "nixos-rebuild build-vm --flake . && ./result/bin/run-nixos-vm && trash put result nixos.qcow2"; + + ci = "cargo init"; + cin = "cargo info"; + cu = "cargo update"; + ca = "cargo add"; + cab = "cargo add --build"; + cad = "cargo add --dev"; + cb = "cargo build"; + cr = "cargo run"; + cs = "cargo search"; + ct = "cargo tree --depth 1"; + cn = "cargo new"; + crm = "cargo remove"; + crmb = "cargo remove --build"; + crmd = "cargo remove --dev"; + cc = "cargo clippy"; + cf = "cargo fmt"; + }; + }; +} diff --git a/modules/core/terminal/starship/default.nix b/modules/core/terminal/starship/default.nix index 3e6029c..79dc5c9 100644 --- a/modules/core/terminal/starship/default.nix +++ b/modules/core/terminal/starship/default.nix @@ -1,9 +1,3 @@ -{ - pkgs, - home-manager, - username, - ... -}: { programs.starship = { enable = true; diff --git a/users/eriim/default.nix b/users/eriim/default.nix index 375f20a..e416155 100644 --- a/users/eriim/default.nix +++ b/users/eriim/default.nix @@ -2,7 +2,7 @@ { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.${username} = { - shell = pkgs.bash; + shell = pkgs.fish; isNormalUser = true; initialPassword = "temp123"; extraGroups = [