From 8c6e4e9ca55436d028aea954ead804f74e3a6ca0 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Thu, 23 May 2024 21:57:13 +0200 Subject: [PATCH 01/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'arion': 'github:hercules-ci/arion/efa008e12f590eea1a3e7f2088877dc9bdcc54b7' (2024-04-28) → 'github:hercules-ci/arion/e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd' (2024-05-05) • Updated input 'arion/flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) • Updated input 'arion/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/64e7763d72c1e4c1e5e6472640615b6ae2d40fbf' (2024-03-15) → 'github:hercules-ci/hercules-ci-effects/c0302ec12d569532a6b6bd218f698bc402e93adc' (2024-04-23) • Updated input 'arion/hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) • Updated input 'arion/nixpkgs': 'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19) → 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02) • Updated input 'disko': 'github:nix-community/disko/5eaf747af38dd272e1ab28a8ec4bd972424b07cf' (2024-04-29) → 'github:nix-community/disko/7ffc4354dfeb37c8c725ae1465f04a9b45ec8606' (2024-05-23) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/7772d48f5a728af51cd8ac85be5b124e2da0feac?dir=pkgs/firefox-addons' (2024-05-01) → 'gitlab:rycee/nur-expressions/6f385fa1886cb00dba5c22b15464f9b6b935b0d8?dir=pkgs/firefox-addons' (2024-05-23) • Updated input 'hardware': 'github:nixos/nixos-hardware/68d680c1b7c0e67a9b2144d6776583ee83664ef4' (2024-04-30) → 'github:nixos/nixos-hardware/d9e0b26202fd500cf3e79f73653cce7f7d541191' (2024-05-20) • Updated input 'home-manager': 'github:nix-community/home-manager/86853e31dc1b62c6eeed11c667e8cdd0285d4411' (2024-04-25) → 'github:nix-community/home-manager/ab5542e9dbd13d0100f8baae2bc2d68af901f4b4' (2024-05-10) • Updated input 'nh': 'github:viperml/nh/e4eb011975bee4c3f47199cc01d2d986e24851bd' (2024-05-01) → 'github:viperml/nh/127a23c82aa41091e97466092d2547c08c2a9a9d' (2024-05-05) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/576ecd43d3b864966b4423a853412d6177775e8b' (2024-04-29) → 'github:nixos/nixpkgs/46397778ef1f73414b03ed553a3368f0e7e33c2f' (2024-05-22) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27) → 'github:nixos/nixpkgs/5710852ba686cc1fd0d3b8e22b3117d43ba374c2' (2024-05-21) • Updated input 'sops-nix': 'github:Mic92/sops-nix/f1b0adc27265274e3b0c9b872a8f476a098679bd' (2024-04-23) → 'github:Mic92/sops-nix/b549832718b8946e875c016a4785d204fcfc2e53' (2024-05-22) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20) → 'github:NixOS/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016' (2024-05-18) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/74574c38577914733b4f7a775dd77d24245081dd' (2024-04-20) → 'github:NixOS/nixpkgs/e7cc61784ddf51c81487637b3031a6dd2d6673a2' (2024-05-18) • Updated input 'xremap': 'github:xremap/nix-flake/38c9a3c4264750f77151369f34590db259454df3' (2024-04-02) → 'github:xremap/nix-flake/7a9a071a84c9b5bdd48d4b3eacf6efa448665aed' (2024-05-20) • Updated input 'xremap/crane': 'github:ipetkov/crane/7e468a455506f2e65550e08dfd45092f0857a009' (2024-03-25) → 'github:ipetkov/crane/7443df1c478947bf96a2e699209f53b2db26209d' (2024-05-19) • Updated input 'xremap/devshell': 'github:numtide/devshell/2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8' (2024-03-22) → 'github:numtide/devshell/12e914740a25ea1891ec619bb53cf5e6ca922e40' (2024-04-19) • Updated input 'xremap/flake-parts': 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) • Updated input 'xremap/flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib' (2024-02-29) → 'https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02) • Updated input 'xremap/home-manager': 'github:nix-community/home-manager/179f6acaf7c068c7870542cdae72afec9427a5b0' (2024-03-27) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) • Updated input 'xremap/home-manager/nixpkgs': 'github:NixOS/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3' (2024-03-19) → 'github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) • Updated input 'xremap/hyprland': 'github:hyprwm/Hyprland/93d05114716e847c37f49d3cc2d0c5cb01d06a24' (2024-03-27) → 'github:hyprwm/Hyprland/f8857e6072bd85b95393499688872aaf7f088b5b' (2024-05-18) • Updated input 'xremap/hyprland/hyprcursor': 'github:hyprwm/hyprcursor/6a92473237f430399a417e1c2da9d7fcd4970086' (2024-03-21) → 'github:hyprwm/hyprcursor/7c3aa03dffb53921e583ade3d4ae3f487e390e7e' (2024-05-15) • Updated input 'xremap/hyprland/hyprcursor/hyprlang': 'github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2' (2024-03-08) → follows 'xremap/hyprland/hyprlang' • Removed input 'xremap/hyprland/hyprcursor/hyprlang/nixpkgs' • Removed input 'xremap/hyprland/hyprcursor/hyprlang/systems' • Removed input 'xremap/hyprland/hyprland-protocols' • Removed input 'xremap/hyprland/hyprland-protocols/nixpkgs' • Removed input 'xremap/hyprland/hyprland-protocols/systems' • Updated input 'xremap/hyprland/hyprlang': 'github:hyprwm/hyprlang/a2f39421144d42541c057be235154ce21b76c0f6' (2024-03-20) → 'github:hyprwm/hyprlang/969cb076e5b76f2e823aeca1937a3e1f159812ee' (2024-05-15) • Added input 'xremap/hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/f5181a068c1b06f2db51f6222e50a0c665a2b0c3' (2024-05-16) • Added input 'xremap/hyprland/hyprwayland-scanner/nixpkgs': follows 'xremap/hyprland/nixpkgs' • Added input 'xremap/hyprland/hyprwayland-scanner/systems': follows 'xremap/hyprland/systems' • Updated input 'xremap/hyprland/nixpkgs': 'github:NixOS/nixpkgs/20f77aa09916374aa3141cbc605c955626762c9a' (2024-03-21) → 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) • Removed input 'xremap/hyprland/wlroots' • Updated input 'xremap/hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/2d2fb547178ec025da643db57d40a971507b82fe' (2024-03-01) → 'github:hyprwm/xdg-desktop-portal-hyprland/af7c87a32f5d67eb2ada908a6a700f4e74831943' (2024-05-15) • Updated input 'xremap/hyprland/xdph/hyprland-protocols': follows 'xremap/hyprland/hyprland-protocols' → 'github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03' (2023-08-11) • Added input 'xremap/hyprland/xdph/hyprland-protocols/nixpkgs': follows 'xremap/hyprland/xdph/nixpkgs' • Added input 'xremap/hyprland/xdph/hyprland-protocols/systems': follows 'xremap/hyprland/xdph/systems' • Updated input 'xremap/nixpkgs': 'github:NixOS/nixpkgs/07262b18b97000d16a4bdb003418bd2fb067a932' (2024-03-25) → 'github:NixOS/nixpkgs/5a5ac83292c7842072318f57d68a48474f8bd34d' (2024-05-20) • Added input 'xremap/treefmt-nix': 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17) • Added input 'xremap/treefmt-nix/nixpkgs': 'github:nixos/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21) • Updated input 'xremap/xremap': 'github:k0kubun/xremap/53a6d0553d58b95777f066e4aeed05ec74c5eaed' (2024-03-27) → 'github:k0kubun/xremap/98bb9ee1b1e35bfed6370dbbdf5703a8799fec11' (2024-05-20) --- flake.lock | 297 ++++++++++++++++++++++++++--------------------------- 1 file changed, 148 insertions(+), 149 deletions(-) diff --git a/flake.lock b/flake.lock index 490b698..d7f2b4d 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714329018, - "narHash": "sha256-q0vsfqjYB0Phx4HoykT2HwRZDuxFwaRI9SQeEDbqZkU=", + "lastModified": 1714877287, + "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=", "owner": "hercules-ci", "repo": "arion", - "rev": "efa008e12f590eea1a3e7f2088877dc9bdcc54b7", + "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1711407199, - "narHash": "sha256-A/nB4j3JHL51ztlMQdfKw6y8tUJJzai3bLsZUEEaBxY=", + "lastModified": 1716156051, + "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", "owner": "ipetkov", "repo": "crane", - "rev": "7e468a455506f2e65550e08dfd45092f0857a009", + "rev": "7443df1c478947bf96a2e699209f53b2db26209d", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "lastModified": 1716431128, + "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", "owner": "nix-community", "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1714536206, - "narHash": "sha256-pnE2Px1VlcnWDc92TUmaILRgrWBbetKhpnMu5DfntbM=", + "lastModified": 1716458171, + "narHash": "sha256-kmqu2JEg/TiDRqPdOmdjOr5XTZ4jSIpKMYSiBycgVpM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7772d48f5a728af51cd8ac85be5b124e2da0feac", + "rev": "6f385fa1886cb00dba5c22b15464f9b6b935b0d8", "type": "gitlab" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "hardware": { "locked": { - "lastModified": 1714465198, - "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -483,11 +483,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1711554349, - "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -498,7 +498,11 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "xremap", + "hyprland", + "hyprlang" + ], "nixpkgs": [ "xremap", "hyprland", @@ -511,11 +515,11 @@ ] }, "locked": { - "lastModified": 1711035742, - "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "lastModified": 1715791817, + "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", "type": "github" }, "original": { @@ -527,19 +531,18 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_12", - "systems": "systems_8", - "wlroots": "wlroots", + "systems": "systems_7", "xdph": "xdph" }, "locked": { - "lastModified": 1711557008, - "narHash": "sha256-fBrJJSRbeRf2lZUsaij96qhDX9JpDHF0uHD69Z6Ca/k=", + "lastModified": 1716063601, + "narHash": "sha256-lH2CLdRQFtbQVauhLFDbPWTGmj7LgblMg2dq9thd0Zc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "93d05114716e847c37f49d3cc2d0c5cb01d06a24", + "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", "type": "github" }, "original": { @@ -553,11 +556,13 @@ "nixpkgs": [ "xremap", "hyprland", + "xdph", "nixpkgs" ], "systems": [ "xremap", "hyprland", + "xdph", "systems" ] }, @@ -580,17 +585,20 @@ "nixpkgs": [ "xremap", "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_7" + "systems": [ + "xremap", + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1715791527, + "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", "type": "github" }, "original": { @@ -599,7 +607,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ "xremap", @@ -613,16 +621,16 @@ ] }, "locked": { - "lastModified": 1710960526, - "narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=", + "lastModified": 1715879663, + "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a2f39421144d42541c057be235154ce21b76c0f6", + "repo": "hyprwayland-scanner", + "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -633,11 +641,11 @@ ] }, "locked": { - "lastModified": 1714557650, - "narHash": "sha256-N1qTL5wIlbbX7DorBaKOMYfz+gYoyf8LREMWVlOXNYc=", + "lastModified": 1714905986, + "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=", "owner": "viperml", "repo": "nh", - "rev": "e4eb011975bee4c3f47199cc01d2d986e24851bd", + "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d", "type": "github" }, "original": { @@ -667,11 +675,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -734,20 +742,14 @@ }, "nixpkgs-lib_4": { "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-stable": { @@ -768,11 +770,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1713638189, - "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74574c38577914733b4f7a775dd77d24245081dd", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -784,11 +786,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -816,11 +818,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -832,11 +834,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -848,11 +850,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1716190602, + "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", "type": "github" }, "original": { @@ -862,6 +864,22 @@ "type": "github" } }, + "nixpkgs_14": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1704842529, @@ -928,11 +946,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -976,11 +994,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -1058,11 +1076,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": { @@ -1176,21 +1194,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_5" @@ -1227,6 +1230,24 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_3" @@ -1245,32 +1266,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "xremap", - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "xremap", "hyprland", @@ -1288,11 +1286,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1715788457, + "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", "type": "github" }, "original": { @@ -1309,14 +1307,15 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "nixpkgs": "nixpkgs_13", + "treefmt-nix": "treefmt-nix_3", "xremap": "xremap_2" }, "locked": { - "lastModified": 1712025160, - "narHash": "sha256-L96ZF1Z+OxAta5XPmazFajflppflYw/y588SBWVGjAw=", + "lastModified": 1716231478, + "narHash": "sha256-54nR//0El4CKIwIeWYHY0/HFeh+2s00/NUuemH5DDDA=", "owner": "xremap", "repo": "nix-flake", - "rev": "38c9a3c4264750f77151369f34590db259454df3", + "rev": "7a9a071a84c9b5bdd48d4b3eacf6efa448665aed", "type": "github" }, "original": { @@ -1328,16 +1327,16 @@ "xremap_2": { "flake": false, "locked": { - "lastModified": 1711574442, - "narHash": "sha256-RR8SgnlQX8Gz9qwO/wN5NvFWsEQ/vvNdmOxxFojri90=", + "lastModified": 1716230517, + "narHash": "sha256-ww0w5dCnbyqS64lOSLx+eURSi85uFlvIOUvA7Xlky1E=", "owner": "k0kubun", "repo": "xremap", - "rev": "53a6d0553d58b95777f066e4aeed05ec74c5eaed", + "rev": "98bb9ee1b1e35bfed6370dbbdf5703a8799fec11", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.8.18", + "ref": "v0.9.0", "repo": "xremap", "type": "github" } From a1a5d9a90cf8538886979b59cf72ef0570ea05ac Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 13:56:29 +0200 Subject: [PATCH 02/26] Set systemd-boot build entry limit --- hosts/common/optional/systemd-boot.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/common/optional/systemd-boot.nix b/hosts/common/optional/systemd-boot.nix index 40d04b2..93daa9f 100644 --- a/hosts/common/optional/systemd-boot.nix +++ b/hosts/common/optional/systemd-boot.nix @@ -3,6 +3,7 @@ systemd-boot = { enable = true; consoleMode = "max"; + configurationLimit = 42; }; efi.canTouchEfiVariables = true; }; From f73fbed43ae785f1fb50d8204cbb6cc4ad0ddf66 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 13:58:42 +0200 Subject: [PATCH 03/26] Neovim: Add typescript LSP --- home/features/coding/nvim/default.nix | 11 +++++++++- home/features/coding/nvim/plugin/lsp.lua | 22 ++++++++++++++++++++ home/features/coding/nvim/plugin/none-ls.lua | 6 ++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/home/features/coding/nvim/default.nix b/home/features/coding/nvim/default.nix index 52049c8..78fa7ab 100644 --- a/home/features/coding/nvim/default.nix +++ b/home/features/coding/nvim/default.nix @@ -11,6 +11,7 @@ # LSP lua-language-server lua + pkgs.nodePackages.typescript-language-server # Formatters stylua # lua @@ -19,6 +20,8 @@ clang-tools_16 # c/c++ rustfmt yamlfmt + prettierd + vscode-langservers-extracted # Linters ruff # python @@ -184,7 +187,7 @@ in { { plugin = nvim-autopairs; - config = "require('nvim-autopairs').setup({})"; + config = "require('nvim-autopairs').setup()"; type = "lua"; } @@ -207,6 +210,12 @@ in { config = builtins.readFile ./plugin/vim-tmux-navigator.lua; type = "lua"; } + + { + plugin = nvim-ts-autotag; + config = "require('nvim-ts-autotag').setup({})"; + type = "lua"; + } ]; extraLuaConfig = '' diff --git a/home/features/coding/nvim/plugin/lsp.lua b/home/features/coding/nvim/plugin/lsp.lua index 5d65d67..0666611 100644 --- a/home/features/coding/nvim/plugin/lsp.lua +++ b/home/features/coding/nvim/plugin/lsp.lua @@ -43,3 +43,25 @@ require("lspconfig").nixd.setup({ on_attach = on_attach, capabilities = capabilities, }) + +require("lspconfig").tsserver.setup({ + on_attach = on_attach, + capabilities = capabilities, +}) + +require("lspconfig").eslint.setup({ + settings = { + packageManager = "yarn", + }, + on_attach = function(client, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + vim.api.nvim_create_autocmd("BufWritePost", { + callback = function() + vim.lsp.buf.format() + end, + }) + end, +}) diff --git a/home/features/coding/nvim/plugin/none-ls.lua b/home/features/coding/nvim/plugin/none-ls.lua index 0e47d6a..eaa2494 100644 --- a/home/features/coding/nvim/plugin/none-ls.lua +++ b/home/features/coding/nvim/plugin/none-ls.lua @@ -19,6 +19,12 @@ local opts = { null_ls.builtins.formatting.rustfmt, -- YAML null_ls.builtins.formatting.yamlfmt, + -- Typescript + null_ls.builtins.formatting.prettier.with({ + condition = function(utils) + return utils.has_file({ ".prettierrc.js" }) + end, + }), }, on_attach = function(client, bufnr) if client.supports_method("textDocument/formatting") then From 1450de1c2b10f6bb465becc6b9762a13071719d1 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 13:59:12 +0200 Subject: [PATCH 04/26] Add glow markdown viewer --- home/features/cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index 0dd61ed..2d85507 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -31,6 +31,7 @@ du-dust # disk usage visualizer lftp # FTP client unar # unarchive files like rar, zip, tar + glow # fancy markdown viewer nvd # Differ nix-output-monitor From 42bf9fba599e35e783bcb8f114d4d32fd6b01e43 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 14:04:03 +0200 Subject: [PATCH 05/26] Set GDDM as Ludwig login manager --- hosts/adalbert/default.nix | 7 ++----- hosts/common/optional/desktop/global.nix | 4 ---- hosts/ludwig/default.nix | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 1a707c7..8d2010b 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -3,10 +3,6 @@ { inputs, outputs, - lib, - config, - pkgs, - heliox-cli, ... }: { # You can import other NixOS modules here @@ -41,7 +37,6 @@ ../common/optional/udisks.nix ]; - nixpkgs = { # You can add overlays here overlays = [ @@ -73,6 +68,8 @@ services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default]; environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default]; + displayManager.sddm.enable = true; + # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; diff --git a/hosts/common/optional/desktop/global.nix b/hosts/common/optional/desktop/global.nix index 764d7ae..41ab7c7 100644 --- a/hosts/common/optional/desktop/global.nix +++ b/hosts/common/optional/desktop/global.nix @@ -13,8 +13,4 @@ environment.profileRelativeSessionVariables = { QT_PLUGIN_PATH = ["/lib/qt-6/plugins"]; }; - - services.xserver = { - displayManager.sddm.enable = true; - }; } diff --git a/hosts/ludwig/default.nix b/hosts/ludwig/default.nix index 7ee4c5e..64a4d48 100644 --- a/hosts/ludwig/default.nix +++ b/hosts/ludwig/default.nix @@ -63,6 +63,7 @@ networking.hostName = "ludwig"; + services.xserver.displayManager.gdm.enable = true; programs = { adb.enable = true; dconf.enable = true; From b52422d58c3fe9c99ecfbc30efd839447d8c5a58 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 14:05:06 +0200 Subject: [PATCH 06/26] Ludwig wayland fixes some apps didn't open --- hosts/ludwig/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ludwig/default.nix b/hosts/ludwig/default.nix index 64a4d48..6c50afe 100644 --- a/hosts/ludwig/default.nix +++ b/hosts/ludwig/default.nix @@ -63,10 +63,12 @@ networking.hostName = "ludwig"; + # environment.sessionVariables.QT_QPA_PLATFORM = "wayland"; services.xserver.displayManager.gdm.enable = true; programs = { adb.enable = true; dconf.enable = true; + xwayland.enable = true; }; hardware = { From 05498907b4492be364c4197e22b9fb9c6f3e5c5f Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 14:06:15 +0200 Subject: [PATCH 07/26] Ludwig: Allow insecure nix version --- home/ludwig.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/ludwig.nix b/home/ludwig.nix index 359aec9..b2fc1db 100644 --- a/home/ludwig.nix +++ b/home/ludwig.nix @@ -17,6 +17,7 @@ in { config = { permittedInsecurePackages = [ "electron-25.9.0" + "nix-2.15.3" ]; }; }; From a479aa7046b7c8af1fdc2f7b3311a0ca0abd7966 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 14:06:43 +0200 Subject: [PATCH 08/26] Gnome fixes idk --- home/features/desktop/gnome/default.nix | 5 +++++ home/ludwig.nix | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 home/features/desktop/gnome/default.nix diff --git a/home/features/desktop/gnome/default.nix b/home/features/desktop/gnome/default.nix new file mode 100644 index 0000000..bb19eca --- /dev/null +++ b/home/features/desktop/gnome/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + imports = [ + ../common + ]; +} diff --git a/home/ludwig.nix b/home/ludwig.nix index b2fc1db..655dbe6 100644 --- a/home/ludwig.nix +++ b/home/ludwig.nix @@ -1,4 +1,5 @@ { + pkgs, inputs, outputs, ... @@ -7,11 +8,13 @@ in { imports = [ ./global ./features/desktop/awesome - # ./features/desktop/gnome + ./features/desktop/gnome ./features/coding inputs.nix-colors.homeManagerModules.default ]; + home.packages = with pkgs; [nextcloud-client]; + colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; nixpkgs = { config = { From e217c6f579f7467487dc7b8b891c7a77b1e21e0f Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 24 May 2024 14:09:29 +0200 Subject: [PATCH 09/26] Fix adalbert display manager option --- hosts/adalbert/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 8d2010b..77ba8fb 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -68,7 +68,7 @@ services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default]; environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default]; - displayManager.sddm.enable = true; + services.xserver.displayManager.sddm.enable = true; # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; From 5f4de045833b800780d3d317ae2b2b0efea5cb8b Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Thu, 30 May 2024 11:13:48 +0200 Subject: [PATCH 10/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/7ffc4354dfeb37c8c725ae1465f04a9b45ec8606' (2024-05-23) → 'github:nix-community/disko/8ea5bcccc03111bdedaeaae9380dfab61e9deb33' (2024-05-30) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/6f385fa1886cb00dba5c22b15464f9b6b935b0d8?dir=pkgs/firefox-addons' (2024-05-23) → 'gitlab:rycee/nur-expressions/984d03b48bff391f054e1676a97181d79ae309db?dir=pkgs/firefox-addons' (2024-05-30) • Updated input 'hardware': 'github:nixos/nixos-hardware/d9e0b26202fd500cf3e79f73653cce7f7d541191' (2024-05-20) → 'github:nixos/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009' (2024-05-29) • Updated input 'home-manager': 'github:nix-community/home-manager/ab5542e9dbd13d0100f8baae2bc2d68af901f4b4' (2024-05-10) → 'github:nix-community/home-manager/2c78a57c544dd19b07442350727ced097e1aa6e6' (2024-05-26) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/46397778ef1f73414b03ed553a3368f0e7e33c2f' (2024-05-22) → 'github:nixos/nixpkgs/9d29cd266cebf80234c98dd0b87256b6be0af44e' (2024-05-25) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/5710852ba686cc1fd0d3b8e22b3117d43ba374c2' (2024-05-21) → 'github:nixos/nixpkgs/9ca3f649614213b2aaf5f1e16ec06952fe4c2632' (2024-05-27) • Updated input 'sops-nix': 'github:Mic92/sops-nix/b549832718b8946e875c016a4785d204fcfc2e53' (2024-05-22) → 'github:Mic92/sops-nix/962797a8d7f15ed7033031731d0bb77244839960' (2024-05-26) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016' (2024-05-18) → 'github:NixOS/nixpkgs/c5187508b11177ef4278edf19616f44f21cc8c69' (2024-05-25) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/e7cc61784ddf51c81487637b3031a6dd2d6673a2' (2024-05-18) → 'github:NixOS/nixpkgs/59a450646ec8ee0397f5fa54a08573e8240eb91f' (2024-05-25) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index d7f2b4d..8323f1e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1717032306, + "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1716458171, - "narHash": "sha256-kmqu2JEg/TiDRqPdOmdjOr5XTZ4jSIpKMYSiBycgVpM=", + "lastModified": 1717050378, + "narHash": "sha256-H+3Eqj+BQbqStGMFVFrcmfK0c+ocLqMOxYBghPghaZI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6f385fa1886cb00dba5c22b15464f9b6b935b0d8", + "rev": "984d03b48bff391f054e1676a97181d79ae309db", "type": "gitlab" }, "original": { @@ -384,11 +384,11 @@ }, "hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { @@ -770,11 +770,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { @@ -786,11 +786,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -994,11 +994,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716062047, - "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", + "lastModified": 1716651315, + "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", + "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", "type": "github" }, "original": { @@ -1076,11 +1076,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { From f992567e477c461e688a4fd5c757d8d829bf330c Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Thu, 30 May 2024 23:47:03 +0200 Subject: [PATCH 11/26] Add basic eustachius config --- flake.nix | 13 +++ hosts/adalbert/default.nix | 4 + hosts/eustachius/default.nix | 146 ++++++++++++++++++++++++ hosts/franz/arion/headscale/default.nix | 6 +- 4 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 hosts/eustachius/default.nix diff --git a/flake.nix b/flake.nix index f9082f7..406061a 100644 --- a/flake.nix +++ b/flake.nix @@ -104,6 +104,19 @@ ./hosts/franz ]; }; + # build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage + eustachius = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" + ./hosts/eustachius + + # extra config for sdImage generator + { + sdImage.compressImage = false; + } + ]; + }; }; # Standalone home-manager configuration entrypoint diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 77ba8fb..73ee7ac 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -73,6 +73,10 @@ # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; + boot.binfmt.emulatedSystems = [ + "aarch64-linux" + ]; + programs = { adb.enable = true; dconf.enable = true; diff --git a/hosts/eustachius/default.nix b/hosts/eustachius/default.nix new file mode 100644 index 0000000..ad5eda3 --- /dev/null +++ b/hosts/eustachius/default.nix @@ -0,0 +1,146 @@ +{ + pkgs, + lib, + ... +}: { + imports = [ + ]; + + # NixOS wants to enable GRUB by default + boot.loader.grub.enable = false; + # Enables the generation of /boot/extlinux/extlinux.conf + boot.loader.generic-extlinux-compatible.enable = true; + + # !!! Set to specific linux kernel version + boot.kernelPackages = pkgs.linuxPackages; + + # Disable ZFS on kernel 6 + boot.supportedFilesystems = lib.mkForce [ + "vfat" + "xfs" + "cifs" + "ntfs" + ]; + + # !!! Needed for the virtual console to work on the RPi 3, as the default of 16M doesn't seem to be enough. + # If X.org behaves weirdly (I only saw the cursor) then try increasing this to 256M. + # On a Raspberry Pi 4 with 4 GB, you should either disable this parameter or increase to at least 64M if you want the USB ports to work. + boot.kernelParams = ["cma=256M"]; + + # File systems configuration for using the installer's partition layout + fileSystems = { + # Prior to 19.09, the boot partition was hosted on the smaller first partition + # Starting with 19.09, the /boot folder is on the main bigger partition. + # The following is to be used only with older images. + /* + "/boot" = { + device = "/dev/disk/by-label/NIXOS_BOOT"; + fsType = "vfat"; + }; + */ + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; + }; + + # !!! Adding a swap file is optional, but strongly recommended! + swapDevices = [ + { + device = "/swapfile"; + size = 1024; + } + ]; + + # systemPackages + environment.systemPackages = with pkgs; [ + neovim + curl + wget + bind + iptables + python3 + nodejs + docker-compose + ]; + + services.openssh = { + enable = true; + settings.PermitRootLogin = "yes"; + }; + + services.restic.server.enable = true; + + services.tailscale = { + enable = true; + useRoutingFeatures = "server"; + }; + + # # Some sample service. + # # Use dnsmasq as internal LAN DNS resolver. + # services.dnsmasq = { + # enable = false; + # settings.servers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"]; + # settings.extraConfig = '' + # address=/fenrir.test/192.168.100.6 + # address=/recalune.test/192.168.100.7 + # address=/eth.nixpi.test/192.168.100.3 + # address=/wlan.nixpi.test/192.168.100.4 + # ''; + # }; + + virtualisation.docker.enable = true; + + networking.firewall.enable = false; + + # Networking + networking = { + # useDHCP = true; + interfaces.wlan0 = { + useDHCP = false; + ipv4.addresses = [ + { + # I used static IP over WLAN because I want to use it as local DNS resolver + address = "192.168.1.4"; + prefixLength = 24; + } + ]; + }; + interfaces.eth0 = { + useDHCP = true; + }; + }; + + # forwarding + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = true; + "net.ipv6.conf.all.forwarding" = true; + "net.ipv4.tcp_ecn" = true; + }; + + # put your own configuration here, for example ssh keys: + users.mutableUsers = true; + users.groups = { + nixos = { + gid = 1000; + name = "ghoscht"; + }; + }; + users.users = { + nixos = { + uid = 1000; + home = "/home/nixos"; + name = "ghoscht"; + group = "ghoscht"; + extraGroups = ["wheel" "docker"]; + }; + }; + users.users.root.openssh.authorizedKeys.keys = [ + #Desktop + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJd6Gut34abkwlZ4tZVBO4Qt7CkIpPm/Z8R6JCisjnYy openpgp:0xBD0CFCA0" + + #Convertible + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlRsnLqm6Ap3yKEEhtFiWavo72df/X5Il1ZCmENUqev openpgp:0xDE189CA5" + ]; + system.stateVersion = "23.11"; +} diff --git a/hosts/franz/arion/headscale/default.nix b/hosts/franz/arion/headscale/default.nix index d1be53e..2b6b391 100644 --- a/hosts/franz/arion/headscale/default.nix +++ b/hosts/franz/arion/headscale/default.nix @@ -2,8 +2,10 @@ vars = import ../../../../vars.nix; in { # Tailscale client for exit node/routes - services.tailscale.enable = true; - services.tailscale.useRoutingFeatures = "server"; + services.tailscale = { + enable = true; + useRoutingFeatures = "server"; + }; virtualisation.arion = { projects.headscale.settings = { From 4f73668bf485267fc72ede8d049c67c858b3c98e Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 31 May 2024 00:13:34 +0200 Subject: [PATCH 12/26] Revert eustachius to working default previos custom one had a glitchy tty which never could be interacted with --- hosts/eustachius/default.nix | 44 ++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/hosts/eustachius/default.nix b/hosts/eustachius/default.nix index ad5eda3..95538c4 100644 --- a/hosts/eustachius/default.nix +++ b/hosts/eustachius/default.nix @@ -1,11 +1,9 @@ { + config, pkgs, lib, ... }: { - imports = [ - ]; - # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf @@ -69,30 +67,28 @@ settings.PermitRootLogin = "yes"; }; - services.restic.server.enable = true; - - services.tailscale = { - enable = true; - useRoutingFeatures = "server"; + # Some sample service. + # Use dnsmasq as internal LAN DNS resolver. + services.dnsmasq = { + enable = false; + settings.servers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"]; + settings.extraConfig = '' + address=/fenrir.test/192.168.100.6 + address=/recalune.test/192.168.100.7 + address=/eth.nixpi.test/192.168.100.3 + address=/wlan.nixpi.test/192.168.100.4 + ''; }; - # # Some sample service. - # # Use dnsmasq as internal LAN DNS resolver. - # services.dnsmasq = { - # enable = false; - # settings.servers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"]; - # settings.extraConfig = '' - # address=/fenrir.test/192.168.100.6 - # address=/recalune.test/192.168.100.7 - # address=/eth.nixpi.test/192.168.100.3 - # address=/wlan.nixpi.test/192.168.100.4 - # ''; - # }; - virtualisation.docker.enable = true; networking.firewall.enable = false; + # WiFi + hardware = { + enableRedistributableFirmware = true; + firmware = [pkgs.wireless-regdb]; + }; # Networking networking = { # useDHCP = true; @@ -123,15 +119,15 @@ users.groups = { nixos = { gid = 1000; - name = "ghoscht"; + name = "nixos"; }; }; users.users = { nixos = { uid = 1000; home = "/home/nixos"; - name = "ghoscht"; - group = "ghoscht"; + name = "nixos"; + group = "nixos"; extraGroups = ["wheel" "docker"]; }; }; From 7a0bbc15481973b3a69ea3712ed10e31a5bef0a4 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 31 May 2024 00:19:21 +0200 Subject: [PATCH 13/26] Add basic raspi build docs --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index de74ea0..dd2170c 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,9 @@ The specific config from "hosts" can be installed using the following command. L ```sh sudo nixos-install --option download-speed 4000 --flake .# ``` + +## RPi Image generation +```sh +nix build .#nixosConfigurations.eustachius.config.system.build.sdImage +sudo dd if=./result/sd-image/.img of=/dev/ bs=1M status=progress +``` From 51a6f74c5f9db28577145da648b49d6f2d24844d Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 31 May 2024 11:53:33 +0200 Subject: [PATCH 14/26] Clean up eustachius config --- hosts/eustachius/default.nix | 48 +++++++++--------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/hosts/eustachius/default.nix b/hosts/eustachius/default.nix index 95538c4..05d2189 100644 --- a/hosts/eustachius/default.nix +++ b/hosts/eustachius/default.nix @@ -55,11 +55,7 @@ neovim curl wget - bind - iptables - python3 - nodejs - docker-compose + # docker-compose ]; services.openssh = { @@ -67,45 +63,23 @@ settings.PermitRootLogin = "yes"; }; - # Some sample service. - # Use dnsmasq as internal LAN DNS resolver. - services.dnsmasq = { - enable = false; - settings.servers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"]; - settings.extraConfig = '' - address=/fenrir.test/192.168.100.6 - address=/recalune.test/192.168.100.7 - address=/eth.nixpi.test/192.168.100.3 - address=/wlan.nixpi.test/192.168.100.4 - ''; + services.restic.server = { + enable = true; + dataDir = "/mnt/backups"; + extraFlags = ["--no-auth"]; + }; + + services.tailscale = { + enable = true; + useRoutingFeatures = "server"; }; virtualisation.docker.enable = true; networking.firewall.enable = false; - # WiFi - hardware = { - enableRedistributableFirmware = true; - firmware = [pkgs.wireless-regdb]; - }; # Networking - networking = { - # useDHCP = true; - interfaces.wlan0 = { - useDHCP = false; - ipv4.addresses = [ - { - # I used static IP over WLAN because I want to use it as local DNS resolver - address = "192.168.1.4"; - prefixLength = 24; - } - ]; - }; - interfaces.eth0 = { - useDHCP = true; - }; - }; + networking.useDHCP = true; # forwarding boot.kernel.sysctl = { From 92a980dab2b0a2061e6ab1af413ec04e7dcac875 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 31 May 2024 12:57:58 +0200 Subject: [PATCH 15/26] Add Franz SSH key --- hosts/eustachius/default.nix | 41 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/hosts/eustachius/default.nix b/hosts/eustachius/default.nix index 05d2189..aa82713 100644 --- a/hosts/eustachius/default.nix +++ b/hosts/eustachius/default.nix @@ -1,9 +1,10 @@ { - config, pkgs, lib, ... -}: { +}: let + vars = import ../../vars.nix; +in { # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf @@ -55,7 +56,6 @@ neovim curl wget - # docker-compose ]; services.openssh = { @@ -90,27 +90,20 @@ # put your own configuration here, for example ssh keys: users.mutableUsers = true; - users.groups = { - nixos = { - gid = 1000; - name = "nixos"; - }; - }; - users.users = { - nixos = { - uid = 1000; - home = "/home/nixos"; - name = "nixos"; - group = "nixos"; - extraGroups = ["wheel" "docker"]; - }; - }; - users.users.root.openssh.authorizedKeys.keys = [ - #Desktop - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJd6Gut34abkwlZ4tZVBO4Qt7CkIpPm/Z8R6JCisjnYy openpgp:0xBD0CFCA0" + users.users.${vars.user} = { + isNormalUser = true; + password = "changeme"; + extraGroups = ["wheel" "docker"]; + openssh.authorizedKeys.keys = [ + #Adalbert + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJd6Gut34abkwlZ4tZVBO4Qt7CkIpPm/Z8R6JCisjnYy openpgp:0xBD0CFCA0" - #Convertible - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlRsnLqm6Ap3yKEEhtFiWavo72df/X5Il1ZCmENUqev openpgp:0xDE189CA5" - ]; + #Ludwig + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlRsnLqm6Ap3yKEEhtFiWavo72df/X5Il1ZCmENUqev openpgp:0xDE189CA5" + + #Franz + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINCjLoirHMos7c9lRatWtSYAk68xbUGc8vPU0wFxIzj openpgp:0x7430326E" + ]; + }; system.stateVersion = "23.11"; } From 910cb992f81cde1eca2e0d9fa255b7451ad972e7 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:10:44 +0200 Subject: [PATCH 16/26] Add riscv64 emulation --- hosts/adalbert/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 73ee7ac..28bc691 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -75,6 +75,7 @@ boot.binfmt.emulatedSystems = [ "aarch64-linux" + "riscv64-linux" ]; programs = { From 89e314d3bb215b2236cbbbdca8bb53a6d499b672 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:11:03 +0200 Subject: [PATCH 17/26] eustachius: user experiments --- hosts/eustachius/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hosts/eustachius/default.nix b/hosts/eustachius/default.nix index aa82713..358ae5c 100644 --- a/hosts/eustachius/default.nix +++ b/hosts/eustachius/default.nix @@ -5,6 +5,7 @@ }: let vars = import ../../vars.nix; in { + imports = [../common/global/locale.nix]; # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf @@ -90,7 +91,7 @@ in { # put your own configuration here, for example ssh keys: users.mutableUsers = true; - users.users.${vars.user} = { + users.users.nixos = { isNormalUser = true; password = "changeme"; extraGroups = ["wheel" "docker"]; @@ -105,5 +106,12 @@ in { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINCjLoirHMos7c9lRatWtSYAk68xbUGc8vPU0wFxIzj openpgp:0x7430326E" ]; }; + users.users.admin = { + isNormalUser = true; + extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + hashedPassword = "blablabla"; # generate with `mkpasswd` + }; + nix.settings.trusted-users = ["admin" "ghoscht" "nixos"]; + system.stateVersion = "23.11"; } From 4d3850020b030397fe5d2ecd54600d2becf029ba Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:11:21 +0200 Subject: [PATCH 18/26] Disable ipv4-only git --- home/features/cli/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/features/cli/git.nix b/home/features/cli/git.nix index ec86a20..0f7882d 100644 --- a/home/features/cli/git.nix +++ b/home/features/cli/git.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { #Prefer IPv4 for ssh - home.file.".ssh/config".text = "AddressFamily inet"; + # home.file.".ssh/config".text = "AddressFamily inet"; programs.git = { enable = true; From 4068f391f2d0b0857ac624fe8087a6a76f6b9c50 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:11:40 +0200 Subject: [PATCH 19/26] Remove podman from global default --- hosts/common/global/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index fe84877..088e56b 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -12,7 +12,6 @@ ./fish.nix ./locale.nix ./nix.nix - ./podman.nix ./power-button.nix ./documentation.nix ] From a4ed0a03d1e733017b8731874ac9472c53f57433 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:13:33 +0200 Subject: [PATCH 20/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/8ea5bcccc03111bdedaeaae9380dfab61e9deb33' (2024-05-30) → 'github:nix-community/disko/0274af4c92531ebfba4a5bd493251a143bc51f3c' (2024-05-31) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/984d03b48bff391f054e1676a97181d79ae309db?dir=pkgs/firefox-addons' (2024-05-30) → 'gitlab:rycee/nur-expressions/29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47?dir=pkgs/firefox-addons' (2024-06-02) • Updated input 'hardware': 'github:nixos/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009' (2024-05-29) → 'github:nixos/nixos-hardware/7b49d3967613d9aacac5b340ef158d493906ba79' (2024-06-01) • Updated input 'home-manager': 'github:nix-community/home-manager/2c78a57c544dd19b07442350727ced097e1aa6e6' (2024-05-26) → 'github:nix-community/home-manager/a631666f5ec18271e86a5cde998cba68c33d9ac6' (2024-05-26) • Updated input 'nh': 'github:viperml/nh/127a23c82aa41091e97466092d2547c08c2a9a9d' (2024-05-05) → 'github:viperml/nh/0d76479fcdec0243ea560d1e2fde854337787e3a' (2024-06-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9d29cd266cebf80234c98dd0b87256b6be0af44e' (2024-05-25) → 'github:nixos/nixpkgs/805a384895c696f802a9bf5bf4720f37385df547' (2024-05-31) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/9ca3f649614213b2aaf5f1e16ec06952fe4c2632' (2024-05-27) → 'github:nixos/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29) • Updated input 'sops-nix': 'github:Mic92/sops-nix/962797a8d7f15ed7033031731d0bb77244839960' (2024-05-26) → 'github:Mic92/sops-nix/ab2a43b0d21d1d37d4d5726a892f714eaeb4b075' (2024-06-02) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/c5187508b11177ef4278edf19616f44f21cc8c69' (2024-05-25) → 'github:NixOS/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0' (2024-05-30) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/59a450646ec8ee0397f5fa54a08573e8240eb91f' (2024-05-25) → 'github:NixOS/nixpkgs/3b1b4895b2c5f9f5544d02132896aeb9ceea77bc' (2024-06-01) --- flake.lock | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 8323f1e..22bf570 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1717032306, - "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=", + "lastModified": 1717177033, + "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", "owner": "nix-community", "repo": "disko", - "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33", + "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717050378, - "narHash": "sha256-H+3Eqj+BQbqStGMFVFrcmfK0c+ocLqMOxYBghPghaZI=", + "lastModified": 1717316653, + "narHash": "sha256-91VBjCb9A5Sv1N7LpBg0OzTG0DKpvXVAnIT01Ba4lOw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "984d03b48bff391f054e1676a97181d79ae309db", + "rev": "29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47", "type": "gitlab" }, "original": { @@ -384,11 +384,11 @@ }, "hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -464,16 +464,16 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -641,11 +641,11 @@ ] }, "locked": { - "lastModified": 1714905986, - "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=", + "lastModified": 1717227663, + "narHash": "sha256-f6wh1HMkW7Ks9PKOsS95odyCjZOMuiK6B9NJTRsMApg=", "owner": "viperml", "repo": "nh", - "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d", + "rev": "0d76479fcdec0243ea560d1e2fde854337787e3a", "type": "github" }, "original": { @@ -770,11 +770,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -786,11 +786,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -946,16 +946,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -994,11 +994,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716651315, - "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -1076,11 +1076,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { From 7177ce3a10f3142cb99296e30f3b9601cfcf5e02 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sat, 29 Jun 2024 10:10:36 +0200 Subject: [PATCH 21/26] Fix breakages after upgrading to NixOS 24.05 some things still have to be fixed, but normal operation can go on for now --- flake.nix | 4 +-- home/adalbert.nix | 5 ++- home/features/cli/gpg.nix | 2 +- home/features/coding/nvim/default.nix | 6 ++-- home/features/coding/nvim/plugin/none-ls.lua | 8 ++--- home/features/desktop/common/3d-printing.nix | 2 +- hosts/adalbert/default.nix | 4 +-- hosts/common/global/default.nix | 1 - hosts/common/optional/gaming/vr.nix | 6 ---- modules/nixos/alvr.nix | 34 ------------------ modules/nixos/default.nix | 1 - pkgs/alvr/default.nix | 36 -------------------- pkgs/default.nix | 1 - 13 files changed, 18 insertions(+), 92 deletions(-) delete mode 100644 hosts/common/optional/gaming/vr.nix delete mode 100644 modules/nixos/alvr.nix delete mode 100644 pkgs/alvr/default.nix diff --git a/flake.nix b/flake.nix index 406061a..e33dadf 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; diff --git a/home/adalbert.nix b/home/adalbert.nix index b29da96..1cb57e5 100644 --- a/home/adalbert.nix +++ b/home/adalbert.nix @@ -16,7 +16,10 @@ in { colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; - home.packages = [inputs.picokontroller.packages.x86_64-linux.default pkgs.citrix_workspace]; + home.packages = [ + inputs.picokontroller.packages.x86_64-linux.default + # pkgs.citrix_workspace + ]; nixpkgs = { config = { permittedInsecurePackages = [ diff --git a/home/features/cli/gpg.nix b/home/features/cli/gpg.nix index f87e9ab..22a6510 100644 --- a/home/features/cli/gpg.nix +++ b/home/features/cli/gpg.nix @@ -11,7 +11,7 @@ enableSshSupport = true; enableFishIntegration = true; enableZshIntegration = true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; # Prevent clobbering SSH_AUTH_SOCK diff --git a/home/features/coding/nvim/default.nix b/home/features/coding/nvim/default.nix index 78fa7ab..40840cb 100644 --- a/home/features/coding/nvim/default.nix +++ b/home/features/coding/nvim/default.nix @@ -10,7 +10,6 @@ stableExtraPkgs = with pkgs; [ # LSP lua-language-server - lua pkgs.nodePackages.typescript-language-server # Formatters @@ -33,6 +32,9 @@ wl-clipboard fzf gcc + + # idk? + lua ]; unstableExtraPkgs = with pkgs.unstable; [ # LSP @@ -132,7 +134,7 @@ in { vim-nix { - plugin = nvim-base16; + plugin = base16-nvim; config = '' require('base16-colorscheme').setup({ base00 = '#${colors.base00}', base01 = '#${colors.base01}', base02 = '#${colors.base02}', base03 = '#${colors.base03}', diff --git a/home/features/coding/nvim/plugin/none-ls.lua b/home/features/coding/nvim/plugin/none-ls.lua index eaa2494..b42911c 100644 --- a/home/features/coding/nvim/plugin/none-ls.lua +++ b/home/features/coding/nvim/plugin/none-ls.lua @@ -7,16 +7,16 @@ local opts = { null_ls.builtins.formatting.stylua, -- Python null_ls.builtins.formatting.black, - null_ls.builtins.diagnostics.ruff, + -- null_ls.builtins.diagnostics.ruff, -- Javascript - null_ls.builtins.diagnostics.eslint_d, - null_ls.builtins.diagnostics.jsonlint, + -- null_ls.builtins.diagnostics.eslint_d, + -- null_ls.builtins.diagnostics.jsonlint, -- C/C++ null_ls.builtins.formatting.clang_format, -- Nix null_ls.builtins.formatting.alejandra, -- Rust - null_ls.builtins.formatting.rustfmt, + -- null_ls.builtins.formatting.rustfmt, -- YAML null_ls.builtins.formatting.yamlfmt, -- Typescript diff --git a/home/features/desktop/common/3d-printing.nix b/home/features/desktop/common/3d-printing.nix index 359bb49..52de6ae 100644 --- a/home/features/desktop/common/3d-printing.nix +++ b/home/features/desktop/common/3d-printing.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = with pkgs; [freecad cura super-slicer]; + home.packages = with pkgs; [freecad cura]; } diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 28bc691..065fc5f 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -32,7 +32,6 @@ ../common/optional/docker.nix ../common/optional/gaming/gamemode.nix ../common/optional/gaming/steam.nix - ../common/optional/gaming/vr.nix ../common/optional/desktop/japanese.nix ../common/optional/udisks.nix ]; @@ -68,7 +67,8 @@ services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default]; environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default]; - services.xserver.displayManager.sddm.enable = true; + # services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.gdm.enable = true; # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 088e56b..163e238 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -2,7 +2,6 @@ { inputs, outputs, - config, ... }: { imports = diff --git a/hosts/common/optional/gaming/vr.nix b/hosts/common/optional/gaming/vr.nix deleted file mode 100644 index 1ece2ca..0000000 --- a/hosts/common/optional/gaming/vr.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.alvr = { - enable = true; - openFirewall = true; - }; -} diff --git a/modules/nixos/alvr.nix b/modules/nixos/alvr.nix deleted file mode 100644 index 334fce8..0000000 --- a/modules/nixos/alvr.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - cfg = config.programs.alvr; -in { - options = { - programs.alvr = { - enable = mkEnableOption (lib.mdDoc "ALVR"); - - package = mkPackageOption pkgs "alvr" {}; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Open the default ports in the firewall for the ALVR server. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [cfg.package]; - - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [9943 9944]; - allowedUDPPorts = [9943 9944]; - }; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 402d229..c682b92 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -2,5 +2,4 @@ # These should be stuff you would like to share with others, not your personal configurations. { # List your module files here - alvr = import ./alvr.nix; } diff --git a/pkgs/alvr/default.nix b/pkgs/alvr/default.nix deleted file mode 100644 index c478ad2..0000000 --- a/pkgs/alvr/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: let - pname = "alvr"; - version = "v21.0.0-dev00+nightly.2024.03.03"; - src = fetchurl { - url = "https://github.com/alvr-org/ALVR-nightly/releases/download/v21.0.0-dev00%2Bnightly.2024.03.03/ALVR-x86_64.AppImage"; - hash = "sha256-DCkx8MHcFEkK/IlxIplOYKEzcBM90GQcuqwaftrEdOs="; - }; - - appimageContents = appimageTools.extractType2 {inherit pname version src;}; -in - appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - - install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications - substituteInPlace $out/share/applications/alvr.desktop \ - --replace 'Exec=alvr_dashboard' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Stream VR games from your PC to your headset via Wi-Fi"; - homepage = "https://github.com/alvr-org/ALVR/"; - changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}"; - license = licenses.mit; - mainProgram = "alvr"; - maintainers = with maintainers; [passivelemon]; - platforms = ["x86_64-linux"]; - }; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index 0527a76..82c7abd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,6 @@ # You can build them using 'nix build .#example' {pkgs, ...}: { # example = pkgs.callPackage ./example { }; - alvr = pkgs.callPackage ./alvr {}; feishin-appimage = pkgs.callPackage ./feishin {}; protonup-rs = pkgs.callPackage ./protonup-rs {}; rofi-audio-switcher = pkgs.callPackage ./rofi-audio-switcher {}; From 6fa61fff7f59a67257bbc8abb7221b635c488cbe Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sat, 29 Jun 2024 10:11:01 +0200 Subject: [PATCH 22/26] Add coolercontrol --- hosts/adalbert/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 065fc5f..74a9104 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -73,6 +73,10 @@ # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; + programs.coolercontrol={ + enable = true; + nvidiaSupport = true; + }; boot.binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" From a00655b02ffd4c61cb3700ce7575b2c36baaa26d Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sat, 29 Jun 2024 10:13:06 +0200 Subject: [PATCH 23/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'arion': 'github:hercules-ci/arion/e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd' (2024-05-05) → 'github:hercules-ci/arion/555e7ba634cf2564737dfc18ad607134e39f52a6' (2024-06-26) • Updated input 'arion/flake-parts': 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) • Updated input 'arion/nixpkgs': 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02) → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31) • Updated input 'arkenfox': 'github:dwarfmaster/arkenfox-nixos/05e7e0996493f47bbc15228895c4e31ce24616f0' (2024-02-18) → 'github:dwarfmaster/arkenfox-nixos/35e803fa44abfd438c65b64ff2691f3f608cd2d3' (2024-06-17) • Updated input 'arkenfox/flake-utils': 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'arkenfox/pre-commit': 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15) → 'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1' (2024-06-06) • Removed input 'arkenfox/pre-commit/flake-utils' • Removed input 'arkenfox/pre-commit/flake-utils/systems' • Updated input 'arkenfox/pre-commit/gitignore': 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29) → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Updated input 'arkenfox/pre-commit/nixpkgs': 'github:NixOS/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09) → 'github:NixOS/nixpkgs/e367f7a1fb93137af22a3908f00b9a35e2d286a7' (2024-03-18) • Updated input 'arkenfox/pre-commit/nixpkgs-stable': 'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10) → 'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3' (2024-03-17) • Updated input 'disko': 'github:nix-community/disko/0274af4c92531ebfba4a5bd493251a143bc51f3c' (2024-05-31) → 'github:nix-community/disko/423b86a7f756421325e71663ada79a199bf13408' (2024-06-29) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47?dir=pkgs/firefox-addons' (2024-06-02) → 'gitlab:rycee/nur-expressions/590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1?dir=pkgs/firefox-addons' (2024-06-29) • Updated input 'hardware': 'github:nixos/nixos-hardware/7b49d3967613d9aacac5b340ef158d493906ba79' (2024-06-01) → 'github:nixos/nixos-hardware/231274268ff2250d4730e274b808f66ef91b6381' (2024-06-29) • Updated input 'home-manager': 'github:nix-community/home-manager/a631666f5ec18271e86a5cde998cba68c33d9ac6' (2024-05-26) → 'github:nix-community/home-manager/a1fddf0967c33754271761d91a3d921772b30d0e' (2024-06-16) • Updated input 'nh': 'github:viperml/nh/0d76479fcdec0243ea560d1e2fde854337787e3a' (2024-06-01) → 'github:viperml/nh/6fb30a4d490a98d08628ed93a90a9d23820ef9c8' (2024-06-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/805a384895c696f802a9bf5bf4720f37385df547' (2024-05-31) → 'github:nixos/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29) → 'github:nixos/nixpkgs/2893f56de08021cffd9b6b6dfc70fd9ccd51eb60' (2024-06-24) • Updated input 'sops-nix': 'github:Mic92/sops-nix/ab2a43b0d21d1d37d4d5726a892f714eaeb4b075' (2024-06-02) → 'github:Mic92/sops-nix/c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3' (2024-06-24) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0' (2024-05-30) → 'github:NixOS/nixpkgs/90338afd6177fc683a04d934199d693708c85a3b' (2024-06-21) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/3b1b4895b2c5f9f5544d02132896aeb9ceea77bc' (2024-06-01) → 'github:NixOS/nixpkgs/5e8e3b89adbd0be63192f6e645e0a54080004924' (2024-06-22) --- flake.lock | 164 +++++++++++++++++++++-------------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index 22bf570..d923051 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714877287, - "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=", + "lastModified": 1719400670, + "narHash": "sha256-TnTKhDBHX2J/ISs6sKcSF4P09I4k0aabisUvd/oYpDo=", "owner": "hercules-ci", "repo": "arion", - "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd", + "rev": "555e7ba634cf2564737dfc18ad607134e39f52a6", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "pre-commit": "pre-commit" }, "locked": { - "lastModified": 1708283120, - "narHash": "sha256-IgJe5xhssW199zGQq4Q81stGdVDJH7nFHm3yu62I75E=", + "lastModified": 1718613978, + "narHash": "sha256-iXzxAcovEZHHYUYIWtIJYMpQf96MwasMirMxMKJL5Aw=", "owner": "dwarfmaster", "repo": "arkenfox-nixos", - "rev": "05e7e0996493f47bbc15228895c4e31ce24616f0", + "rev": "35e803fa44abfd438c65b64ff2691f3f608cd2d3", "type": "github" }, "original": { @@ -83,7 +83,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1717177033, - "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", + "lastModified": 1719640067, + "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", "owner": "nix-community", "repo": "disko", - "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", + "rev": "423b86a7f756421325e71663ada79a199bf13408", "type": "github" }, "original": { @@ -122,18 +122,18 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717316653, - "narHash": "sha256-91VBjCb9A5Sv1N7LpBg0OzTG0DKpvXVAnIT01Ba4lOw=", + "lastModified": 1719644951, + "narHash": "sha256-MTF+/uUIdFNeyzEFirWyza43AFfr3Syld7aPw2CSCkI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47", + "rev": "590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1", "type": "gitlab" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -276,11 +276,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -290,24 +290,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -322,9 +304,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -369,11 +351,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -384,11 +366,11 @@ }, "hardware": { "locked": { - "lastModified": 1717248095, - "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", + "lastModified": 1719647737, + "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", + "rev": "231274268ff2250d4730e274b808f66ef91b6381", "type": "github" }, "original": { @@ -417,7 +399,7 @@ "inputs": { "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_4", - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -464,11 +446,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -534,7 +516,7 @@ "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_12", - "systems": "systems_7", + "systems": "systems_6", "xdph": "xdph" }, "locked": { @@ -641,11 +623,11 @@ ] }, "locked": { - "lastModified": 1717227663, - "narHash": "sha256-f6wh1HMkW7Ks9PKOsS95odyCjZOMuiK6B9NJTRsMApg=", + "lastModified": 1718355099, + "narHash": "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=", "owner": "viperml", "repo": "nh", - "rev": "0d76479fcdec0243ea560d1e2fde854337787e3a", + "rev": "6fb30a4d490a98d08628ed93a90a9d23820ef9c8", "type": "github" }, "original": { @@ -675,11 +657,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -754,11 +736,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -770,11 +752,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -786,11 +768,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -882,11 +864,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", "type": "github" }, "original": { @@ -946,11 +928,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -994,11 +976,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -1012,7 +994,7 @@ "inputs": { "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_7", - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -1032,17 +1014,16 @@ "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1076,11 +1057,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717297459, - "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -1165,21 +1146,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1250,7 +1216,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, From f5e054813fa155841b5ca271e0320fb486e018c8 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:36:17 +0200 Subject: [PATCH 24/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'arion': 'github:hercules-ci/arion/555e7ba634cf2564737dfc18ad607134e39f52a6' (2024-06-26) → 'github:hercules-ci/arion/236f9dd82d6ef6a2d9987c7a7df3e75f1bc8b318' (2024-07-05) • Updated input 'arion/flake-parts': 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) • Updated input 'arion/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/c0302ec12d569532a6b6bd218f698bc402e93adc' (2024-04-23) → 'github:hercules-ci/hercules-ci-effects/11e4b8dc112e2f485d7c97e1cee77f9958f498f5' (2024-06-24) • Updated input 'arion/nixpkgs': 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31) → 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6' (2024-07-03) • Updated input 'disko': 'github:nix-community/disko/423b86a7f756421325e71663ada79a199bf13408' (2024-06-29) → 'github:nix-community/disko/786965e1b1ed3fd2018d78399984f461e2a44689' (2024-07-11) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1?dir=pkgs/firefox-addons' (2024-06-29) → 'gitlab:rycee/nur-expressions/6b0aa08643c6b403e387da201eaf4bc0e04db93a?dir=pkgs/firefox-addons' (2024-07-12) • Updated input 'hardware': 'github:nixos/nixos-hardware/231274268ff2250d4730e274b808f66ef91b6381' (2024-06-29) → 'github:nixos/nixos-hardware/c5013aa7ce2c7ec90acee5d965d950c8348db751' (2024-07-11) • Updated input 'home-manager': 'github:nix-community/home-manager/a1fddf0967c33754271761d91a3d921772b30d0e' (2024-06-16) → 'github:nix-community/home-manager/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03) • Updated input 'nh': 'github:viperml/nh/6fb30a4d490a98d08628ed93a90a9d23820ef9c8' (2024-06-14) → 'github:viperml/nh/7f8a1859ed6ea971fcf49b07ca8938e3000c3af4' (2024-07-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26) → 'github:nixos/nixpkgs/a046c1202e11b62cbede5385ba64908feb7bfac4' (2024-07-11) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/2893f56de08021cffd9b6b6dfc70fd9ccd51eb60' (2024-06-24) → 'github:nixos/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497' (2024-07-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3' (2024-06-24) → 'github:Mic92/sops-nix/67035a355b1d52d2d238501f8cc1a18706979760' (2024-07-08) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/90338afd6177fc683a04d934199d693708c85a3b' (2024-06-21) → 'github:NixOS/nixpkgs/4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb' (2024-07-05) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/5e8e3b89adbd0be63192f6e645e0a54080004924' (2024-06-22) → 'github:NixOS/nixpkgs/550ac3e955c30fe96dd8b2223e37e0f5d225c927' (2024-07-06) --- flake.lock | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index d923051..baa0fe9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719400670, - "narHash": "sha256-TnTKhDBHX2J/ISs6sKcSF4P09I4k0aabisUvd/oYpDo=", + "lastModified": 1720147808, + "narHash": "sha256-hlWEQGUbIwYb+vnd8egzlW/P++yKu3HjV/rOdOPVank=", "owner": "hercules-ci", "repo": "arion", - "rev": "555e7ba634cf2564737dfc18ad607134e39f52a6", + "rev": "236f9dd82d6ef6a2d9987c7a7df3e75f1bc8b318", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1719640067, - "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "423b86a7f756421325e71663ada79a199bf13408", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1719644951, - "narHash": "sha256-MTF+/uUIdFNeyzEFirWyza43AFfr3Syld7aPw2CSCkI=", + "lastModified": 1720756997, + "narHash": "sha256-nu0kRXP1dq0KYgt0ISVOWQFauyqB6soL10q3m7G6QpA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1", + "rev": "6b0aa08643c6b403e387da201eaf4bc0e04db93a", "type": "gitlab" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "hardware": { "locked": { - "lastModified": 1719647737, - "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "231274268ff2250d4730e274b808f66ef91b6381", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1718355099, - "narHash": "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=", + "lastModified": 1720270372, + "narHash": "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=", "owner": "viperml", "repo": "nh", - "rev": "6fb30a4d490a98d08628ed93a90a9d23820ef9c8", + "rev": "7f8a1859ed6ea971fcf49b07ca8938e3000c3af4", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -752,27 +752,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1720282526, + "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1719426051, - "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", + "lastModified": 1720691131, + "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", + "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", "type": "github" }, "original": { @@ -976,11 +976,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1718983919, - "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90338afd6177fc683a04d934199d693708c85a3b", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { From 35003d7f2c19824619d28d66016e77df6954059b Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:00:08 +0200 Subject: [PATCH 25/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/786965e1b1ed3fd2018d78399984f461e2a44689' (2024-07-11) → 'github:nix-community/disko/e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47' (2024-07-18) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/6b0aa08643c6b403e387da201eaf4bc0e04db93a?dir=pkgs/firefox-addons' (2024-07-12) → 'gitlab:rycee/nur-expressions/8e5443b5b765c83bd0adf5c85b1af0371d052395?dir=pkgs/firefox-addons' (2024-07-19) • Updated input 'hardware': 'github:nixos/nixos-hardware/c5013aa7ce2c7ec90acee5d965d950c8348db751' (2024-07-11) → 'github:nixos/nixos-hardware/bb90787ea034c8b9035dfcfc9b4dc23898d414be' (2024-07-18) • Updated input 'nh': 'github:viperml/nh/7f8a1859ed6ea971fcf49b07ca8938e3000c3af4' (2024-07-06) → 'github:viperml/nh/168c7ceea2b8d6208cf32de9eb8effa9c008b40d' (2024-07-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/a046c1202e11b62cbede5385ba64908feb7bfac4' (2024-07-11) → 'github:nixos/nixpkgs/c716603a63aca44f39bef1986c13402167450e0a' (2024-07-17) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497' (2024-07-09) → 'github:nixos/nixpkgs/ad0b5eed1b6031efaed382844806550c3dcb4206' (2024-07-16) • Updated input 'sops-nix': 'github:Mic92/sops-nix/67035a355b1d52d2d238501f8cc1a18706979760' (2024-07-08) → 'github:Mic92/sops-nix/0703ba03fd9c1665f8ab68cc3487302475164617' (2024-07-14) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb' (2024-07-05) → 'github:NixOS/nixpkgs/8b5a3d5a1d951344d683b442c0739010b80039db' (2024-07-12) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/550ac3e955c30fe96dd8b2223e37e0f5d225c927' (2024-07-06) → 'github:NixOS/nixpkgs/74348da2f3a312ee25cea09b98cdba4cb9fa5d5d' (2024-07-14) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index baa0fe9..45a8b1e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721266288, + "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1720756997, - "narHash": "sha256-nu0kRXP1dq0KYgt0ISVOWQFauyqB6soL10q3m7G6QpA=", + "lastModified": 1721361786, + "narHash": "sha256-cOp9Ah/2bv3A+znaP3KFZ+Aw4/mTWKEfXhiNAd/4jNc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6b0aa08643c6b403e387da201eaf4bc0e04db93a", + "rev": "8e5443b5b765c83bd0adf5c85b1af0371d052395", "type": "gitlab" }, "original": { @@ -366,11 +366,11 @@ }, "hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721331912, + "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1720270372, - "narHash": "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=", + "lastModified": 1721151247, + "narHash": "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=", "owner": "viperml", "repo": "nh", - "rev": "7f8a1859ed6ea971fcf49b07ca8938e3000c3af4", + "rev": "168c7ceea2b8d6208cf32de9eb8effa9c008b40d", "type": "github" }, "original": { @@ -752,11 +752,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720282526, - "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", + "lastModified": 1720915306, + "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", + "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "type": "github" }, "original": { @@ -768,11 +768,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { @@ -976,11 +976,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1720781449, + "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720479166, - "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", + "lastModified": 1720926522, + "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67035a355b1d52d2d238501f8cc1a18706979760", + "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "type": "github" }, "original": { From c0769b53c88e02636a22a9c709ad100a936ea2b4 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 9 Aug 2024 14:58:56 +0200 Subject: [PATCH 26/26] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'arion': 'github:hercules-ci/arion/236f9dd82d6ef6a2d9987c7a7df3e75f1bc8b318' (2024-07-05) → 'github:hercules-ci/arion/90bc85532767c785245f5c1e29ebfecb941cf8c9' (2024-08-05) • Updated input 'arion/flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) • Updated input 'arion/nixpkgs': 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6' (2024-07-03) → 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) • Updated input 'arkenfox': 'github:dwarfmaster/arkenfox-nixos/35e803fa44abfd438c65b64ff2691f3f608cd2d3' (2024-06-17) → 'github:dwarfmaster/arkenfox-nixos/92c9a287b7b98198c3ba5cdfc90218402e49c4b3' (2024-07-23) • Updated input 'disko': 'github:nix-community/disko/e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47' (2024-07-18) → 'github:nix-community/disko/ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed' (2024-08-08) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/8e5443b5b765c83bd0adf5c85b1af0371d052395?dir=pkgs/firefox-addons' (2024-07-19) → 'gitlab:rycee/nur-expressions/ce877fc7a74fb1abfedcdb4f78e67d930a0841c8?dir=pkgs/firefox-addons' (2024-08-09) • Updated input 'flatpaks': 'github:GermanBread/declarative-flatpak/efe7897ddcfbca085fba0690b3094e7f8e8911dd' (2024-02-07) → 'github:GermanBread/declarative-flatpak/cbabea429cd7d659041e5338e869a8e70f59fa74' (2024-07-28) • Updated input 'flatpaks/nixpkgs': 'github:NixOS/nixpkgs/a77ab169a83a4175169d78684ddd2e54486ac651' (2024-01-24) → 'github:NixOS/nixpkgs/205fd4226592cc83fd4c0885a3e4c9c400efabb5' (2024-07-09) • Updated input 'flatpaks/utils': 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'hardware': 'github:nixos/nixos-hardware/bb90787ea034c8b9035dfcfc9b4dc23898d414be' (2024-07-18) → 'github:nixos/nixos-hardware/107bb46eef1f05e86fc485ee8af9b637e5157988' (2024-08-08) • Updated input 'nh': 'github:viperml/nh/168c7ceea2b8d6208cf32de9eb8effa9c008b40d' (2024-07-16) → 'github:viperml/nh/ea9053852f8575f650ca0080b2cac6735c7447f7' (2024-08-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/c716603a63aca44f39bef1986c13402167450e0a' (2024-07-17) → 'github:nixos/nixpkgs/21cc704b5e918c5fbf4f9fff22b4ac2681706d90' (2024-08-06) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/ad0b5eed1b6031efaed382844806550c3dcb4206' (2024-07-16) → 'github:nixos/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04) • Updated input 'sops-nix': 'github:Mic92/sops-nix/0703ba03fd9c1665f8ab68cc3487302475164617' (2024-07-14) → 'github:Mic92/sops-nix/8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9' (2024-08-05) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/8b5a3d5a1d951344d683b442c0739010b80039db' (2024-07-12) → 'github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100' (2024-07-20) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/74348da2f3a312ee25cea09b98cdba4cb9fa5d5d' (2024-07-14) → 'github:NixOS/nixpkgs/556533a23879fc7e5f98dd2e0b31a6911a213171' (2024-07-21) • Updated input 'xremap': 'github:xremap/nix-flake/7a9a071a84c9b5bdd48d4b3eacf6efa448665aed' (2024-05-20) → 'github:xremap/nix-flake/3717cb0539f4967010ba540baa439a4cf6ea8576' (2024-07-24) • Updated input 'xremap/crane': 'github:ipetkov/crane/7443df1c478947bf96a2e699209f53b2db26209d' (2024-05-19) → 'github:ipetkov/crane/8a68b987c476a33e90f203f0927614a75c3f47ea' (2024-07-18) • Updated input 'xremap/devshell': 'github:numtide/devshell/12e914740a25ea1891ec619bb53cf5e6ca922e40' (2024-04-19) → 'github:numtide/devshell/1ebbe68d57457c8cae98145410b164b5477761f4' (2024-06-03) • Updated input 'xremap/flake-parts': 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) • Updated input 'xremap/flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02) → 'https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz?narHash=sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI%3D' (2024-07-01) • Updated input 'xremap/home-manager': 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) → 'github:nix-community/home-manager/afd2021bedff2de92dfce0e257a3d03ae65c603d' (2024-07-16) • Updated input 'xremap/home-manager/nixpkgs': 'github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) → 'github:NixOS/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8' (2024-07-01) • Updated input 'xremap/hyprland': 'github:hyprwm/Hyprland/f8857e6072bd85b95393499688872aaf7f088b5b' (2024-05-18) → 'github:hyprwm/Hyprland/f642fb97df5c69267a03452533de383ff8023570' (2024-07-20) • Updated input 'xremap/hyprland/hyprcursor': 'github:hyprwm/hyprcursor/7c3aa03dffb53921e583ade3d4ae3f487e390e7e' (2024-05-15) → 'github:hyprwm/hyprcursor/a5c0d57325c5f0814c39110a70ca19c070ae9486' (2024-07-04) • Updated input 'xremap/hyprland/hyprlang': 'github:hyprwm/hyprlang/969cb076e5b76f2e823aeca1937a3e1f159812ee' (2024-05-15) → 'github:hyprwm/hyprlang/5df0174fd09de4ac5475233d65ffc703e89b82eb' (2024-07-07) • Added input 'xremap/hyprland/hyprlang/hyprutils': follows 'xremap/hyprland/hyprutils' • Added input 'xremap/hyprland/hyprutils': 'github:hyprwm/hyprutils/eb1ceff2b87f6820789249f63faa8e9dcb54d05f' (2024-07-15) • Added input 'xremap/hyprland/hyprutils/nixpkgs': follows 'xremap/hyprland/nixpkgs' • Added input 'xremap/hyprland/hyprutils/systems': follows 'xremap/hyprland/systems' • Updated input 'xremap/hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/f5181a068c1b06f2db51f6222e50a0c665a2b0c3' (2024-05-16) → 'github:hyprwm/hyprwayland-scanner/d5fa094ca27e0039be5e94c0a80ae433145af8bb' (2024-07-05) • Updated input 'xremap/hyprland/nixpkgs': 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) → 'github:NixOS/nixpkgs/693bc46d169f5af9c992095736e82c3488bf7dbb' (2024-07-14) • Updated input 'xremap/hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/af7c87a32f5d67eb2ada908a6a700f4e74831943' (2024-05-15) → 'github:hyprwm/xdg-desktop-portal-hyprland/b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6' (2024-07-05) • Updated input 'xremap/hyprland/xdph/hyprland-protocols': 'github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03' (2023-08-11) → 'github:hyprwm/hyprland-protocols/1b61f0093afff20ab44d88ad707aed8bf2215290' (2024-06-18) • Updated input 'xremap/nixpkgs': 'github:NixOS/nixpkgs/5a5ac83292c7842072318f57d68a48474f8bd34d' (2024-05-20) → 'github:NixOS/nixpkgs/2d65995365a2a6b05db69e344d3b673c8d541bcd' (2024-07-20) • Updated input 'xremap/treefmt-nix': 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17) → 'github:numtide/treefmt-nix/888bfb10a9b091d9ed2f5f8064de8d488f7b7c97' (2024-07-20) • Updated input 'xremap/treefmt-nix/nixpkgs': 'github:nixos/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21) → 'github:nixos/nixpkgs/2741b4b489b55df32afac57bc4bfd220e8bf617e' (2024-06-29) • Updated input 'xremap/xremap': 'github:k0kubun/xremap/98bb9ee1b1e35bfed6370dbbdf5703a8799fec11' (2024-05-20) → 'github:k0kubun/xremap/d1b17c4b9958feb5804f317b654ab3936f852c61' (2024-05-20) --- flake.lock | 245 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 139 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index 45a8b1e..f95e271 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1720147808, - "narHash": "sha256-hlWEQGUbIwYb+vnd8egzlW/P++yKu3HjV/rOdOPVank=", + "lastModified": 1722825873, + "narHash": "sha256-bFNXkD+s9NuidZePiJAjjFUnsMOwXb7hEZ4JEDdSALw=", "owner": "hercules-ci", "repo": "arion", - "rev": "236f9dd82d6ef6a2d9987c7a7df3e75f1bc8b318", + "rev": "90bc85532767c785245f5c1e29ebfecb941cf8c9", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "pre-commit": "pre-commit" }, "locked": { - "lastModified": 1718613978, - "narHash": "sha256-iXzxAcovEZHHYUYIWtIJYMpQf96MwasMirMxMKJL5Aw=", + "lastModified": 1721720317, + "narHash": "sha256-KH0ILX8EGa/A4Bgc6DtsbviG8qaLrzDDV1m1bIXJ+pw=", "owner": "dwarfmaster", "repo": "arkenfox-nixos", - "rev": "35e803fa44abfd438c65b64ff2691f3f608cd2d3", + "rev": "92c9a287b7b98198c3ba5cdfc90218402e49c4b3", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1716156051, - "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "7443df1c478947bf96a2e699209f53b2db26209d", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1721266288, - "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1721361786, - "narHash": "sha256-cOp9Ah/2bv3A+znaP3KFZ+Aw4/mTWKEfXhiNAd/4jNc=", + "lastModified": 1723176196, + "narHash": "sha256-8FWJ0kJN6yin5Z9BhtPlVaRzj9ljuUdaBT2i/bquJO4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8e5443b5b765c83bd0adf5c85b1af0371d052395", + "rev": "ce877fc7a74fb1abfedcdb4f78e67d930a0841c8", "type": "gitlab" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -328,11 +328,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1707326266, - "narHash": "sha256-vRVih6iltuyLdj305Pj236BfhzFaOkAbHg3r5VsFdxs=", + "lastModified": 1722178161, + "narHash": "sha256-9Nmg+1ngRCsKMJXN4JWFzg4SLTj1iJfakxiOsF48rZw=", "owner": "GermanBread", "repo": "declarative-flatpak", - "rev": "efe7897ddcfbca085fba0690b3094e7f8e8911dd", + "rev": "cbabea429cd7d659041e5338e869a8e70f59fa74", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "hardware": { "locked": { - "lastModified": 1721331912, - "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", + "lastModified": 1723149858, + "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", + "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1715791817, - "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", + "lastModified": 1720108799, + "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", + "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", "type": "github" }, "original": { @@ -514,17 +514,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_12", "systems": "systems_6", "xdph": "xdph" }, "locked": { - "lastModified": 1716063601, - "narHash": "sha256-lH2CLdRQFtbQVauhLFDbPWTGmj7LgblMg2dq9thd0Zc=", + "lastModified": 1721463092, + "narHash": "sha256-NT9adHxZtssgoYPsc1jW0NV2OAZBQoko0qdlLO7wkSg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", + "rev": "f642fb97df5c69267a03452533de383ff8023570", "type": "github" }, "original": { @@ -549,11 +550,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "type": "github" }, "original": { @@ -563,6 +564,38 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "xremap", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "xremap", + "hyprland", + "nixpkgs" + ], + "systems": [ + "xremap", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "xremap", @@ -576,16 +609,16 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1721071737, + "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "repo": "hyprutils", + "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", "type": "github" } }, @@ -603,11 +636,11 @@ ] }, "locked": { - "lastModified": 1715879663, - "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", "type": "github" }, "original": { @@ -623,11 +656,11 @@ ] }, "locked": { - "lastModified": 1721151247, - "narHash": "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=", + "lastModified": 1723021300, + "narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=", "owner": "viperml", "repo": "nh", - "rev": "168c7ceea2b8d6208cf32de9eb8effa9c008b40d", + "rev": "ea9053852f8575f650ca0080b2cac6735c7447f7", "type": "github" }, "original": { @@ -657,11 +690,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -724,14 +757,14 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs-stable": { @@ -752,11 +785,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -768,11 +801,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -800,11 +833,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -816,11 +849,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -832,11 +865,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1716190602, - "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", + "lastModified": 1721435672, + "narHash": "sha256-VaBqKvCu4iFWPwKFFigdhOfgccLUDEVByb6Wa2Z9i98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", + "rev": "2d65995365a2a6b05db69e344d3b673c8d541bcd", "type": "github" }, "original": { @@ -848,11 +881,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -880,11 +913,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -928,11 +961,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { @@ -976,11 +1009,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -1057,11 +1090,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { @@ -1201,11 +1234,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1721458737, + "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", "type": "github" }, "original": { @@ -1219,11 +1252,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -1252,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1720194466, + "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", "type": "github" }, "original": { @@ -1277,11 +1310,11 @@ "xremap": "xremap_2" }, "locked": { - "lastModified": 1716231478, - "narHash": "sha256-54nR//0El4CKIwIeWYHY0/HFeh+2s00/NUuemH5DDDA=", + "lastModified": 1721842203, + "narHash": "sha256-3tV6a9Ri6JTapeOQFuBpIjYk+R+F9RGiaG7Hpz1sTv8=", "owner": "xremap", "repo": "nix-flake", - "rev": "7a9a071a84c9b5bdd48d4b3eacf6efa448665aed", + "rev": "3717cb0539f4967010ba540baa439a4cf6ea8576", "type": "github" }, "original": { @@ -1293,16 +1326,16 @@ "xremap_2": { "flake": false, "locked": { - "lastModified": 1716230517, - "narHash": "sha256-ww0w5dCnbyqS64lOSLx+eURSi85uFlvIOUvA7Xlky1E=", + "lastModified": 1716231654, + "narHash": "sha256-TZvi5EOZ5Ekg8aGXCAzCcphJ7U5YsPtTWKTUQKZXEsg=", "owner": "k0kubun", "repo": "xremap", - "rev": "98bb9ee1b1e35bfed6370dbbdf5703a8799fec11", + "rev": "d1b17c4b9958feb5804f317b654ab3936f852c61", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.9.0", + "ref": "v0.10.0", "repo": "xremap", "type": "github" }