diff --git a/README.md b/README.md index d99c1935..a5d7fcec 100644 --- a/README.md +++ b/README.md @@ -74,26 +74,25 @@ 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?rev=d436d9ef8af75c42d0432ac77b44336b9f3955bb&shallow=1 +Locked URL: git+file:///home/runner/work/nixflakes/nixflakes?shallow=1 Description: Eriim's machine specific configuration flake. -Path: /nix/store/q5wwvvc0jxj4w8bgizphwlx9gb590h8x-source -Revision: d436d9ef8af75c42d0432ac77b44336b9f3955bb -Revisions: 1 -Last modified: 2024-08-03 07:30:32 +Path: /nix/store/mlparrh1x1n2hn1s02rcw8yjw323b10l-source +Revision: f5526b637d4d3b611d90b84e80183cb6be003c63-dirty +Last modified: 2024-10-26 13:12:42 Inputs: -├───NixOS-WSL: github:nix-community/NixOS-WSL/f373ad59ae5866f0f98216bd5c71526b373450d2 (2024-07-29 11:38:12) +├───NixOS-WSL: github:nix-community/NixOS-WSL/5a965cb108fb1f30b29a26dbc29b473f49e80b41 (2024-10-23 21:07:58) │ ├───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) +│ ├───flake-utils: github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a (2024-09-17 08:14:13) │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) │ └───nixpkgs follows input 'nixpkgs' -├───agenix: github:ryantm/agenix/3f1dae074a12feb7327b4bf43cbac0d124488bb7 (2024-07-30 11:30:03) +├───agenix: github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41 (2024-08-10 12:45:04) │ ├───darwin follows input '' │ ├───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 (2023-04-09 08:27:08) -├───eriixpkgs: github:erictossell/eriixpkgs/6f95c2f89d5d8f6c435d9986058c3af4a14578ae (2024-08-03 05:33:00) -│ ├───eriixvim: github:erictossell/eriixvim/e61f2d923bc36461bfd567408b9b58959ebc2592 (2024-08-03 05:13:38) +├───eriixpkgs: github:erictossell/eriixpkgs/aa872ba08f7149360d2767a2e8505042e774fc3c (2024-10-20 00:26:44) +│ ├───eriixvim: github:erictossell/eriixvim/9cedbe64f84364d2dda4cb0c5f250d2aa701d3a8 (2024-08-11 03:17:14) │ │ ├───flake-parts: github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7 (2024-07-03 08:15:18) │ │ │ └───nixpkgs-lib: https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz?narHash=sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI%3D (2024-07-01 23:35:45) │ │ ├───nixpkgs: github:nixos/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9 (2024-07-12 07:14:11) @@ -118,7 +117,7 @@ Inputs: │ │ ├───nixpkgs: github:NixOS/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8 (2024-07-01 15:47:52) │ │ └───treefmt-nix: github:numtide/treefmt-nix/bdb6355009562d8f9313d9460c0d3860f525bc6c (2024-07-02 02:35:53) │ │ └───nixpkgs follows input 'eriixpkgs/eriixvim/nixvim/nixpkgs' -│ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ ├───flake-utils: github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a (2024-09-17 08:14:13) │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) │ ├───go-time: github:erictossell/go-time/f6fde276a99e8f19ed1e3d5b0f4946383eb4bc35 (2024-07-14 13:24:29) │ │ └───nixpkgs: github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9 (2024-07-12 07:14:11) @@ -129,18 +128,18 @@ Inputs: │ │ └───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' -│ ├───readme-py: github:erictossell/readme-py/6b0cdeb81868a3923d19ecb5087da4c5011aeff1 (2024-07-28 00:13:54) -│ │ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ ├───readme-py: github:erictossell/readme-py/e1b327a06ff6a3b5ac2a8ed5a71f174dad5cbda7 (2024-10-20 00:14:49) +│ │ ├───flake-utils: github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a (2024-09-17 08:14:13) │ │ │ └───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) -│ │ ├───nixpkgs: github:NixOS/nixpkgs/b73c2221a46c13557b1b3be9c2070cc42cf01eb3 (2024-07-27 06:49:29) -│ │ └───poetry2nix: github:nix-community/poetry2nix/d11c01e58587e5f21037ed6477465a7f26a32e27 (2024-07-15 10:37:54) -│ │ ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) +│ │ ├───nixpkgs: github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0 (2024-10-18 13:02:40) +│ │ └───poetry2nix: github:nix-community/poetry2nix/e67cc181b5bdf5aa46f1340fa9acd3910f6fb122 (2024-10-17 14:02:51) +│ │ ├───flake-utils: github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a (2024-09-17 08:14:13) │ │ │ └───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) +│ │ ├───nix-github-actions: github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820 (2024-07-04 04:12:51) │ │ │ └───nixpkgs follows input 'eriixpkgs/readme-py/poetry2nix/nixpkgs' │ │ ├───nixpkgs follows input 'eriixpkgs/readme-py/nixpkgs' │ │ ├───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) -│ │ └───treefmt-nix: github:numtide/treefmt-nix/8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd (2024-06-30 12:03:42) +│ │ └───treefmt-nix: github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64 (2024-10-03 19:47:24) │ │ └───nixpkgs follows input 'eriixpkgs/readme-py/poetry2nix/nixpkgs' │ └───russh: github:erictossell/russh/45da95e1260fe25cd7145a23e4111d84b5b8ef7f (2024-07-05 04:45:21) │ ├───naersk: github:nix-community/naersk/941ce6dc38762a7cfb90b5add223d584feed299b (2024-06-18 16:21:15) @@ -148,80 +147,95 @@ Inputs: │ ├───nixpkgs: github:NixOS/nixpkgs/1afc5440469f94e7ed26e8648820971b102afdc3 (2024-07-04 10:07:58) │ └───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/afc892db74d65042031a093adb6010c4c3378422 (2024-08-02 20:21:05) +├───home-manager: github:nix-community/home-manager/93435d27d250fa986bfec6b2ff263161ff8288cb (2024-10-25 22:16:39) │ └───nixpkgs follows input 'nixpkgs' -├───hyprland: git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=4141e6755022edc19cd37cd7ad077a93b3bae5bd&submodules=1 (2024-08-02 21:16:20) -│ ├───aquamarine: github:hyprwm/aquamarine/7c3565f9bedc7cb601cc0baa14792247e4dc1d5a (2024-07-30 13:55:39) +├───hyprland: git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=0b29caf9ab86518ff474eed5e7d19c12f96ebbd0&submodules=1 (2024-10-26 01:22:37) +│ ├───aquamarine: github:hyprwm/aquamarine/8d732fa8aff8b12ef2b1e2f00fc8153e41312b72 (2024-10-21 16:13:19) │ │ ├───hyprutils follows input 'hyprland/hyprutils' │ │ ├───hyprwayland-scanner follows input 'hyprland/hyprwayland-scanner' │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprcursor: github:hyprwm/hyprcursor/4493a972b48f9c3014befbbf381ed5fff91a65dc (2024-07-18 19:19:31) +│ ├───hyprcursor: github:hyprwm/hyprcursor/0264e698149fcb857a66a53018157b41f8d97bb0 (2024-10-11 18:02:18) │ │ ├───hyprlang follows input 'hyprland/hyprlang' │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprlang: github:hyprwm/hyprlang/adbefbf49664a6c2c8bf36b6487fd31e3eb68086 (2024-07-18 17:39:21) +│ ├───hyprland-protocols: github:hyprwm/hyprland-protocols/a7c183800e74f337753de186522b9017a07a8cee (2024-10-07 23:50:20) +│ │ ├───nixpkgs follows input 'hyprland/nixpkgs' +│ │ └───systems follows input 'hyprland/systems' +│ ├───hyprlang: github:hyprwm/hyprlang/f054f2e44d6a0b74607a6bc0f52dba337a3db38e (2024-10-05 22:50:12) │ │ ├───hyprutils follows input 'hyprland/hyprutils' │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprutils: github:hyprwm/hyprutils/5dcbbc1e3de40b2cecfd2007434d86e924468f1f (2024-07-27 16:47:29) +│ ├───hyprutils: github:hyprwm/hyprutils/fd4be8b9ca932f7384e454bcd923c5451ef2aa85 (2024-10-14 21:27:36) │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───hyprwayland-scanner: github:hyprwm/hyprwayland-scanner/a048a6cb015340bd82f97c1f40a4b595ca85cc30 (2024-07-18 17:35:19) +│ ├───hyprwayland-scanner: github:hyprwm/hyprwayland-scanner/500c81a9e1a76760371049a8d99e008ea77aa59e (2024-09-20 23:27:16) │ │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ │ └───systems follows input 'hyprland/systems' -│ ├───nixpkgs: github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d (2024-07-28 16:52:11) +│ ├───nixpkgs: github:NixOS/nixpkgs/1997e4aa514312c1af7e2bda7fad1644e778ff26 (2024-10-20 08:35:21) +│ ├───pre-commit-hooks: github:cachix/git-hooks.nix/3c3e88f0f544d6bb54329832616af7eb971b6be6 (2024-10-16 18:45:14) +│ │ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 (2023-10-04 13:37:54) +│ │ ├───gitignore: github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394 (2024-02-28 02:28:52) +│ │ │ └───nixpkgs follows input 'hyprland/pre-commit-hooks/nixpkgs' +│ │ ├───nixpkgs follows input 'hyprland/nixpkgs' +│ │ └───nixpkgs-stable: github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7 (2024-07-07 21:02:49) │ ├───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) -│ └───xdph: github:hyprwm/xdg-desktop-portal-hyprland/7f2a77ddf60390248e2a3de2261d7102a13e5341 (2024-07-30 18:59:36) -│ ├───hyprland-protocols: github:hyprwm/hyprland-protocols/5a11232266bf1a1f5952d5b179c3f4b2facaaa84 (2024-07-18 18:15:55) -│ │ ├───nixpkgs follows input 'hyprland/xdph/nixpkgs' -│ │ └───systems follows input 'hyprland/xdph/systems' +│ └───xdph: github:hyprwm/xdg-desktop-portal-hyprland/fb9c8d665af0588bb087f97d0f673ddf0d501787 (2024-10-05 22:23:07) +│ ├───hyprland-protocols follows input 'hyprland/hyprland-protocols' │ ├───hyprlang follows input 'hyprland/hyprlang' +│ ├───hyprutils follows input 'hyprland/hyprutils' +│ ├───hyprwayland-scanner follows input 'hyprland/hyprwayland-scanner' │ ├───nixpkgs follows input 'hyprland/nixpkgs' │ └───systems follows input 'hyprland/systems' -├───hyprlock: github:hyprwm/hyprlock/c7fa5026c074dc1670a6665cdfece41d920d35b1 (2024-08-02 18:39:54) -│ ├───hyprlang: github:hyprwm/hyprlang/adbefbf49664a6c2c8bf36b6487fd31e3eb68086 (2024-07-18 17:39:21) +├───hyprlock: github:hyprwm/hyprlock/ae3bb0fd43d6129520ec4b1f022976e7b929dcde (2024-10-25 21:04:56) +│ ├───hyprlang: github:hyprwm/hyprlang/f054f2e44d6a0b74607a6bc0f52dba337a3db38e (2024-10-05 22:50:12) │ │ ├───hyprutils follows input 'hyprlock/hyprutils' │ │ ├───nixpkgs follows input 'hyprlock/nixpkgs' │ │ └───systems follows input 'hyprlock/systems' -│ ├───hyprutils: github:hyprwm/hyprutils/962582a090bc233c4de9d9897f46794280288989 (2024-07-18 17:35:02) +│ ├───hyprutils: github:hyprwm/hyprutils/3f5293432b6dc6a99f26aca2eba3876d2660665c (2024-09-25 21:44:05) │ │ ├───nixpkgs follows input 'hyprlock/nixpkgs' │ │ └───systems follows input 'hyprlock/systems' │ ├───nixpkgs follows input 'nixpkgs' │ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) -├───hyprpicker: github:hyprwm/hyprpicker/c36676ad0c08312ee07f061e210991f0176d6747 (2024-07-18 18:01:51) -│ ├───hyprutils: github:hyprwm/hyprutils/962582a090bc233c4de9d9897f46794280288989 (2024-07-18 17:35:02) +├───hyprpicker: github:hyprwm/hyprpicker/89b9352d26cc0fd13cd6dc0a77ac18c795a44e59 (2024-10-24 22:51:22) +│ ├───hyprutils: github:hyprwm/hyprutils/3f5293432b6dc6a99f26aca2eba3876d2660665c (2024-09-25 21:44:05) +│ │ ├───nixpkgs follows input 'hyprpicker/nixpkgs' +│ │ └───systems follows input 'hyprpicker/systems' +│ ├───hyprwayland-scanner: github:hyprwm/hyprwayland-scanner/500c81a9e1a76760371049a8d99e008ea77aa59e (2024-09-20 23:27:16) │ │ ├───nixpkgs follows input 'hyprpicker/nixpkgs' │ │ └───systems follows input 'hyprpicker/systems' │ ├───nixpkgs follows input 'nixpkgs' │ └───systems: github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68 (2023-07-14 15:19:09) -├───nixpkgs: github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58 (2024-07-31 10:19:44) -└───stylix: github:danth/stylix/feb2973dfa8232c07efbd2b48f11a5cfa2276570 (2024-07-29 23:21:31) +├───nixpkgs: github:NixOS/nixpkgs/2768c7d042a37de65bb1b5b3268fc987e534c49d (2024-10-23 06:41:50) +└───stylix: github:danth/stylix/fb9399b7e2c855f42dae76a363bab28d4f24aa8d (2024-10-19 23:33:13) ├───base16: github:SenchoPens/base16.nix/665b3c6748534eb766c777298721cece9453fdae (2024-02-25 19:47:46) │ └───fromYaml: github:SenchoPens/fromYaml/11fbbbfb32e3289d3c631e0134a23854e7865c84 (2023-07-16 23:25:21) ├───base16-fish: github:tomyun/base16-fish/2f6dd973a9075dabccd26f1cded09508180bf5fe (2021-06-01 15:05:57) - ├───base16-foot: github:tinted-theming/base16-foot/eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce (2023-10-08 00:45:48) - ├───base16-helix: github:tinted-theming/base16-helix/34f41987bec14c0f3f6b2155c19787b1f6489625 (2024-07-12 18:43:34) - ├───base16-kitty: github:kdrag0n/base16-kitty/06bb401fa9a0ffb84365905ffbb959ae5bf40805 (2022-10-05 20:22:08) - ├───base16-tmux: github:tinted-theming/base16-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7 (2023-10-08 00:45:02) + ├───base16-helix: github:tinted-theming/base16-helix/7f795bf75d38e0eea9fed287264067ca187b88a9 (2024-09-09 05:46:35) ├───base16-vim: github:tinted-theming/base16-vim/6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d (2024-05-19 20:21:23) ├───flake-compat: github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9 (2023-01-17 11:47:33) + ├───flake-utils: github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a (2024-03-11 08:33:50) + │ └───systems follows input 'stylix/systems' ├───gnome-shell: github:GNOME/gnome-shell/0d0aadf013f78a7f7f1dc984d0d812971864b934 (2024-04-21 12:24:51) - ├───home-manager: github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d (2024-05-17 07:24:04) + ├───home-manager: github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be (2024-08-23 17:56:03) │ └───nixpkgs follows input 'stylix/nixpkgs' - └───nixpkgs follows input 'nixpkgs' + ├───nixpkgs follows input 'nixpkgs' + ├───systems: github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e (2023-04-09 08:27:08) + ├───tinted-foot: github:tinted-theming/tinted-foot/eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce (2023-10-08 00:45:48) + ├───tinted-kitty: github:tinted-theming/tinted-kitty/eb39e141db14baef052893285df9f266df041ff8 (2024-05-23 00:13:09) + └───tinted-tmux: github:tinted-theming/tinted-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7 (2023-10-08 00:45:02) ``` ### Flake Outputs ```nix -git+file:///home/runner/work/nixflakes/nixflakes?rev=d436d9ef8af75c42d0432ac77b44336b9f3955bb&shallow=1 +git+file:///home/runner/work/nixflakes/nixflakes?shallow=1 ├───devShells │ └───x86_64-linux │ └───default: development environment 'nix-shell' ├───formatter -│ └───x86_64-linux: package 'nixfmt-unstable-2024-07-12' +│ └───x86_64-linux: package 'nixfmt-unstable-2024-08-16' ├───nixosConfigurations │ ├───arkhitekton: NixOS configuration │ ├───live-image: NixOS configuration diff --git a/assets/backgrounds/OutsetIslandday.jpg b/assets/backgrounds/OutsetIslandday.jpg new file mode 100644 index 00000000..170c8492 Binary files /dev/null and b/assets/backgrounds/OutsetIslandday.jpg differ diff --git a/assets/backgrounds/OutsetIslandevening.jpg b/assets/backgrounds/OutsetIslandevening.jpg new file mode 100644 index 00000000..a4ef177f Binary files /dev/null and b/assets/backgrounds/OutsetIslandevening.jpg differ diff --git a/assets/backgrounds/OutsetIslandmorning.jpg b/assets/backgrounds/OutsetIslandmorning.jpg new file mode 100644 index 00000000..0b26abea Binary files /dev/null and b/assets/backgrounds/OutsetIslandmorning.jpg differ diff --git a/assets/backgrounds/OutsetIslandnight.jpg b/assets/backgrounds/OutsetIslandnight.jpg new file mode 100644 index 00000000..c236b9ad Binary files /dev/null and b/assets/backgrounds/OutsetIslandnight.jpg differ diff --git a/assets/backgrounds/darkportal.png b/assets/backgrounds/darkportal.png new file mode 100644 index 00000000..30cca56f Binary files /dev/null and b/assets/backgrounds/darkportal.png differ diff --git a/assets/backgrounds/groot.png b/assets/backgrounds/groot.png new file mode 100644 index 00000000..affc283f Binary files /dev/null and b/assets/backgrounds/groot.png differ diff --git a/assets/backgrounds/nightcity.png b/assets/backgrounds/nightcity.png new file mode 100644 index 00000000..2c836918 Binary files /dev/null and b/assets/backgrounds/nightcity.png differ diff --git a/flake.lock b/flake.lock index 5a17fb3b..e7ed87e1 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1722253092, - "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", + "lastModified": 1729717678, + "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", + "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -112,30 +112,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1720809814, - "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -144,38 +128,6 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -229,11 +181,11 @@ "russh": "russh" }, "locked": { - "lastModified": 1722663180, - "narHash": "sha256-M6HseGZRJG0klwXdksY9Ezqqk+FsS0Z4VFj9fOSnoOA=", + "lastModified": 1729384004, + "narHash": "sha256-cyqY4a+cs/tdqbHFz5Xs5oZ/6dLh4ix8+Yu+oqMgrO4=", "owner": "erictossell", "repo": "eriixpkgs", - "rev": "6f95c2f89d5d8f6c435d9986058c3af4a14578ae", + "rev": "aa872ba08f7149360d2767a2e8505042e774fc3c", "type": "github" }, "original": { @@ -249,11 +201,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1722662018, - "narHash": "sha256-fwZqkzsqA5NkCQk6BWFKfBiMQlFJYS3B+zMpy412p8g=", + "lastModified": 1723346234, + "narHash": "sha256-uMpdcAm96ng+M2vSaWEYYG5ZuCUHGV1APaqtQMY2ZwA=", "owner": "erictossell", "repo": "eriixvim", - "rev": "e61f2d923bc36461bfd567408b9b58959ebc2592", + "rev": "9cedbe64f84364d2dda4cb0c5f250d2aa701d3a8", "type": "github" }, "original": { @@ -293,6 +245,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -354,11 +322,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -390,11 +358,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -408,11 +376,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -425,6 +393,27 @@ "inputs": { "systems": "systems_7" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -515,6 +504,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -601,11 +612,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1729894599, + "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", "type": "github" }, "original": { @@ -622,11 +633,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -671,11 +682,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -688,19 +699,21 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_9", + "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_10", "xdph": "xdph" }, "locked": { - "lastModified": 1722633380, - "narHash": "sha256-rVyikfYJjkSB7990fLwABjrhVM4UOmci7rxYpRT/6dI=", + "lastModified": 1729905757, + "narHash": "sha256-b2c36v8YXJOp4hdYjAmJvYa4It0QwfK0b5UqUnaa82Y=", "ref": "refs/heads/main", - "rev": "4141e6755022edc19cd37cd7ad077a93b3bae5bd", - "revCount": 5045, + "rev": "0b29caf9ab86518ff474eed5e7d19c12f96ebbd0", + "revCount": 5377, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -715,21 +728,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -754,11 +765,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -783,11 +794,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -806,11 +817,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1722623994, - "narHash": "sha256-4x5jtp0uLAc/sKsBrEAKnz+5r0C4WGXp+jOdrNC1yts=", + "lastModified": 1729890296, + "narHash": "sha256-7xSf7awy/cvYPlky8Bkh69N6eZUpR8PYMH52wJPznQg=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "c7fa5026c074dc1670a6665cdfece41d920d35b1", + "rev": "ae3bb0fd43d6129520ec4b1f022976e7b929dcde", "type": "github" }, "original": { @@ -822,17 +833,18 @@ "hyprpicker": { "inputs": { "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], "systems": "systems_12" }, "locked": { - "lastModified": 1721325711, - "narHash": "sha256-Mgd6nCSfhCt/TQayTmeatl2fiOB0nR4wERzwZUygapw=", + "lastModified": 1729810282, + "narHash": "sha256-ARBFaV1LtNfdvosdMuhVKX+q11JTx59Ed7/QK+BFmMc=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "c36676ad0c08312ee07f061e210991f0176d6747", + "rev": "89b9352d26cc0fd13cd6dc0a77ac18c795a44e59", "type": "github" }, "original": { @@ -853,11 +865,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -878,11 +890,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -903,11 +915,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -928,11 +940,36 @@ ] }, "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprpicker", + "nixpkgs" + ], + "systems": [ + "hyprpicker", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "type": "github" }, "original": { @@ -1012,11 +1049,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", "type": "github" }, "original": { @@ -1053,13 +1090,29 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -1130,11 +1183,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1174,11 +1227,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1226,11 +1279,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1721039874, - "narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=", + "lastModified": 1729173771, + "narHash": "sha256-rT2Vz1kFSj+NKHetVY7PJUACX+qBETdnuPSklzFKCsc=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d11c01e58587e5f21037ed6477465a7f26a32e27", + "rev": "e67cc181b5bdf5aa46f1340fa9acd3910f6fb122", "type": "github" }, "original": { @@ -1239,6 +1292,30 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "readme-py": { "inputs": { "flake-utils": "flake-utils_4", @@ -1246,11 +1323,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1722125634, - "narHash": "sha256-yCVDB7LGojoIiatNgbDHsvflnxYuTZ9IIwY1kKSpWjI=", + "lastModified": 1729383289, + "narHash": "sha256-r+Qfe85smLsxKpkqRLMs0HYZjdoZbpXpXurVsJENh3s=", "owner": "erictossell", "repo": "readme-py", - "rev": "6b0cdeb81868a3923d19ecb5087da4c5011aeff1", + "rev": "e1b327a06ff6a3b5ac2a8ed5a71f174dad5cbda7", "type": "github" }, "original": { @@ -1296,24 +1373,26 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_6", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_13", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1722295291, - "narHash": "sha256-3XpT9GMw50NCGT1Gd2YAwEjrEcFtDqnuQ7sRUcuU/Pc=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "feb2973dfa8232c07efbd2b48f11a5cfa2276570", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -1382,6 +1461,21 @@ "type": "github" } }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1501,6 +1595,55 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1534,11 +1677,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -1585,11 +1728,22 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1600,11 +1754,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 15cf41cd..5cf12424 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -5,13 +5,21 @@ ./firefox #./jetbrains #./libreoffice - #./obsidian + ./obsidian #./vscode ]; home-manager.users.${username} = { + programs.chromium = { + enable = true; + package = pkgs.brave; + }; home.packages = with pkgs; [ + microsoft-edge ticktick remmina + openvpn + vivaldi + vscode ]; programs.zathura = { diff --git a/modules/apps/firefox/default.nix b/modules/apps/firefox/default.nix index bf743695..3db439de 100644 --- a/modules/apps/firefox/default.nix +++ b/modules/apps/firefox/default.nix @@ -4,7 +4,7 @@ home-manager.users.${username} = { home.sessionVariables = { - MOZ_ENABLE_WAYLAND = 1; + MOZ_ENABLE_WAYLAND = 0; }; programs.firefox = { diff --git a/modules/apps/obs/default.nix b/modules/apps/obs/default.nix index 8afbf879..90dcb2d9 100644 --- a/modules/apps/obs/default.nix +++ b/modules/apps/obs/default.nix @@ -1,6 +1,5 @@ { pkgs, - home-manager, username, ... }: diff --git a/modules/apps/obsidian/default.nix b/modules/apps/obsidian/default.nix index f15b1dfb..eff66c26 100644 --- a/modules/apps/obsidian/default.nix +++ b/modules/apps/obsidian/default.nix @@ -1,6 +1,5 @@ { pkgs, - home-manager, username, ... }: diff --git a/modules/apps/vscode/default.nix b/modules/apps/vscode/default.nix index 715a017d..424025ab 100644 --- a/modules/apps/vscode/default.nix +++ b/modules/apps/vscode/default.nix @@ -1,6 +1,5 @@ { pkgs, - home-manager, username, ... }: @@ -22,18 +21,6 @@ ms-vscode.powershell bbenoist.nix ]; - userSettings = { - "window.titleBarStyle" = "custom"; - "workbench.colorTheme" = "Github Dark Colorblind (Beta)"; - "editor.fontFamily" = "'M+1Code Nerd Font','Droid Sans Mono', 'monospace', monospace"; - "github.copilot.enable" = { - "*" = true; - "plaintext" = false; - "markdown" = true; - "scminput" = false; - }; - "powershell.powerShellAdditionalExePaths" = "/run/current-system/sw/bin/pwsh"; - }; }; }; } diff --git a/modules/core/terminal/fonts/default.nix b/modules/core/terminal/fonts/default.nix index 971333d0..179187fb 100644 --- a/modules/core/terminal/fonts/default.nix +++ b/modules/core/terminal/fonts/default.nix @@ -6,7 +6,7 @@ monaspace nerdfonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji roboto ]; diff --git a/modules/core/terminal/starship/default.nix b/modules/core/terminal/starship/default.nix index 79dc5c9b..76094b26 100644 --- a/modules/core/terminal/starship/default.nix +++ b/modules/core/terminal/starship/default.nix @@ -55,7 +55,7 @@ }; hostname = { ssh_only = false; - format = " on [$hostname](bold red)\n"; + format = " on [$hostname](bold #FFA500)\n"; disabled = false; }; lua = { @@ -138,8 +138,8 @@ symbol = "terraform "; }; username = { - style_user = "green bold"; - style_root = "red bold"; + style_user = "blue bold"; + style_root = "orange bold"; format = "[$user]($style)"; disabled = false; show_always = true; diff --git a/modules/core/terminal/tmux/default.nix b/modules/core/terminal/tmux/default.nix index 9a39bf61..96c264c7 100644 --- a/modules/core/terminal/tmux/default.nix +++ b/modules/core/terminal/tmux/default.nix @@ -1,11 +1,15 @@ -{ pkgs, ... }: +{ pkgs, username, ... }: { - # ---- System Configuration ---- - programs = { - tmux = { - enable = true; - newSession = true; - plugins = with pkgs.tmuxPlugins; [ yank ]; + home-manager.users.${username} = _: { + programs = { + tmux = { + enable = true; + newSession = true; + plugins = with pkgs.tmuxPlugins; [ + gruvbox + yank + ]; + }; }; }; } diff --git a/modules/hyprland/config/desktop.nix b/modules/hyprland/config/desktop.nix index f71a135c..df92e305 100644 --- a/modules/hyprland/config/desktop.nix +++ b/modules/hyprland/config/desktop.nix @@ -14,217 +14,219 @@ }; ".config/hypr/hyprland.conf".text = '' - monitor=DP-2,preferred,1080x400,1 - monitor=HDMI-A-1,preferred,3640x400,1 - monitor=DP-1,preferred,0x0,1,transform,3 - monitor=,preferred,auto,auto - - exec-once = swww-daemon & swww img ~/.config/backgrounds/aperture-science-wallpaper-green.jpg & mako & lxqt-policykit-agent & hypridle & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - - # some default env vars. - env=BROWSER,firefox - env=XCURSOR_SIZE,24 - - env=XDG_CURRENT_DESKTOP,Hyprland - env=XDG_SESSION_DESKTOP,Hyprland - env=XDG_SESSION_TYPE,wayland - - env=GDK_BACKEND,wayland,x11 - env=MOZ_ENABLE_WAYLAND,1 - env=MOZ_DISABLE_RDD_SANDBOX,1 - - env=QT_AUTO_SCREEN_SCALE_FACTOR,1 - env=QT_QPA_PLATFORM,wayland - - - $mainMod = SUPER - - bind = $mainMod, q, exec, foot - bind = $mainMod, w, killactive, - bind = $mainMod, f, fullscreen, 1 - bind = $mainMod, a, exec, pavucontrol - bind = $mainMod, v, exec, foot -e nvim - bind = $mainMod, 0, exit, - bind = $mainMod, e, exec, thunar - bind = $mainMod, b, exec, foot -e btop - bind = $mainMod, t, exec, foot -e tmux - bind = $mainMod, g, exec, foot -e firefox - bind = $mainMod, c, togglefloating, - bind = $mainMod, r, exec, wofi --show drun - bind = $mainMod, p, pseudo, # dwindle - bind = $mainMod, j, togglesplit, # dwindle - bind = $mainMod, l, exec, loginctl lock-session - bind = $mainMod, o, exec, bash -i ~/.config/hypr/toggle_waybar.sh - bind = $mainMod, s, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%Y%m%d_%H%M%S').png - - bind = ,XF86AudioMute, exec, ~/.config/hypr/vol.sh --mute - bind = ,XF86AudioLowerVolume, exec, ~/.config/hypr/vol.sh --down - bind = ,XF86AudioRaiseVolume, exec, ~/.config/hypr/vol.sh --up - - bind = ,xF86AudioPlay, exec, playerctl play-pause - bind = ,xF86AudioNext, exec, playerctl next - bind = ,xF86AudioPrev, exec, playerctl previous - - $wA = Alpha - $wB = Bravo - $wC = Charlie - $wD = Delta - $wE = Echo - $wF = Foxtrot - $wG = Golf - $wH = Hotel - $wI = are ya lost bud - - - # for all categories, see https://wiki.hyprland.org/configuring/variables/ - input { - kb_layout = us - follow_mouse = 1 - touchpad { - natural_scroll = no - } - sensitivity = -0.1 # -1.0 - 1.0, 0 means no modification. - } - - general { - gaps_in = 5 - gaps_out = 10 - border_size = 2 - col.active_border = rgba(CB7820ee) rgba(ffffffee) 45deg - col.inactive_border = rgba(595959aa) - layout = dwindle - } - - cursor { - no_hardware_cursors = true - } - - decoration { - rounding = 0 - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) - active_opacity = 1.0 - inactive_opacity = 1.0 - fullscreen_opacity = 1.0 - blur { - enabled = yes - size = 8 - passes = 3 - new_optimizations = true - xray = true - } - } - - animations { - enabled = yes - bezier = snappyBezier, 0.4, 0.0, 0.2, 1.0 - bezier = smoothBezier, 0.25, 0.1, 0.25, 1.0 - animation = windows, 1, 7, smoothBezier, slide - animation = windowsOut, 1, 7, snappyBezier, slide - animation = border, 1, 10, snappyBezier - animation = borderangle, 1, 100, smoothBezier, loop - animation = fade, 1, 7, smoothBezier - animation = workspaces, 1, 6, smoothBezier, slidefadevert 20% - } - - dwindle { - pseudotile = yes # master switch for pseudotiling. enabling is bound to mainmod + p in the keybinds section below - preserve_split = yes # you probably want this - } - - gestures { - workspace_swipe = off - } - - misc { - disable_hyprland_logo = true - enable_swallow = true - swallow_regex = ^(foot)$ - background_color = 0x232136 - } - - windowrulev2 = stayfocused, title:^()$,class:^(steam)$ - windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ - - bind = $mainMod, left, movefocus, l - bind = $mainMod, right, movefocus, r - bind = $mainMod, up, movefocus, u - bind = $mainMod, down, movefocus, d - - bind = $mainMod shift, left, movewindow, l - bind = $mainMod shift, right, movewindow, r - bind = $mainMod shift, up, movewindow, u - bind = $mainMod shift, down, movewindow, d - - workspace=name:$wA,monitor:DP-1 - workspace=name:$wB,monitor:DP-2,default:true - workspace=name:$wC,monitor:HDMI-A-1 - workspace=name:$wD,monitor:DP-2 - workspace=name:$wE,monitor:DP-2 - workspace=name:$wF,monitor:DP-2 - workspace=name:$wG,monitor:DP-2 - workspace=name:$wH,monitor:DP-2 - workspace=name:$wI,monitor:DP-2 - - bind = $mainMod, 1, workspace, name:$wA - - bind = $mainMod, 2, workspace, name:$wB - + monitor=DP-2,preferred,1080x400,1 + monitor=HDMI-A-1,preferred,3640x400,1 + monitor=DP-1,preferred,0x0,1,transform,3 + monitor=,preferred,auto,auto + + exec-once = swww-daemon & swww img ~/.config/backgrounds/aperture-orange-blue.jpg & mako & lxqt-policykit-agent & hypridle & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + + # some default env vars. + env=BROWSER,firefox + env=XCURSOR_SIZE,24 + + env=XDG_CURRENT_DESKTOP,Hyprland + env=XDG_SESSION_DESKTOP,Hyprland + env=XDG_SESSION_TYPE,wayland + + env=GDK_BACKEND,wayland,x11 + env=MOZ_ENABLE_WAYLAND,1 + env=MOZ_DISABLE_RDD_SANDBOX,1 + + env=QT_AUTO_SCREEN_SCALE_FACTOR,1 + env=QT_QPA_PLATFORM,wayland + + + $mainMod = SUPER + + bind = $mainMod, q, exec, foot + bind = $mainMod, w, killactive, + bind = $mainMod, f, fullscreen, 1 + bind = $mainMod, a, exec, pavucontrol + bind = $mainMod, v, exec, foot -e nvim + bind = $mainMod, 0, exit, + bind = $mainMod, e, exec, foot -e yazi + bind = $mainMod, b, exec, foot -e btop + bind = $mainMod, t, exec, foot -e tmux + bind = $mainMod, g, exec, foot -e firefox + bind = $mainMod, c, togglefloating, + bind = $mainMod, r, exec, wofi --show drun + bind = $mainMod, p, pseudo, # dwindle + bind = $mainMod, j, togglesplit, # dwindle + bind = $mainMod, l, exec, loginctl lock-session + bind = $mainMod, o, exec, bash -i ~/.config/hypr/toggle_waybar.sh + bind = $mainMod, s, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%Y%m%d_%H%M%S').png + + bind = ,XF86AudioMute, exec, ~/.config/hypr/vol.sh --mute + bind = ,XF86AudioLowerVolume, exec, ~/.config/hypr/vol.sh --down + bind = ,XF86AudioRaiseVolume, exec, ~/.config/hypr/vol.sh --up + + bind = ,xF86AudioPlay, exec, playerctl play-pause + bind = ,xF86AudioNext, exec, playerctl next + bind = ,xF86AudioPrev, exec, playerctl previous + + $wA = Alpha + $wB = Bravo + $wC = Charlie + $wD = Delta + $wE = Echo + $wF = Foxtrot + $wG = Golf + $wH = Hotel + $wI = are ya lost bud + + + # for all categories, see https://wiki.hyprland.org/configuring/variables/ + input { + kb_layout = us + follow_mouse = 1 + touchpad { + natural_scroll = no + } + sensitivity = -0.1 # -1.0 - 1.0, 0 means no modification. + } + + general { + gaps_in = 5 + gaps_out = 10 + border_size = 2 + col.active_border = rgba(CB7820ee) rgba(0888B9ee) 45deg + col.inactive_border = rgba(595959aa) + layout = dwindle + } + + cursor { + no_hardware_cursors = true + } + + decoration { + rounding = 0 + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) + active_opacity = 1.0 + inactive_opacity = 1.0 + fullscreen_opacity = 1.0 + blur { + enabled = yes + size = 8 + passes = 3 + new_optimizations = true + xray = true + } + } + + animations { + enabled = yes + bezier = snappyBezier, 0.4, 0.0, 0.2, 1.0 + bezier = smoothBezier, 0.25, 0.1, 0.25, 1.0 + animation = windows, 1, 7, smoothBezier, slide + animation = windowsOut, 1, 7, snappyBezier, slide + animation = border, 1, 10, snappyBezier + animation = borderangle, 1, 100, smoothBezier, loop + animation = fade, 1, 7, smoothBezier + animation = workspaces, 1, 6, smoothBezier, slidefadevert 20% + } + + dwindle { + pseudotile = yes # master switch for pseudotiling. enabling is bound to mainmod + p in the keybinds section below + preserve_split = yes # you probably want this + } + + gestures { + workspace_swipe = off + } + + misc { + disable_hyprland_logo = true + enable_swallow = true + swallow_regex = ^(foot)$ + background_color = 0x232136 + } + windowrulev2 = float,title:^(Yazi) + windowrulev2 = size 600 400,title:^(Yazi)(.*)$ + + windowrulev2 = stayfocused, title:^()$,class:^(steam)$ + windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ + + bind = $mainMod, left, movefocus, l + bind = $mainMod, right, movefocus, r + bind = $mainMod, up, movefocus, u + bind = $mainMod, down, movefocus, d + + bind = $mainMod shift, left, movewindow, l + bind = $mainMod shift, right, movewindow, r + bind = $mainMod shift, up, movewindow, u + bind = $mainMod shift, down, movewindow, d + + workspace=name:$wA,monitor:DP-1 + workspace=name:$wB,monitor:DP-2,default:true + workspace=name:$wC,monitor:HDMI-A-1 + workspace=name:$wD,monitor:DP-2 + workspace=name:$wE,monitor:DP-2 + workspace=name:$wF,monitor:DP-2 + workspace=name:$wG,monitor:DP-2 + workspace=name:$wH,monitor:DP-2 + workspace=name:$wI,monitor:DP-2 + + bind = $mainMod, 1, workspace, name:$wA + + bind = $mainMod, 2, workspace, name:$wB + - bind = $mainMod, 3, workspace, name:$wC + bind = $mainMod, 3, workspace, name:$wC + + bind = $mainMod, 4, workspace, name:$wD + + + bind = $mainMod, 5, workspace, name:$wE + - bind = $mainMod, 4, workspace, name:$wD - - - bind = $mainMod, 5, workspace, name:$wE - + bind = $mainMod, 6, workspace, name:$wF + - bind = $mainMod, 6, workspace, name:$wF - + bind = $mainMod, 7, workspace, name:$wG + - bind = $mainMod, 7, workspace, name:$wG - + bind = $mainMod, 8, workspace, name:$wH + - bind = $mainMod, 8, workspace, name:$wH - + bind = $mainMod, 9, workspace, name:$wI + - bind = $mainMod, 9, workspace, name:$wI - + bind = $mainMod SHIFT, 1, movetoworkspace,name:$wA - bind = $mainMod SHIFT, 1, movetoworkspace,name:$wA + bind = $mainMod SHIFT, 2, movetoworkspace,name:$wB + - bind = $mainMod SHIFT, 2, movetoworkspace,name:$wB - + bind = $mainMod SHIFT, 3, movetoworkspace,name:$wC - bind = $mainMod SHIFT, 3, movetoworkspace,name:$wC + bind = $mainMod SHIFT, 4, movetoworkspace,name:$wD - bind = $mainMod SHIFT, 4, movetoworkspace,name:$wD + bind = $mainMod SHIFT, 5, movetoworkspace,name:$wE - bind = $mainMod SHIFT, 5, movetoworkspace,name:$wE + bind = $mainMod SHIFT, 6, movetoworkspace,name:$wF - bind = $mainMod SHIFT, 6, movetoworkspace,name:$wF + bind = $mainMod SHIFT, 7, movetoworkspace,name:$wG - bind = $mainMod SHIFT, 7, movetoworkspace,name:$wG + bind = $mainMod SHIFT, 8, movetoworkspace,name:$wH - bind = $mainMod SHIFT, 8, movetoworkspace,name:$wH + bind = $mainMod SHIFT, 9, movetoworkspace, name:$wI - bind = $mainMod SHIFT, 9, movetoworkspace, name:$wI + # Scroll through existing workspaces with mainMod + scroll + bind = $mainMod, mouse_down, workspace, e+1 + bind = $mainMod, mouse_up, workspace, e-1 - # Scroll through existing workspaces with mainMod + scroll - bind = $mainMod, mouse_down, workspace, e+1 - bind = $mainMod, mouse_up, workspace, e-1 - - # Move/resize windows with mainMod + LMB/RMB and dragging - bindm = $mainMod, mouse:272, movewindow - bindm = $mainMod, mouse:273, resizewindow + # Move/resize windows with mainMod + LMB/RMB and dragging + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow ''; }; }; diff --git a/modules/hyprland/config/laptop.nix b/modules/hyprland/config/laptop.nix index bb287689..b3b3df25 100644 --- a/modules/hyprland/config/laptop.nix +++ b/modules/hyprland/config/laptop.nix @@ -16,7 +16,7 @@ #monitor=edp-1,3840 x 2160,auto,auto monitor=,preferred,auto,auto - exec-once = swww-daemon & swww img ~/.config/backgrounds/porthole.jpg & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + exec-once = swww-daemon & swww img ~/.config/backgrounds/aperture-orange-blue.jpg & mako & lxqt-policykit-agent & hypridle & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # some default env vars. env=BROWSER, firefox @@ -55,14 +55,6 @@ bind = ,xF86AudioNext, exec, playerctl next bind = ,xF86AudioPrev, exec, playerctl previous - $w1 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $w2 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/1A1C23.png" - $w3 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $w4 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $w5 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $w6 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $w7 = hyprctl hyprpaper wallpaper "eDP-1, ~/.config/backgrounds/232136.png" - $wA = Alpha $wB = Bravo $wC = Charlie @@ -87,7 +79,7 @@ gaps_in = 5 gaps_out = 10 border_size = 2 - col.active_border = rgba(0D599Fee) rgba(ffffffee) 45deg + col.active_border = rgba(CB7820ee) rgba(0888B9ee) 45deg col.inactive_border = rgba(595959aa) layout = dwindle resize_on_border = yes diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 380e37f7..ade2ebde 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -27,6 +27,10 @@ #theme.name = "adw-gtk3-dark"; #theme.package = pkgs.adw-gtk3; }; + #programs.eww = { + # enable = true; + # configDir = ./eww; + #}; }; environment = { @@ -45,6 +49,7 @@ xdg-utils xfce.thunar xfce.tumbler + xfce.thunar-volman ]; }; diff --git a/modules/hyprland/swaylock/default.nix b/modules/hyprland/swaylock/default.nix index c4c88201..722b505c 100644 --- a/modules/hyprland/swaylock/default.nix +++ b/modules/hyprland/swaylock/default.nix @@ -17,7 +17,7 @@ home-manager.users.${username} = { home.file = { - ".config/swaylock/background.jpg".source = ../../../assets/backgrounds/aperture-black-blue.jpg; + ".config/swaylock/background.jpg".source = ../../../assets/backgrounds/aperture-orange-blue.jpg; ".config/swaylock/config".text = '' # indicator diff --git a/modules/hyprland/swaylock/nix-wallpaper-dracula.png b/modules/hyprland/swaylock/nix-wallpaper-dracula.png deleted file mode 100644 index 8e439ac5..00000000 Binary files a/modules/hyprland/swaylock/nix-wallpaper-dracula.png and /dev/null differ diff --git a/modules/hyprland/waybar/desktop.nix b/modules/hyprland/waybar/desktop.nix index 1cba3ee8..06c93486 100644 --- a/modules/hyprland/waybar/desktop.nix +++ b/modules/hyprland/waybar/desktop.nix @@ -7,8 +7,8 @@ "layer": "top", "height": 45, "modules-left": ["custom/nix", "cpu", "memory", "disk"], - "modules-center": ["hyprland/window"], - "modules-right": [ "pulseaudio", "network", "clock"], + "modules-center": ["clock","hyprland/workspaces"], + "modules-right": [ "pulseaudio", "network"], "custom/nix": { "format": " ", "tooltip": false, @@ -19,7 +19,7 @@ "separate-outputs": true }, "hyprland/workspaces": { - "format": "{name} {icon}", + "format": "{icon}", "tooltip": false, "all-outputs": true, "format-icons": { @@ -67,10 +67,10 @@ "format-alt": " {:%A %B %d %Y (%V) | %r}", "tooltip-format": "{:%Y %B}\n{calendar}", "calendar-weeks-pos": "right", - "today-format": "{}", - "format-calendar": "{}", - "format-calendar-weeks": "W{:%U}", - "format-calendar-weekdays": "{}", + "today-format": "{}", + "format-calendar": "{}", + "format-calendar-weeks": "W{:%U}", + "format-calendar-weekdays": "{}", "interval": 60 }, "backlight": { @@ -200,7 +200,7 @@ #cpu, #memory, #temperature, #disk, #clock, #backlight, #pulseaudio, #bluetooth, #network, #battery, #custom-power { background-color: transparent; - color: #00ba69; + color: #0888B9; margin-top: 15px; padding-left: 10px; padding-right: 10px; @@ -208,11 +208,11 @@ } #cpu { - color: #FFD700; + color: #CB7820; } #memory { - color: #008000; + color: #0888B9; } #disk { @@ -227,17 +227,17 @@ } #network { - color: #10a140; + color: #0888B9; padding-left: 5px; } #pulseaudio { - color: #ba23d9; + color: #CB7820; padding-left: 5px; } #clock { - color: #00ba69; + color: #0888B9; } ''; }; diff --git a/modules/hyprland/waybar/laptop.nix b/modules/hyprland/waybar/laptop.nix index de6afa2d..701ecc89 100644 --- a/modules/hyprland/waybar/laptop.nix +++ b/modules/hyprland/waybar/laptop.nix @@ -1,4 +1,4 @@ -{ home-manager, username, ... }: +{ username, ... }: { home-manager.users.${username} = _: { home.file = { @@ -15,7 +15,7 @@ "on-click": "/run/current-system/sw/bin/wofi --show drun" }, "hyprland/workspaces": { - "format": "{name} {icon}", + "format": "{icon}", "tooltip": false, "all-outputs": true, "format-icons": { @@ -71,7 +71,7 @@ }, "backlight": { "device": "intel_backlight", - "format": "{icon} {percent}%", + "format": "{icon} {percent}%", "format-icons": ["", "", "", "", "", "", "", "", ""], "on-scroll-up": "brightnessctl set +2%", "on-scroll-down": "brightnessctl set 2%-", @@ -154,7 +154,7 @@ ".config/waybar/style.css".text = '' * { - font-family: 'M+1Code Nerd Font'; + font-family: 'Jetbrains Mono'; font-size: 16px; min-height: 30px; } @@ -165,7 +165,7 @@ #workspaces { background-color: transparent; - color: #0d74bd; + color: #0a60ab; margin-top: 15px; margin-right: 15px; padding-top: 1px; @@ -189,14 +189,14 @@ color: #0a60ab; } - #workspaces button { + #workspaces button.active { background: transparent; - color: #0d74bd; + color: #CB7820; } #cpu, #memory, #temperature, #disk, #clock, #backlight, #pulseaudio, #bluetooth, #network, #battery, #custom-power { background-color: transparent; - color: #00ba69; + color: #0888B9; margin-top: 15px; padding-left: 10px; padding-right: 10px; @@ -204,11 +204,11 @@ } #cpu { - color: #FFD700; + color: #CB7820; } #memory { - color: #008000; + color: #0888B9; } #disk { @@ -223,17 +223,17 @@ } #network { - color: #10a140; + color: #0888B9; padding-left: 5px; } #pulseaudio { - color: #ba23d9; + color: #CB7820; padding-left: 5px; } #clock { - color: #00ba69; + color: #0888B9; } ''; }; diff --git a/modules/hyprland/wofi/default.nix b/modules/hyprland/wofi/default.nix index 60c9fbc1..60a0e7eb 100644 --- a/modules/hyprland/wofi/default.nix +++ b/modules/hyprland/wofi/default.nix @@ -25,110 +25,110 @@ ''; ".config/wofi/style.css".text = '' - * { - transition: 0.2s; - } - - window { - font-family: "IBM Plex Mono"; - font-size: 13px; - } - - window { - margin: 0px; - border: 3px solid #006400; /* Dark green */ - background-color: rgba(21, 48,138,0.7); - background-image: url('/home/${username}/.config/backgrounds/keyboard.png'); - background-size: cover; - background-repeat: no-repeat; - border-radius: 16px; - } - - #input { - position: relative; - padding: 4px; - margin: 20px; - padding-left: 20px; - border: 3px solid #006400; - color: #fff; - font-weight: bold; - background-color: transparent; - outline: none; - border-radius: 16px; - z-index: 1; - } - - #input image { - color: #fff; - } - - #input:focus { - border: none; - outline: none; - } - - #inner-box { - margin: 20px; - margin-top: 0px; - border: none; - color: #006400; /* Dark green */ - border-radius: 16px; - } - - #inner-box * { - transition: none; - } - - #outer-box { - margin: 0px; - border: none; - padding: 0px; - border-radius: 16px; - } - - #scroll { - margin-top: 5px; - border: none; - border-radius: 16px; - margin-bottom: 5px; - } - - #text:selected { - color: #fff; - font-weight: bold; - } - - #img { - margin-right: 20px; - background: transparent; - } - - #text { - color: #fff; - margin: 0px; - border: none; - padding: 0px; - background: transparent; - } - - #entry { - margin: 0px; - border: none; - border-radius: 16px; - background-color: transparent; - min-height:32px; - font-weight: bold; - } - - #entry:selected { - position: relative; - outline: none; - margin: 0px; - border: 3px solid green; - border-radius: 16px; - background-color: transparent; - z-index: 1; - } + * { + transition: 0.2s; + } + + window { + font-family: "IBM Plex Mono"; + font-size: 13px; + } + + window { + margin: 0px; + border: 3px solid #0888B9; + background-color: rgba(21, 48,138,0.7); + background-image: url('/home/${username}/.config/backgrounds/keyboard.png'); + background-size: cover; + background-repeat: no-repeat; + border-radius: 16px; + } + + #input { + position: relative; + padding: 4px; + margin: 20px; + padding-left: 20px; + border: 3px solid #CB7820; + color: #fff; + font-weight: bold; + background-color: transparent; + outline: none; + border-radius: 16px; + z-index: 1; + } + + #input image { + color: #fff; + } + + #input:focus { + border: none; + outline: none; + } + + #inner-box { + margin: 20px; + margin-top: 0px; + border: none; + color: #CB7820; + border-radius: 16px; + } + + #inner-box * { + transition: none; + } + + #outer-box { + margin: 0px; + border: none; + padding: 0px; + border-radius: 16px; + } + + #scroll { + margin-top: 5px; + border: none; + border-radius: 16px; + margin-bottom: 5px; + } + + #text:selected { + color: #fff; + font-weight: bold; + } + + #img { + margin-right: 20px; + background: transparent; + } + + #text { + color: #fff; + margin: 0px; + border: none; + padding: 0px; + background: transparent; + } + + #entry { + margin: 0px; + border: none; + border-radius: 16px; + background-color: transparent; + min-height:32px; + font-weight: bold; + } + + #entry:selected { + position: relative; + outline: none; + margin: 0px; + border: 3px solid orange; + border-radius: 16px; + background-color: transparent; + z-index: 1; + } ''; }; };