megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

chore: update lockfile

Browse source 
• Updated input 'devshell':
    'github:numtide/devshell/d208c58e2f7afef838add5f18a9936b12a71d695' (2023-08-20)
  → 'github:numtide/devshell/1aed986e3c81a4f6698e85a7452cbfcc4b31a36e' (2023-10-27)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
  → 'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29)
• Updated input 'home-manager':
    'github:nix-community/home-manager/958c06303f43cf0625694326b7f7e5475b1a2d5c' (2023-08-20)
  → 'github:nix-community/home-manager/280721186ab75a76537713ec310306f0eba3e407' (2023-11-12)
• Updated input 'hydra':
    'github:NixOS/hydra/60e2c377d305b72cee39c51b5892d215e4238278' (2023-08-03)
  → 'github:NixOS/hydra/33f8a36736ea52d0cc31b947dc7e500134866a92' (2023-10-20)
• Updated input 'hydra/nix':
    'github:NixOS/nix/84050709ea18f3285a85d729f40c8f8eddf5008e' (2023-06-06)
  → 'github:NixOS/nix/a212300a1d9f9c7b0daf19c00c87fc50480f54f4' (2023-07-24)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/63b2189ce81f08ca77894f50e3d484902283189a' (2023-08-20)
  → 'github:hyprwm/Hyprland/0ba2e6870478bcf1af1b6508677b46a3484fb21f' (2023-11-12)
• Updated input 'hyprland/wlroots':
    'gitlab:wlroots/wlroots/c74f89d4f84bfed0284d3908aee5d207698c70c5' (2023-08-03)
  → 'gitlab:wlroots/wlroots/5de9e1a99d6642c2d09d589aa37ff0a8945dcee1' (2023-11-06)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b' (2023-08-12)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/22e7a65ff9633e1dedfa5317fdffc49f68de2ff2' (2023-10-22)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/bef073cff65917ba2d888aa4dc39bd9868e2b0a4' (2023-07-29)
  → 'github:hyprwm/contrib/f2dc4a6a8be9f99177a5ebd23d4e028cbd859237' (2023-11-12)
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/97662e4872b88df79e60be0c27fc277b326fd6e9' (2023-08-16)
  → 'github:Jovian-Experiments/Jovian-NixOS/97dfcb8aa32a0ff07426b01c4d27c674c717ff76' (2023-11-12)
• Updated input 'nix-colors':
    'github:Misterio77/nix-colors/b92df8f5eb1fa20d8e09810c03c9dc0d94ef2820' (2023-04-21)
  → 'github:Misterio77/nix-colors/37227f274b34a3b51649166deb94ce7fec2c6a4c' (2023-09-22)
• Updated input 'nix-colors/base16-schemes':
    'github:tinted-theming/base16-schemes/dc048afa066287a719ddbab62b3e19e4b5110cf0' (2023-04-05)
  → 'github:tinted-theming/base16-schemes/d95123ca6377cd849cfdce92c0a24406b0c6a789' (2023-07-16)
• Updated input 'nix-colors/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a' (2023-04-02)
  → 'github:nix-community/nixpkgs.lib/819180647f428a3826bfc917a54449da1e532ce0' (2023-09-17)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7f1836531b126cfcf584e7d7d71bf8758bb58969' (2023-08-18)
  → 'github:NixOS/nixos-hardware/b689465d0c5d88e158e7d76094fca08cc0223aad' (2023-11-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19)
  → 'github:NixOS/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/1125ed61d8070c4ef9a2ac69a739207ac372936c' (2023-08-21)
  → 'github:nix-community/nixpkgs-wayland/51c0bd3e5d278f8b193657d8deaff6aa90444908' (2023-11-12)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/7966f751e466bf1f7a4120166ff07ec7a753e704' (2023-08-20)
  → 'github:nix-community/lib-aggregate/6c60a229fa422698325b2788e93dfeeba3f11391' (2023-11-12)
• Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/2a3f8763738dca95b14705619c5e489912b7f36a' (2023-08-20)
  → 'github:nix-community/nixpkgs.lib/55682344eae38a1975ccd2cfac0dcb4197faedf8' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/d98c3253176892bba3cfcf240528ffda19490b82' (2023-08-17)
  → 'github:nix-community/nix-eval-jobs/213e801956397b3edc16d0c13a3d479b1e0c65a3' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Added input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions':
    'github:nix-community/nix-github-actions/4bb5e752616262457bc7ca5882192a564c0472d2' (2023-11-03)
• Added input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions/nixpkgs':
    follows 'nixpkgs-wayland/nix-eval-jobs/nixpkgs'
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/ecf0aba4c9e096196f67a862606ba521c67a3e42' (2023-08-17)
  → 'github:NixOS/nixpkgs/44cf4801c0937b76cc6f416a0b160b5d1b3286af' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/treefmt-nix':
    'github:numtide/treefmt-nix/19dee4bf6001849006a63f3435247316b0488e99' (2023-08-12)
  → 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19)
  → 'github:nixos/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04)
• Removed input 'nixpkgs-wayland/nixpkgs_sirula'
• Updated input 'pre-commit-hooks-nix':
    'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
  → 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
• Updated input 'qmk-udev-rules':
    'github:qmk/qmk_firmware/11970b1a52c00526ddd198e54137302b9e52bd70' (2023-08-21)
  → 'github:qmk/qmk_firmware/c2326c05c0778025adc681b962a04626ea6dba77' (2023-11-12)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4f0f113b7dbcb92edb9c901515fcab0b91c6def7' (2023-08-20)
  → 'github:Mic92/sops-nix/2fc3c9edc3029ed396ec917f39a7253acc3d8999' (2023-11-12)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/5e63e8bbc46bc4fc22254da1edaf42fc7549c18a' (2023-08-20)
  → 'github:NixOS/nixpkgs/9502d0245983bb233da8083b55d60d96fd3c29ff' (2023-11-12)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e2761d701581d8dcc4e0e88aecfde317ddf6f0cd' (2023-08-20)
  → 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
• Updated input 'treefmt-nix/nixpkgs':
    'github:nixos/nixpkgs/ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e' (2023-08-10)
  → 'github:nixos/nixpkgs/6500b4580c2a1f3d0f980d32d285739d8e156d92' (2023-09-25)
• Updated input 'xdg-desktop-portal-hyprland':
    'github:hyprwm/xdg-desktop-portal-hyprland/57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b' (2023-08-12)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/b2fc1110963fa583ad5348a9dc0101bd58ceac7a' (2023-11-05)
• Updated input 'xdg-desktop-portal-hyprland/nixpkgs':
    'github:NixOS/nixpkgs/1a411f23ba299db155a5b45d5e145b85a7aafc42' (2023-05-02)
  → 'github:NixOS/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)• Updated input 'devshell':
    'github:numtide/devshell/d208c58e2f7afef838add5f18a9936b12a71d695' (2023-08-20)
  → 'github:numtide/devshell/1aed986e3c81a4f6698e85a7452cbfcc4b31a36e' (2023-10-27)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
  → 'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29)
• Updated input 'home-manager':
    'github:nix-community/home-manager/958c06303f43cf0625694326b7f7e5475b1a2d5c' (2023-08-20)
  → 'github:nix-community/home-manager/280721186ab75a76537713ec310306f0eba3e407' (2023-11-12)
• Updated input 'hydra':
    'github:NixOS/hydra/60e2c377d305b72cee39c51b5892d215e4238278' (2023-08-03)
  → 'github:NixOS/hydra/33f8a36736ea52d0cc31b947dc7e500134866a92' (2023-10-20)
• Updated input 'hydra/nix':
    'github:NixOS/nix/84050709ea18f3285a85d729f40c8f8eddf5008e' (2023-06-06)
  → 'github:NixOS/nix/a212300a1d9f9c7b0daf19c00c87fc50480f54f4' (2023-07-24)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/63b2189ce81f08ca77894f50e3d484902283189a' (2023-08-20)
  → 'github:hyprwm/Hyprland/0ba2e6870478bcf1af1b6508677b46a3484fb21f' (2023-11-12)
• Updated input 'hyprland/wlroots':
    'gitlab:wlroots/wlroots/c74f89d4f84bfed0284d3908aee5d207698c70c5' (2023-08-03)
  → 'gitlab:wlroots/wlroots/5de9e1a99d6642c2d09d589aa37ff0a8945dcee1' (2023-11-06)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b' (2023-08-12)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/22e7a65ff9633e1dedfa5317fdffc49f68de2ff2' (2023-10-22)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/bef073cff65917ba2d888aa4dc39bd9868e2b0a4' (2023-07-29)
  → 'github:hyprwm/contrib/f2dc4a6a8be9f99177a5ebd23d4e028cbd859237' (2023-11-12)
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/97662e4872b88df79e60be0c27fc277b326fd6e9' (2023-08-16)
  → 'github:Jovian-Experiments/Jovian-NixOS/97dfcb8aa32a0ff07426b01c4d27c674c717ff76' (2023-11-12)
• Updated input 'nix-colors':
    'github:Misterio77/nix-colors/b92df8f5eb1fa20d8e09810c03c9dc0d94ef2820' (2023-04-21)
  → 'github:Misterio77/nix-colors/37227f274b34a3b51649166deb94ce7fec2c6a4c' (2023-09-22)
• Updated input 'nix-colors/base16-schemes':
    'github:tinted-theming/base16-schemes/dc048afa066287a719ddbab62b3e19e4b5110cf0' (2023-04-05)
  → 'github:tinted-theming/base16-schemes/d95123ca6377cd849cfdce92c0a24406b0c6a789' (2023-07-16)
• Updated input 'nix-colors/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a' (2023-04-02)
  → 'github:nix-community/nixpkgs.lib/819180647f428a3826bfc917a54449da1e532ce0' (2023-09-17)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7f1836531b126cfcf584e7d7d71bf8758bb58969' (2023-08-18)
  → 'github:NixOS/nixos-hardware/b689465d0c5d88e158e7d76094fca08cc0223aad' (2023-11-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19)
  → 'github:NixOS/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/1125ed61d8070c4ef9a2ac69a739207ac372936c' (2023-08-21)
  → 'github:nix-community/nixpkgs-wayland/51c0bd3e5d278f8b193657d8deaff6aa90444908' (2023-11-12)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/7966f751e466bf1f7a4120166ff07ec7a753e704' (2023-08-20)
  → 'github:nix-community/lib-aggregate/6c60a229fa422698325b2788e93dfeeba3f11391' (2023-11-12)
• Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/2a3f8763738dca95b14705619c5e489912b7f36a' (2023-08-20)
  → 'github:nix-community/nixpkgs.lib/55682344eae38a1975ccd2cfac0dcb4197faedf8' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/d98c3253176892bba3cfcf240528ffda19490b82' (2023-08-17)
  → 'github:nix-community/nix-eval-jobs/213e801956397b3edc16d0c13a3d479b1e0c65a3' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Added input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions':
    'github:nix-community/nix-github-actions/4bb5e752616262457bc7ca5882192a564c0472d2' (2023-11-03)
• Added input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions/nixpkgs':
    follows 'nixpkgs-wayland/nix-eval-jobs/nixpkgs'
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/ecf0aba4c9e096196f67a862606ba521c67a3e42' (2023-08-17)
  → 'github:NixOS/nixpkgs/44cf4801c0937b76cc6f416a0b160b5d1b3286af' (2023-11-12)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/treefmt-nix':
    'github:numtide/treefmt-nix/19dee4bf6001849006a63f3435247316b0488e99' (2023-08-12)
  → 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19)
  → 'github:nixos/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04)
• Removed input 'nixpkgs-wayland/nixpkgs_sirula'
• Updated input 'pre-commit-hooks-nix':
    'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
  → 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
• Updated input 'qmk-udev-rules':
    'github:qmk/qmk_firmware/11970b1a52c00526ddd198e54137302b9e52bd70' (2023-08-21)
  → 'github:qmk/qmk_firmware/c2326c05c0778025adc681b962a04626ea6dba77' (2023-11-12)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4f0f113b7dbcb92edb9c901515fcab0b91c6def7' (2023-08-20)
  → 'github:Mic92/sops-nix/2fc3c9edc3029ed396ec917f39a7253acc3d8999' (2023-11-12)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/5e63e8bbc46bc4fc22254da1edaf42fc7549c18a' (2023-08-20)
  → 'github:NixOS/nixpkgs/9502d0245983bb233da8083b55d60d96fd3c29ff' (2023-11-12)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e2761d701581d8dcc4e0e88aecfde317ddf6f0cd' (2023-08-20)
  → 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
• Updated input 'treefmt-nix/nixpkgs':
    'github:nixos/nixpkgs/ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e' (2023-08-10)
  → 'github:nixos/nixpkgs/6500b4580c2a1f3d0f980d32d285739d8e156d92' (2023-09-25)
• Updated input 'xdg-desktop-portal-hyprland':
    'github:hyprwm/xdg-desktop-portal-hyprland/57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b' (2023-08-12)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/b2fc1110963fa583ad5348a9dc0101bd58ceac7a' (2023-11-05)
• Updated input 'xdg-desktop-portal-hyprland/nixpkgs':
    'github:NixOS/nixpkgs/1a411f23ba299db155a5b45d5e145b85a7aafc42' (2023-05-02)
  → 'github:NixOS/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)

fix: darkman is now part of home-manager
fix: remove pulseeffects-pw package
fix: force luks keyFile setting (weird bug?)
fix: helix config with new multi-language-server support
fix: replace exa -> eza
fix: pin nvidia version, since this update breaks backlights on the thinkpad
fix: drop waybar overlay and use new hyprland/workspaces module
fix: update darkman to fix reference to /bin/bash
This commit is contained in:
Malte Tammena 2023-11-12 22:33:39 +01:00
parent df0cf8b9dd
commit 2c61e77e94
21 changed files with 313 additions and 445 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

244
flake.lock
View file

@ -37,11 +37,11 @@
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1680729003,
"narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=",
"lastModified": 1689473676,
"narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0",
"rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",
"type": "github"
},
"original": {
@ -103,11 +103,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1692523566,
"narHash": "sha256-VDJDihK6jNebVw9y3qKCVD6+6QaC/x8kxZzL4MaIPPY=",
"lastModified": 1698410321,
"narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=",
"owner": "numtide",
"repo": "devshell",
"rev": "d208c58e2f7afef838add5f18a9936b12a71d695",
"rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e",
"type": "github"
},
"original": {
@ -498,11 +498,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
@ -560,11 +560,11 @@
]
},
"locked": {
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
@ -668,11 +668,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -835,11 +835,11 @@
]
},
"locked": {
"lastModified": 1692503956,
"narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=",
"lastModified": 1699783872,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c",
"rev": "280721186ab75a76537713ec310306f0eba3e407",
"type": "github"
},
"original": {
@ -854,11 +854,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1691075361,
"narHash": "sha256-xl8rVC4hbnQwzso6sLsNOePCQeuHseKsbnP5+y9Hii4=",
"lastModified": 1697810598,
"narHash": "sha256-ovt2GZQ4Ia+q6D0XboBNIdXrzy1rWC52UYzxmcMlgYk=",
"owner": "NixOS",
"repo": "hydra",
"rev": "60e2c377d305b72cee39c51b5892d215e4238278",
"rev": "33f8a36736ea52d0cc31b947dc7e500134866a92",
"type": "github"
},
"original": {
@ -878,11 +878,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1692573300,
"narHash": "sha256-5qDXNbLXpMK/3mGueF82PbA7h8p0r7c1uHCC2iGN78k=",
"lastModified": 1699808562,
"narHash": "sha256-wTU1ivhWAAGWO6Fzx4RYFruW8HrIh5X7fjy5NJPaqOc=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "63b2189ce81f08ca77894f50e3d484902283189a",
"rev": "0ba2e6870478bcf1af1b6508677b46a3484fb21f",
"type": "github"
},
"original": {
@ -898,11 +898,11 @@
]
},
"locked": {
"lastModified": 1690635289,
"narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=",
"lastModified": 1699804941,
"narHash": "sha256-noxbidHzQSGS0jY9M5aWIq7yhVSXz8rzTEu53uiTu+c=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4",
"rev": "f2dc4a6a8be9f99177a5ebd23d4e028cbd859237",
"type": "github"
},
"original": {
@ -964,11 +964,11 @@
"jovian-nixos": {
"flake": false,
"locked": {
"lastModified": 1692160665,
"narHash": "sha256-MKjvQuArGltIhZh6m23hSdogRr8DxwGqSwt0DlTlUbc=",
"lastModified": 1699775106,
"narHash": "sha256-NzzQqHpCn5zg58hUF0W3V3sqJuuKGc31hTMBNfEXpr4=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "97662e4872b88df79e60be0c27fc277b326fd6e9",
"rev": "97dfcb8aa32a0ff07426b01c4d27c674c717ff76",
"type": "github"
},
"original": {
@ -983,11 +983,11 @@
"nixpkgs-lib": "nixpkgs-lib_5"
},
"locked": {
"lastModified": 1692533257,
"narHash": "sha256-RmgDJwMCZC5JFAkXhY6MT5jJPbc0XoO5gbQlHbfaPU0=",
"lastModified": 1699790908,
"narHash": "sha256-8CO4KQhiEyO7rce4KVOq8arpk9802fVwxtN/oLeRFag=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "7966f751e466bf1f7a4120166ff07ec7a753e704",
"rev": "6c60a229fa422698325b2788e93dfeeba3f11391",
"type": "github"
},
"original": {
@ -1079,16 +1079,16 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1686048923,
"narHash": "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU=",
"lastModified": 1690219894,
"narHash": "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8=",
"owner": "NixOS",
"repo": "nix",
"rev": "84050709ea18f3285a85d729f40c8f8eddf5008e",
"rev": "a212300a1d9f9c7b0daf19c00c87fc50480f54f4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "2.16.1",
"ref": "2.17.0",
"repo": "nix",
"type": "github"
}
@ -1099,11 +1099,11 @@
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
"lastModified": 1682108218,
"narHash": "sha256-tMr7BbxualFQlN+XopS8rMMgf2XR9ZfRuwIZtjsWmfI=",
"lastModified": 1695388192,
"narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",
"owner": "Misterio77",
"repo": "nix-colors",
"rev": "b92df8f5eb1fa20d8e09810c03c9dc0d94ef2820",
"rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",
"type": "github"
},
"original": {
@ -1115,15 +1115,16 @@
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_6",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1692235634,
"narHash": "sha256-/LkGxVlNnm2OXsDB6H7qDoAlcAt9xNSPaLlpulaFOcs=",
"lastModified": 1699796151,
"narHash": "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "d98c3253176892bba3cfcf240528ffda19490b82",
"rev": "213e801956397b3edc16d0c13a3d479b1e0c65a3",
"type": "github"
},
"original": {
@ -1132,6 +1133,28 @@
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698974481,
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-pypi-fetcher": {
"flake": false,
"locked": {
@ -1166,11 +1189,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1692373088,
"narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
"lastModified": 1699701045,
"narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
"rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
"type": "github"
},
"original": {
@ -1216,11 +1239,11 @@
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1690881714,
"narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e1960bc196baf6881340d53dccb203a951745a2",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
@ -1251,11 +1274,11 @@
},
"nixpkgs-lib_4": {
"locked": {
"lastModified": 1680397293,
"narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=",
"lastModified": 1694911725,
"narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a",
"rev": "819180647f428a3826bfc917a54449da1e532ce0",
"type": "github"
},
"original": {
@ -1266,11 +1289,11 @@
},
"nixpkgs-lib_5": {
"locked": {
"lastModified": 1692492218,
"narHash": "sha256-sBj4dllTXEuBzVUaXGvWrQt3iwr64wlnVP26ZcaND0E=",
"lastModified": 1699750082,
"narHash": "sha256-4Vx6Vr975vPGzGACyu4u6JfWo2Auwy0AeC6sTSOXdTQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "2a3f8763738dca95b14705619c5e489912b7f36a",
"rev": "55682344eae38a1975ccd2cfac0dcb4197faedf8",
"type": "github"
},
"original": {
@ -1345,11 +1368,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1692492726,
"narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=",
"lastModified": 1699756042,
"narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e63e8bbc46bc4fc22254da1edaf42fc7549c18a",
"rev": "9502d0245983bb233da8083b55d60d96fd3c29ff",
"type": "github"
},
"original": {
@ -1364,15 +1387,14 @@
"flake-compat": "flake-compat_6",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_13",
"nixpkgs_sirula": "nixpkgs_sirula"
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1692609352,
"narHash": "sha256-sQ0oxzFfVXUmbAVQlEUDEpbmFIOa2BolgXmfGbOWu7Q=",
"lastModified": 1699800004,
"narHash": "sha256-d4VPSRMr0hvmOT3I3LNQ+ixRiS1dYY1txepM2Ox1VTU=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "1125ed61d8070c4ef9a2ac69a739207ac372936c",
"rev": "51c0bd3e5d278f8b193657d8deaff6aa90444908",
"type": "github"
},
"original": {
@ -1429,11 +1451,11 @@
},
"nixpkgs_11": {
"locked": {
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
@ -1444,11 +1466,11 @@
},
"nixpkgs_12": {
"locked": {
"lastModified": 1692233877,
"narHash": "sha256-gtYcf70quK6YBuWsDER3ayz4Tc0h1jbDDrsvQqiMXms=",
"lastModified": 1699794571,
"narHash": "sha256-a9fa+AYCSiL1w9GBz4bIoj/rw4hZIntpaCdhXqHSLfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ecf0aba4c9e096196f67a862606ba521c67a3e42",
"rev": "44cf4801c0937b76cc6f416a0b160b5d1b3286af",
"type": "github"
},
"original": {
@ -1460,11 +1482,11 @@
},
"nixpkgs_13": {
"locked": {
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
@ -1492,11 +1514,11 @@
},
"nixpkgs_15": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"lastModified": 1695644571,
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
"type": "github"
},
"original": {
@ -1508,11 +1530,11 @@
},
"nixpkgs_16": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"lastModified": 1694183432,
"narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
"type": "github"
},
"original": {
@ -1648,22 +1670,6 @@
"type": "github"
}
},
"nixpkgs_sirula": {
"locked": {
"lastModified": 1682879489,
"narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
}
},
"poetry2nix": {
"flake": false,
"locked": {
@ -1778,11 +1784,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1692274144,
"narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
"lastModified": 1699271226,
"narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
"rev": "ea758da1a6dcde6dc36db348ed690d09b9864128",
"type": "github"
},
"original": {
@ -1855,11 +1861,11 @@
"qmk-udev-rules": {
"flake": false,
"locked": {
"lastModified": 1692588298,
"narHash": "sha256-6OhNY9CtWOYWaUd1qdU5hyKdDXKcyHpik61Dxbh7Z6s=",
"lastModified": 1699767031,
"narHash": "sha256-qpOAIEuYTkjlkPCYaw4wBOnWyjxZYrC5k44wgRN9Wy0=",
"owner": "qmk",
"repo": "qmk_firmware",
"rev": "11970b1a52c00526ddd198e54137302b9e52bd70",
"rev": "c2326c05c0778025adc681b962a04626ea6dba77",
"type": "github"
},
"original": {
@ -1899,11 +1905,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1692500916,
"narHash": "sha256-iKADqEOHmyi+LCJ5LzWcM2zH0DP3WHFETjX98blH0tE=",
"lastModified": 1699770333,
"narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4f0f113b7dbcb92edb9c901515fcab0b91c6def7",
"rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999",
"type": "github"
},
"original": {
@ -2032,11 +2038,11 @@
]
},
"locked": {
"lastModified": 1691833704,
"narHash": "sha256-ASGhgGduEgcD3gQZhGr8xtmZ3PlVY+m2HuPnIZDbu78=",
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "19dee4bf6001849006a63f3435247316b0488e99",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
@ -2050,11 +2056,11 @@
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1692524468,
"narHash": "sha256-wJffwu1deOgc3c/cBIZQ52dfWfPWBzjOamYBX121hcw=",
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e2761d701581d8dcc4e0e88aecfde317ddf6f0cd",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
@ -2067,18 +2073,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1691073628,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
"lastModified": 1699292815,
"narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab"
}
},
@ -2089,11 +2095,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"lastModified": 1699146051,
"narHash": "sha256-L29h9vE6t97Vx/5FsRmDb+RnKcbnyJtilflJtb4++Vs=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"rev": "b2fc1110963fa583ad5348a9dc0101bd58ceac7a",
"type": "github"
},
"original": {
@ -2118,11 +2124,11 @@
]
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"lastModified": 1697981233,
"narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -77,7 +77,6 @@
netcat-openbsd = super.libressl.nc;
})
(import ./overlays/qmk-udev-rules.nix)
(import ./overlays/waybar-hypr.nix)
];
# Modules useful to most of my systems
modulesSharedByAllSystems = [

8
hardware/asrock-z370-i3-black-box.nix
View file

@ -1,4 +1,8 @@
{modulesPath, ...}: let
{
lib,
modulesPath,
...
}: let
cryptRoot.encrypted = {
enable = true;
blkDev = "/dev/disk/by-id/nvme-Samsung_SSD_960_PRO_512GB_S3EWNCAJ110156V-part3";
@ -25,7 +29,7 @@ in {
# === Drives ===
boot.initrd.luks.devices.crypt-root = {
allowDiscards = true;
keyFile = "/dev/disk/by-id/usb-General_USB_Flash_Disk_0416KKFIDFY07WXD-0:0";
keyFile = lib.mkForce "/dev/disk/by-id/usb-General_USB_Flash_Disk_0416KKFIDFY07WXD-0:0";
keyFileSize = 4096;
fallbackToPassword = true;
device = cryptRoot.encrypted.blkDev;

11
hashes.nix
View file

@ -8,11 +8,6 @@
hash = "sha256-zQdnDZwFd7KkSoLyu3Ty/YDn7qosTIf2n02PHitGf2g=";
"rustyline-1.0.0" = "sha256-FFuhLmBwt5e/zOJfkz4NCuI8lG/sBhGOcxst8d+oOVk=";
};
darkman = {
rev = "b4c9bbc";
hash = "sha256-/r3mcwkdFyZQZV3jRJQladujBFvBmm8XhncbePTFlLA=";
vendorSha256 = "sha256-CGgWEaHztWeCQPIrobwLHuDkFauJM19hBU7JsA3HMic=";
};
boilr = {
version = "1.9.1";
hash = "sha256-mdkRuEzfWhdbX0DD6uwc1o8kXjqk1Y0+FFKHrM2m81w=";
@ -35,4 +30,10 @@
version = "1.22.3";
hash = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8=";
};
darkman = {
version = "1.5.4-with-bash-fix";
rev = "a6ef253d912b7a139e06c7d69baa490105cce045";
hash = "sha256-NVlK2lA0TBtCdR1Yjq2cV+ML+bJjBKk/oCEIaBzZDOE=";
vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY=";
};
}

1
hosts/helix-texta.nix
View file

@ -13,6 +13,7 @@
inputs.custom-udev-rules.nixosModule
../hardware/thinkpad-p1-gen3.nix
../modules/light-actkbd.nix
../modules/nvidia-fixed.nix
];
config = {

3
modules/base-system.nix
View file

@ -25,7 +25,6 @@ in {
./restic.nix
./taskserver.nix
./wakeup.nix
./darkman.nix
./state.nix
];
@ -47,11 +46,11 @@ in {
# Some overlays
nixpkgs.overlays = [
(_: super: {
darkman = super.callPackage ../pkgs/darkman.nix {};
"2i-emulator" = super.callPackage ../pkgs/2i-emulator.nix {};
boilr = super.callPackage ../pkgs/boilr.nix {};
# Add fonts
hackNerdLigatures = super.callPackage ../pkgs/hack.nix {};
darkman = super.callPackage ../pkgs/darkman.nix {};
})
];
# This includes the firmware, oc

16
modules/darkman.nix
View file

@ -1,16 +0,0 @@
{
pkgs,
lib,
config,
...
}: let
cfg = config.services.darkman;
in {
options.services.darkman.enable = lib.mkEnableOption "darkman, the light/dark mode switcher";
config = lib.mkIf cfg.enable {
services.dbus.packages = [pkgs.darkman];
environment.systemPackages = [pkgs.darkman];
systemd.packages = [pkgs.darkman];
};
}

1
modules/malte.nix
View file

@ -39,7 +39,6 @@ in {
home-manager.users.malte.imports = [../users/malte/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
programs.fish.enable = true;
services.darkman.enable = true;
services.udev.packages = [
pkgs.android-udev-rules

36
modules/nvidia-fixed.nix Normal file
View file

@ -0,0 +1,36 @@
{
lib,
pkgs,
...
}: let
# get the last working revision with nvidia 410.x
nixos-unstable-pinned =
import (pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "d680ded26da5cf104dd2735a51e88d2d8f487b4d";
sha256 = "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=";
}) {
system = "x86_64-linux";
config.allowUnfree = true;
};
# We'll use this twice
pinnedKernelPackages = nixos-unstable-pinned.linuxPackages_latest;
in {
nixpkgs.config.packageOverrides = pkgs: {
# swap out all of the linux packages
linuxPackages_latest = pinnedKernelPackages;
oldLinuxPackages = pkgs.linuxPackages_latest;
# make sure x11 will use the correct package as well
nvidia_x11 = nixos-unstable-pinned.nvidia_x11;
};
# line up your kernel packages at boot
boot.kernelPackages = pinnedKernelPackages;
warnings =
lib.optional (pkgs.oldLinuxPackages.nvidia_x11.version != "545.29.02")
"New nvidia drivers (${pkgs.oldLinuxPackages.nvidia_x11.version}) available, does this fix the backlight issues on the thinkpad?";
}

13
overlays/waybar-hypr.nix
View file

@ -1,13 +0,0 @@
_self: super: {
waybar-hypr = super.waybar.overrideAttrs (old: {
pname = "waybar-hypr";
patchPhase = ''
sed -i -e 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp
'';
mesonFlags =
old.mesonFlags
++ [
"-Dexperimental=true"
];
});
}

45
pkgs/darkman.nix
View file

@ -1,47 +1,56 @@
{
lib,
buildGoModule,
fetchFromGitLab,
buildGoModule,
scdoc,
geoclue2,
bash,
nix-update-script,
...
}: let
hashes = (builtins.import ../hashes.nix).darkman;
in
buildGoModule {
pname = "darkman";
version = hashes.rev;
version = "1.5.4-with-bash-fix";
src = fetchFromGitLab {
owner = "WhyNotHugo";
repo = "darkman";
inherit (hashes) hash rev;
inherit (hashes) rev hash;
};
inherit (hashes) vendorHash;
nativeBuildInputs = [scdoc];
propagatedBuildInputs = [geoclue2 bash];
inherit (hashes) vendorSha256;
patchPhase = ''
sed -i "s|^ExecStart=/usr/bin/darkman run$|ExecStart=$out/bin/darkman run|" darkman.service
sed -i "s|bash|${bash}/bin/bash|" scripts.go
postPatch = ''
substituteInPlace darkman.service \
--replace "/usr/bin/darkman" "$out/bin/darkman"
substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \
--replace "/usr/bin/darkman" "$out/bin/darkman"
substituteInPlace contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \
--replace "/usr/bin/darkman" "$out/bin/darkman"
'';
postBuild = ''
buildPhase = ''
runHook preBuild
make build
runHook postBuild
'';
installPhase = ''
mkdir -p $out
make install PREFIX=/ DESTDIR=$out
runHook preInstall
make PREFIX=$out install
runHook postInstall
'';
meta = {
description = "🌇 Framework for dark-mode and light-mode transitions on Linux desktop";
passthru.updateScript = nix-update-script {};
meta = with lib; {
description = "Framework for dark-mode and light-mode transitions on Linux desktop";
homepage = "https://gitlab.com/WhyNotHugo/darkman";
license = lib.licenses.isc;
maintainers = [];
license = licenses.isc;
maintainers = [maintainers.ajgrf];
platforms = platforms.linux;
mainProgram = "darkman";
};
}

25
users/malte/git.nix
View file

@ -50,21 +50,12 @@ in {
delta.enable = false;
};
services.darkman.scripts."git-delta.sh" = {
onLight = pkgs.writeScript "git-delta-light" ''
#!${pkgs.runtimeShell}
${linkDeltaConfig lightDeltaConf}
'';
onDark = pkgs.writeScript "git-delta-dark" ''
#!${pkgs.runtimeShell}
${linkDeltaConfig darkDeltaConf}
'';
initialize = pkgs.writeScript "git-delta-initialize" ''
# Create the folder
mkdir -p ${configDir}
if [[ ! -e ${deltaConfig} ]]; then
${linkDeltaConfig lightDeltaConf}
fi
'';
};
services.darkman.lightModeScripts."git-delta.sh" = ''
mkdir -p ${configDir}
${linkDeltaConfig lightDeltaConf}
'';
services.darkman.darkModeScripts."git-delta.sh" = ''
mkdir -p ${configDir}
${linkDeltaConfig darkDeltaConf}
'';
}

16
users/malte/gtk.nix
View file

@ -19,14 +19,10 @@ in {
};
};
services.darkman.scripts."gtk.sh" = {
onLight = pkgs.writeScript "gtk-light" ''
#!${pkgs.runtimeShell}
${pkgs.dconf}/bin/dconf write /org/gnome/desktop/interface/gtk-theme "'${config.colorsLight.slug}'"
'';
onDark = pkgs.writeScript "gtk-dark" ''
#!${pkgs.runtimeShell}
${pkgs.dconf}/bin/dconf write /org/gnome/desktop/interface/gtk-theme "'${config.colorsDark.slug}'"
'';
};
services.darkman.lightModeScripts."gtk.sh" = ''
${pkgs.dconf}/bin/dconf write /org/gnome/desktop/interface/gtk-theme "'${config.colorsLight.slug}'"
'';
services.darkman.darkModeScripts."gtk.sh" = ''
${pkgs.dconf}/bin/dconf write /org/gnome/desktop/interface/gtk-theme "'${config.colorsDark.slug}'"
'';
}

116
users/malte/helix.nix
View file

@ -36,61 +36,17 @@
darkConfigFile = tomlFormat.generate "config.toml" darkConfig;
extraLanguages = (pkgs.formats.toml {}).generate "languages.toml" {
language = [
{
name = "json";
scope = "source.json";
injection-regex = "json";
file-types = ["json"];
roots = [];
language-server = {
command = "${pkgs.nodePackages.vscode-json-languageserver}/bin/vscode-json-languageserver";
args = ["--stdio"];
};
auto-format = true;
config = {"provideFormatter" = true;};
indent = {
tab-width = 2;
unit = " ";
};
}
{
name = "html";
language-server = {
command = "${pkgs.nodePackages.vscode-html-languageserver-bin}/bin/html-languageserver";
args = ["--stdio"];
};
}
{
name = "css";
language-server = {
command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver";
args = ["--stdio"];
};
}
{
name = "beancount";
language-server = {
command = "${pkgs.beancount-language-server}/bin/beancount-language-server";
args = ["--stdio"];
};
language-server = {
beancount-lsp = {
name = "beancount-language-server";
command = "${pkgs.beancount-language-server}/bin/beancount-language-server";
args = ["--stdio"];
config.journal_file = "/home/malte/repos/accounting/main.bean";
}
{
name = "vue";
file-types = ["vue"];
language-server = {
command = "vue-language-server";
args = ["--stdio"];
};
scope = "text.html.vue";
roots = ["package.json"];
injection-regex = "vue";
auto-format = false;
indent = {
tab-width = 4;
unit = " ";
};
};
vuels = {
name = "vuels";
command = "vue-language-server";
args = ["--stdio"];
config = {
typescript.serverPath = "${pkgs.nodePackages.typescript}/lib/node_modules/typescript/lib/tsserverlibrary.js";
languageFeatures = {
@ -123,6 +79,33 @@
documentFormatting.defaultPrintWidth = 100;
};
};
};
};
language = [
{
name = "beancount";
language-servers = [
{
name = "beancount-language-server";
}
];
}
{
name = "vue";
file-types = ["vue"];
language-servers = [
{
name = "vuels";
}
];
scope = "text.html.vue";
roots = ["package.json"];
injection-regex = "vue";
auto-format = false;
indent = {
tab-width = 4;
unit = " ";
};
}
];
};
@ -130,7 +113,6 @@ in {
home.packages = with pkgs; [
helix
# Some helpful language servers
rnix-lsp
yaml-language-server
python311Packages.python-lsp-server
nodePackages.bash-language-server
@ -145,20 +127,12 @@ in {
xdg.configFile."helix/languages.toml".source = extraLanguages;
services.darkman.scripts."helix.sh" = {
onLight = pkgs.writeScript "helix-light" ''
#!${pkgs.runtimeShell}
${installConfig lightConfigFile}
'';
onDark = pkgs.writeScript "helix-dark" ''
#!${pkgs.runtimeShell}
${installConfig darkConfigFile}
'';
initialize = pkgs.writeScript "helix-initialize" ''
mkdir -p $(dirname ${configFilePath})
if [[ ! -e ${configFilePath} ]]; then
${installConfig lightConfigFile}
fi
'';
};
services.darkman.lightModeScripts."helix.sh" = ''
mkdir -p $(dirname ${configFilePath})
${installConfig lightConfigFile}
'';
services.darkman.darkModeScripts."helix.sh" = ''
mkdir -p $(dirname ${configFilePath})
${installConfig darkConfigFile}
'';
}

26
users/malte/home.nix
View file

@ -36,13 +36,14 @@
];
};
firefoxWithProfile = exe: profile: pkgs.writeShellApplication {
name = exe;
runtimeInputs = [ pkgs.firefox ];
text = ''
firefox -P "${profile}"
'';
};
firefoxWithProfile = exe: profile:
pkgs.writeShellApplication {
name = exe;
runtimeInputs = [pkgs.firefox];
text = ''
firefox -P "${profile}"
'';
};
in {
imports = [
./git.nix
@ -62,7 +63,6 @@ in {
../modules/restic-backup.nix
../modules/synchronize-calendars.nix
../modules/protonmail-bridge.nix
../modules/darkman.nix
../modules/colors.nix
];
@ -89,7 +89,6 @@ in {
]
++ (with pkgs; [
aseprite
darkman
alejandra
element-desktop-wayland
signal-desktop # FIXME: Once it works again? (fixElectron "signal-desktop" signal-desktop)
@ -117,7 +116,6 @@ in {
pdftk
ponymix
pulseaudio
pulseeffects-pw
python3
qt5ct
rtorrent
@ -213,7 +211,13 @@ in {
services.protonmailBridge.enable = true;
services.darkman.enable = true;
services.darkman = {
enable = true;
settings = {
lat = 51.34;
lng = 12.36;
};
};
fonts.fontconfig.enable = true;

2
users/malte/hypr.nix
View file

@ -102,7 +102,7 @@
$green = 98971a
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=${pkgs.waybar-hypr}/bin/waybar
exec-once=${pkgs.waybar}/bin/waybar
exec-once=${pkgs.hyprpaper}/bin/hyprpaper
exec-once=${runWob}/bin/run-wob

25
users/malte/kitty.nix
View file

@ -38,21 +38,12 @@ in {
xdg.configFile."kitty/themes/Light.conf".source = lightTheme;
xdg.configFile."kitty/themes/Dark.conf".source = darkTheme;
services.darkman.scripts."kitty.sh" = {
onLight = pkgs.writeScript "kitty-light" ''
#!${pkgs.runtimeShell}
${loadTheme "Light"}
'';
onDark = pkgs.writeScript "kitty-dark" ''
#!${pkgs.runtimeShell}
${loadTheme "Dark"}
'';
initialize = pkgs.writeScript "kitty-initialize" ''
# Create the folder
mkdir -p ${configDir}
if [[ ! -e ${configDir}/${themeConfigFile} ]]; then
${loadTheme "Light"}
fi
'';
};
services.darkman.lightModeScripts."kitty.sh" = ''
mkdir -p ${configDir}
${loadTheme "Light"}
'';
services.darkman.darkModeScripts."kitty.sh" = ''
mkdir -p ${configDir}
${loadTheme "Dark"}
'';
}

48
users/malte/shell.nix
View file

@ -1,4 +1,9 @@
{pkgs, ...}: {
{pkgs, ...}: let
setBatTheme = theme: ''
mkdir -p ~/.config/bat
echo '--theme=${theme}' > ~/.config/bat/config
'';
in {
home.packages = with pkgs; [
bottom
fd
@ -29,11 +34,11 @@
hl = "hledger";
l = "exa -la";
ll = "exa -lh";
lt = "exa -aT --icons --git-ignore -I .git";
ltg = "exa -aT --icons --git-ignore -I .git --git";
llt = "exa -laT --icons --git-ignore -I .git --git";
l = "eza -la";
ll = "eza -lh";
lt = "eza -aT --icons --git-ignore -I .git";
ltg = "eza -aT --icons --git-ignore -I .git --git";
llt = "eza -laT --icons --git-ignore -I .git --git";
".." = "cd ..";
"..." = "cd ../..";
@ -142,7 +147,7 @@
};
};
programs.exa = {
programs.eza = {
enable = true;
enableAliases = true;
};
@ -181,27 +186,10 @@
};
};
services.darkman.scripts."bat.sh" = let
batConfigDir = "~/.config/bat";
batConfig = "${batConfigDir}/config";
setBatTheme = theme: ''
echo '--theme=${theme}' > ${batConfig}
'';
in {
onLight = pkgs.writeScript "bat-light" ''
#!${pkgs.runtimeShell}
${setBatTheme "gruvbox-light"}
'';
onDark = pkgs.writeScript "bat-dark" ''
#!${pkgs.runtimeShell}
${setBatTheme "gruvbox-dark"}
'';
initialize = pkgs.writeScript "initializeBatTheme" ''
# Create the folder
mkdir -p ${batConfigDir}
if [[ ! -e ${batConfig} ]]; then
${setBatTheme "gruvbox-light"}
fi
'';
};
services.darkman.darkModeScripts."bat.sh" = ''
${setBatTheme "gruvbox-dark"}
'';
services.darkman.lightModeScripts."bat.sh" = ''
${setBatTheme "gruvbox-light"}
'';
}

4
users/malte/waybar.nix
View file

@ -112,7 +112,7 @@ in {
layer = "top";
position = "top";
modules-left = ["wlr/workspaces" "hyprland/window"];
modules-left = ["hyprland/workspaces" "hyprland/window"];
modules-center = ["clock#time" "custom/check-system" "clock#date"];
modules-right =
["custom/do-not-disturb" "custom/taskwarrior" "custom/new-mail" "network"]
@ -120,7 +120,7 @@ in {
++ ["tray"];
modules = {
"wlr/workspaces" = {
"hyprland/workspaces" = {
disable-scroll = true;
all-outputs = true;
on-click = "activate";

25
users/malte/zathura.nix
View file

@ -30,21 +30,12 @@ in {
'';
};
services.darkman.scripts."zathura.sh" = {
onLight = pkgs.writeScript "zathura-light" ''
#!${pkgs.runtimeShell}
${linkTheme lightTheme}
'';
onDark = pkgs.writeScript "zathura-dark" ''
#!${pkgs.runtimeShell}
${linkTheme darkTheme}
'';
initialize = pkgs.writeScript "zathura-initialize" ''
# Create the folder
mkdir -p ${configDir}
if [[ ! -e ${configDir}/${themeConfigFile} ]]; then
${linkTheme lightTheme}
fi
'';
};
services.darkman.lightModeScripts."zathura.sh" = ''
mkdir -p ${configDir}
${linkTheme lightTheme}
'';
services.darkman.darkModeScripts."zathura.sh" = ''
mkdir -p ${configDir}
${linkTheme darkTheme}
'';
}

92
users/modules/darkman.nix
View file

@ -1,92 +0,0 @@
{
pkgs,
lib,
config,
...
}: let
cfg = config.services.darkman;
hasInitScript = _name: conf: (builtins.hasAttr "initialize" conf) && (conf.initialize != null);
mkActivationEntry = name: conf: {
name = "darkman-initialize-${name}";
value = lib.hm.dag.entryAfter ["writeBoundary"] ''
$VERBOSE_ECHO "darkman: initializing ${name}"
if [[ -v DRY_RUN ]]; then
$DRY_RUN_CMD ${conf.initialize}
else
${conf.initialize}
fi
'';
};
mkLightPath = path: "light-mode.d/${path}";
mkDarkPath = path: "dark-mode.d/${path}";
in {
options.services.darkman = with lib; {
enable = mkEnableOption "darkman, the darkmode switcher";
scripts = mkOption {
description = "Darkman scripts";
type = with types;
attrsOf (uniq (submodule {
options = {
onLight = mkOption {
description = "Script to execute when lightmode is activated";
type = path;
};
onDark = mkOption {
description = "Script to execute when darkmode is activated";
type = path;
};
initialize = mkOption {
description = "Script to create the initial config. This will be run during config building";
default = null;
type = nullOr path;
};
};
}));
};
};
config = lib.mkIf cfg.enable {
# TODO: Replace with upstream/packaged version when WantedBy is fixed
systemd.user.services."darkman" = {
Unit = {
Description = "Framework for dark-mode and light-mode transitions.";
Documentation = "man:darkman(1)";
PartOf = "graphical-session.target";
BindsTo = "graphical-session.target";
};
Service = {
Type = "dbus";
BusName = "nl.whynothugo.darkman";
ExecStart = "${pkgs.darkman}/bin/darkman run";
Restart = "on-failure";
TimeoutStopSec = "15";
Slice = "background.slice";
# Security hardening:
LockPersonality = "yes";
RestrictNamespaces = "yes";
SystemCallArchitectures = "native";
SystemCallFilter = "@system-service @timer";
MemoryDenyWriteExecute = "yes";
};
Install.WantedBy = ["graphical-session.target"];
};
# Link all the toggle scripts
xdg.dataFile =
(lib.attrsets.mapAttrs' (key: conf: {
name = mkLightPath key;
value.source = conf.onLight;
})
cfg.scripts)
// (lib.attrsets.mapAttrs' (key: conf: {
name = mkDarkPath key;
value.source = conf.onDark;
})
cfg.scripts);
# Create all the init scripts
home.activation = with lib.attrsets; mapAttrs' mkActivationEntry (filterAttrs hasInitScript cfg.scripts);
};
}