From 0e81e55bb1a4bab0ef84e5d8af407e6ed329fd2d Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Fri, 14 Apr 2023 12:05:55 +0200 Subject: [PATCH] chore: Update flake.lock and fix evaluation errors --- flake.lock | 489 +++++++++++++++++++++++++--------- hardware/thinkpad-p1-gen3.nix | 3 - hosts/helix-texta.nix | 50 ++-- hosts/murex-pecten.nix | 44 +-- modules/base-system.nix | 1 + users/malte/gtk.nix | 6 +- users/malte/helix.nix | 2 +- users/malte/sway.nix | 35 +-- 8 files changed, 421 insertions(+), 209 deletions(-) diff --git a/flake.lock b/flake.lock index 167229f..12af5c6 100644 --- a/flake.lock +++ b/flake.lock @@ -16,14 +16,30 @@ "type": "github" } }, + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1678924180, + "narHash": "sha256-5bwage/7JRiPiDY4wY3+OBiT8abY5f83hss6pQBklz8=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "0888b44843e3c86db9fd56334c7f5261ea00dc19", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { - "lastModified": 1665690101, - "narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=", + "lastModified": 1680729003, + "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced", + "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0", "type": "github" }, "original": { @@ -35,11 +51,11 @@ "cataclysm-dda": { "flake": false, "locked": { - "lastModified": 1675145333, - "narHash": "sha256-NEiKuj4sBLPIzmMObMXbiJOFu9klGuRO0aQp2WNapZc=", + "lastModified": 1681449849, + "narHash": "sha256-AbeHFAot95CCDuFp3fx/t2K1ktNjEg4SJGVKcIwhDPs=", "owner": "CleverRaven", "repo": "Cataclysm-DDA", - "rev": "03f25dcc19e8e27f765f768ef56cbd55dc6bbd29", + "rev": "40b1d9db0803890a047b97db7c3cdb219e1a983b", "type": "github" }, "original": { @@ -58,11 +74,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1675019967, - "narHash": "sha256-AD9udouBmfWxmsM1j6eNCu+HEB9E41+fA3XRIb765LU=", + "lastModified": 1675730932, + "narHash": "sha256-XcmirehPIcZGS7PzkS3WvAYQ9GBlBvCxYToIOIV2PVE=", "owner": "zhaofengli", "repo": "colmena", - "rev": "7602e548a78932bd28a7e2f621b3d62b4124e993", + "rev": "e034c15825c439131e4489de5a82cf8e5398fa61", "type": "github" }, "original": { @@ -82,11 +98,36 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1673405853, - "narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=", + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", "owner": "ipetkov", "repo": "crane", - "rev": "b13963c8c18026aa694acd98d14f66d24666f70b", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nickel", + "topiary", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", "type": "github" }, "original": { @@ -216,11 +257,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1675146246, - "narHash": "sha256-upQtcca/sThA5Jkmn5pDaYFoCmPLMyv7bGFCZFcVhqM=", + "lastModified": 1681280529, + "narHash": "sha256-WDPFJQpnkFFpWW2OSiR0hfPovmpeP004DIq89q6GyLs=", "owner": "nix-community", "repo": "fenix", - "rev": "97deb5c86b238c2a000ef4eb92fb40465f086706", + "rev": "0d8c62bb906470782a4aa36d93044e660088a3f8", "type": "github" }, "original": { @@ -248,11 +289,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -293,6 +334,21 @@ "type": "github" } }, + "flake-compat_5": { + "locked": { + "lastModified": 1680531544, + "narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "95e78dc12268c5e4878621845c511077f3798729", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -302,11 +358,11 @@ ] }, "locked": { - "lastModified": 1674771137, - "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { @@ -332,11 +388,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -347,11 +403,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -362,11 +418,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -376,6 +432,54 @@ } }, "flake-utils_5": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -439,11 +543,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674928308, - "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=", + "lastModified": 1681457346, + "narHash": "sha256-9cDHr8CRhcH7zdDpcHL5f/Cks7ecezlbGxqhHuhZTvs=", "owner": "nix-community", "repo": "home-manager", - "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306", + "rev": "8631c0441614587a10c9e10372f85561211a4bb8", "type": "github" }, "original": { @@ -463,11 +567,11 @@ ] }, "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "lastModified": 1679916613, + "narHash": "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0=", "owner": "NixOS", "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "rev": "082495e34e094cae1eb49dbfc5648938e23c6355", "type": "github" }, "original": { @@ -484,11 +588,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681333239, - "narHash": "sha256-FDv4fkN67tD1l9fd8AljcbTrdVWm6m9KtBuuDVxzaws=", + "lastModified": 1681432975, + "narHash": "sha256-y1YM/fBDiEdXnR23E8vTj7Wei5aYBjyoTsTXjQ1XIpY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4bc3f9adbe7563817a9e1c6eac6f5e435f7db957", + "rev": "011600ac6e7f6d52f69d0890bffba519a9d81e3f", "type": "github" }, "original": { @@ -542,11 +646,11 @@ "jovian-nixos": { "flake": false, "locked": { - "lastModified": 1673947327, - "narHash": "sha256-F47OS8ABmA77THZglhryGRYpQVP4oOOlUMFiwWanKQE=", + "lastModified": 1681078890, + "narHash": "sha256-zcRbZ12jl6MB1UMLH6daBIrc5XVw0IskZD8b6Zps/aQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "212c8e630b7267a5a712b3b20e4403cf232fd9e0", + "rev": "0586e3d1f3689ccd4c8820d2fd7775b39eb14c0d", "type": "github" }, "original": { @@ -557,15 +661,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_7", "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1674994116, - "narHash": "sha256-KHcCk/EnKqC1Dl5hFnJVNJ4AwOQSgYKG/xG7FZxGzsI=", + "lastModified": 1681214977, + "narHash": "sha256-pBaG4iKzF/YJQA06f87IZokB15Z13DYd6zsT/wlbWfI=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "c15111d65432ee32ce64d31b268219e2d4d1bae6", + "rev": "19d70ca7a81956bd01a768297b84798f301e150f", "type": "github" }, "original": { @@ -617,14 +721,15 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_2", + "topiary": "topiary" }, "locked": { - "lastModified": 1675155643, - "narHash": "sha256-DSsBtlbbyQs18Cc4hOd1gAYa4/FSyyJ0UGUfKhLk42k=", + "lastModified": 1681463666, + "narHash": "sha256-courxrY4wORAy5h5Bsv8nWniLf3yIAEcD6iJtQRJAA4=", "owner": "tweag", "repo": "nickel", - "rev": "b930544978e657dc2f214a9357bcbb06979095d7", + "rev": "3fc7ad8fde2f266c8dc28f12e5988296faeeb633", "type": "github" }, "original": { @@ -638,11 +743,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1672236234, - "narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=", + "lastModified": 1680875144, + "narHash": "sha256-Ub/Y+/zoAoji+E7WCLbTykcTmfRiyzLJ5QEyR3NbHgY=", "owner": "Misterio77", "repo": "nix-colors", - "rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1", + "rev": "41cc6c1086a4d26509f9fc80a538131d03a11234", "type": "github" }, "original": { @@ -654,14 +759,14 @@ "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1675041725, - "narHash": "sha256-b1C+pLPA7ZWp3mDtMoFIEKmBhCSSCpe6tTpLP0Vc8Es=", + "lastModified": 1681421147, + "narHash": "sha256-VSxwnvZFR8Kro784wG75D+FnhhqS1ObhQacFKIp42W4=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "dd47d16dc2d88a210197079b362ffefed09a4265", + "rev": "a5bb26e9ea62b160df617577ff97ab778d5221aa", "type": "github" }, "original": { @@ -670,6 +775,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1678109515, + "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixCargoIntegration": { "inputs": { "devshell": "devshell", @@ -778,11 +898,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1674550793, - "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -809,11 +929,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1655599917, - "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", "type": "github" }, "original": { @@ -824,11 +944,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1674953599, - "narHash": "sha256-DlAzFbth2P6Hp1M7smDd1apa2dJdxw3FeaWpl03LWeU=", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a6486be6c11c609cd60c01a427279e8a80a025fa", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "type": "github" }, "original": { @@ -855,11 +975,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", "type": "github" }, "original": { @@ -871,11 +991,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1674352297, - "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", + "lastModified": 1681005198, + "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e", + "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a", "type": "github" }, "original": { @@ -887,17 +1007,17 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1675160077, - "narHash": "sha256-DyQDjd3Kx95uby8Dd7Z6O9rim2J2weSHD90aFE9A1eg=", + "lastModified": 1681461427, + "narHash": "sha256-CKFCCJXlNeA4L3Tb2R0CDB5a7ibtapTGNLyIE8qL4WM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "95408e974fd4a118ecff9820694d0c35750a18eb", + "rev": "44092961ba2fc12d12f947a5a728dc6df3918668", "type": "github" }, "original": { @@ -922,6 +1042,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1628869426, @@ -988,11 +1124,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1675115703, - "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=", + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { @@ -1001,13 +1153,13 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1675040521, - "narHash": "sha256-+YhT+lQT95qHcj5SNXdRFqIV/SvAezT90T8GzqQ94lE=", + "lastModified": 1681347147, + "narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99f5676ba0a0c2d7605b63b2dd1b146c384f42dd", + "rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", "type": "github" }, "original": { @@ -1017,33 +1169,17 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "NixOS", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1064,11 +1200,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1674122161, - "narHash": "sha256-9QM4rvgUSEwO8DWtJN9sR/afEqrH1s3b6ACsZT5wiAM=", + "lastModified": 1678976941, + "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "53e766957b73298fa68b47478c48cbcc005cc18a", + "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e", "type": "github" }, "original": { @@ -1080,11 +1216,11 @@ "qmk-udev-rules": { "flake": false, "locked": { - "lastModified": 1675068466, - "narHash": "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI=", + "lastModified": 1681358642, + "narHash": "sha256-8HYCfj0wJaVHwPVlGLAYYIjQ1yhwvUhRWJwbWaEThSE=", "owner": "qmk", "repo": "qmk_firmware", - "rev": "e296d671463f38a78c75ee0727016939634ef985", + "rev": "6d965d486c08166c6d6d8d699721a02b053d35d0", "type": "github" }, "original": { @@ -1144,7 +1280,7 @@ "nix-colors": "nix-colors", "nixForHydra": "nixForHydra", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-wayland": "nixpkgs-wayland", "nixpkgsForNixForHydra": "nixpkgsForNixForHydra", "qmk-udev-rules": "qmk-udev-rules", @@ -1158,11 +1294,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1675097868, - "narHash": "sha256-BKFLjEzdoFWso7Artln7djf8RbtBynj9wZKIj22LV5g=", + "lastModified": 1681234995, + "narHash": "sha256-QQxQAG5QZG8z/uRREhWnq4215Asl7Gh6a8zj7swDyP4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b75803ad31772d105d86f8ebee0cbc8844a4fa29", + "rev": "7501d3b721560637e27f904d9fce79182c41bef7", "type": "github" }, "original": { @@ -1186,11 +1322,11 @@ ] }, "locked": { - "lastModified": 1672712534, - "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", "type": "github" }, "original": { @@ -1211,11 +1347,59 @@ ] }, "locked": { - "lastModified": 1674267882, - "narHash": "sha256-53sIczqxA5BbrhgO6l54DSisDqHvQ3UUwbSqBryA/k0=", + "lastModified": 1679106165, + "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1fd6d280c132f4facad8cd023543fb10121e6487", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "nickel", + "topiary", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "topiary", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1679106165, + "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", "type": "github" }, "original": { @@ -1296,11 +1480,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1674546403, - "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", + "lastModified": 1681209176, + "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", + "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", "type": "github" }, "original": { @@ -1325,13 +1509,54 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "topiary": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane_2", + "flake-utils": "flake-utils_5", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1680178226, + "narHash": "sha256-EZtmLYPQII8Ma9yH0udqlNjSXiYUg134j+0Srzb4rbM=", + "owner": "tweag", + "repo": "topiary", + "rev": "1af03d77abf6aef3ea36f878554c16619207252b", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "topiary", + "type": "github" + } + }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -1342,7 +1567,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1657226504, @@ -1379,14 +1604,14 @@ "xdg-desktop-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1681127512, - "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", + "lastModified": 1681416853, + "narHash": "sha256-JLmpeHo6rBWSXkr1REE2DkHDFYcRcUMEvHSayhDoxaA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", + "rev": "2366b4d415900b72c4001770ed8456bcfff569f4", "type": "github" }, "original": { diff --git a/hardware/thinkpad-p1-gen3.nix b/hardware/thinkpad-p1-gen3.nix index 6e976ac..554dce1 100644 --- a/hardware/thinkpad-p1-gen3.nix +++ b/hardware/thinkpad-p1-gen3.nix @@ -40,9 +40,6 @@ settings.nvidiaUsed = true; hardware = { - # high-resolution display - video.hidpi.enable = lib.mkDefault true; - # Enable bluetooth bluetooth.enable = true; diff --git a/hosts/helix-texta.nix b/hosts/helix-texta.nix index 1b05955..0d92b09 100644 --- a/hosts/helix-texta.nix +++ b/hosts/helix-texta.nix @@ -39,34 +39,34 @@ pulse.enable = true; jack.enable = true; - config.pipewire-pulse."stream.properties" = { - "channelmix.upmix" = true; - "channelmix.lfe-cutoff" = 150; - }; + # config.pipewire-pulse."stream.properties" = { + # "channelmix.upmix" = true; + # "channelmix.lfe-cutoff" = 150; + # }; - config.pipewire = {"default.clock.allowed-rates" = [48000 44100];}; + # config.pipewire = {"default.clock.allowed-rates" = [48000 44100];}; - media-session.config.media-session = lib.recursiveUpdate options.services.pipewire.media-session.config.media-session.default { - "session.modules".default = options.services.pipewire.media-session.config.media-session.default."session.modules".default ++ ["default-profile"]; - }; + # media-session.config.media-session = lib.recursiveUpdate options.services.pipewire.media-session.config.media-session.default { + # "session.modules".default = options.services.pipewire.media-session.config.media-session.default."session.modules".default ++ ["default-profile"]; + # }; - media-session.config.alsa-monitor = { - rules = [ - { - matches = [ - { - "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y7ENM550A6399B-00.pro-output-0"; - } - ]; - actions = { - update-props = { - #"audio.rate" = 96000; - "api.alsa.headroom" = 1024; - }; - }; - } - ]; - }; + # media-session.config.alsa-monitor = { + # rules = [ + # { + # matches = [ + # { + # "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y7ENM550A6399B-00.pro-output-0"; + # } + # ]; + # actions = { + # update-props = { + # #"audio.rate" = 96000; + # "api.alsa.headroom" = 1024; + # }; + # }; + # } + # ]; + # }; }; xdg.portal = { enable = true; diff --git a/hosts/murex-pecten.nix b/hosts/murex-pecten.nix index ff4d1da..41e6a1d 100644 --- a/hosts/murex-pecten.nix +++ b/hosts/murex-pecten.nix @@ -33,30 +33,30 @@ pulse.enable = true; jack.enable = true; - config.pipewire-pulse."stream.properties" = { - "channelmix.upmix" = true; - "channelmix.lfe-cutoff" = 150; - }; + # config.pipewire-pulse."stream.properties" = { + # "channelmix.upmix" = true; + # "channelmix.lfe-cutoff" = 150; + # }; - config.pipewire."default.clock.allowed-rates" = [48000 44100]; + # config.pipewire."default.clock.allowed-rates" = [48000 44100]; - media-session.config.alsa-monitor = { - rules = [ - { - matches = [ - { - "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y7ENM550A6399B-00.pro-output-0"; - } - ]; - actions = { - update-props = { - #"audio.rate" = 96000; - "api.alsa.headroom" = 1024; - }; - }; - } - ]; - }; + # media-session.config.alsa-monitor = { + # rules = [ + # { + # matches = [ + # { + # "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y7ENM550A6399B-00.pro-output-0"; + # } + # ]; + # actions = { + # update-props = { + # #"audio.rate" = 96000; + # "api.alsa.headroom" = 1024; + # }; + # }; + # } + # ]; + # }; }; xdg.portal = { diff --git a/modules/base-system.nix b/modules/base-system.nix index 22bd030..bc1e8d9 100644 --- a/modules/base-system.nix +++ b/modules/base-system.nix @@ -35,6 +35,7 @@ in { printing.enable = mkEnableOption "the printing/printers configuration"; ssh.openOutsideVPN = mkEnableOption "an additional ssh port outside the VPN"; batteryStuff.enable = mkEnableOption "battery-related things"; + hiDPI.enable = mkEnableOption "High-DPI display"; }; config = { diff --git a/users/malte/gtk.nix b/users/malte/gtk.nix index 8009f74..3caa6d3 100644 --- a/users/malte/gtk.nix +++ b/users/malte/gtk.nix @@ -1,15 +1,11 @@ { pkgs, - lib, config, - nixosConfig, nix-colors, ... }: let - hiDPI = nixosConfig.hardware.video.hidpi.enable; - pkg = pkgs.callPackage ../../pkgs/gruvbox-material-gtk.nix {inherit hiDPI;}; inherit (nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; -in rec { +in { home.packages = [ (gtkThemeFromScheme {scheme = config.colorsLight;}) (gtkThemeFromScheme {scheme = config.colorsDark;}) diff --git a/users/malte/helix.nix b/users/malte/helix.nix index 564b1da..44de6ef 100644 --- a/users/malte/helix.nix +++ b/users/malte/helix.nix @@ -127,7 +127,7 @@ in { # Some helpful language servers rnix-lsp yaml-language-server - python-language-server + python311Packages.python-lsp-server nodePackages.bash-language-server taplo-lsp beancount diff --git a/users/malte/sway.nix b/users/malte/sway.nix index eea19cd..d430e05 100644 --- a/users/malte/sway.nix +++ b/users/malte/sway.nix @@ -26,10 +26,7 @@ bemenu = pkgs.callPackage ../../pkgs/bemenu-configured.nix {inherit config;}; grim = "${pkgs.grim}/bin/grim"; wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; - wf-recorder = "${pkgs.wf-recorder}/bin/wf-recorder"; slurp = "${pkgs.slurp}/bin/slurp -db '#000000AA' -c '#${colDark.base0D}' -w1"; - fuser = "${pkgs.psmisc}/bin/fuser"; - alsa_rec = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink.monitor"; doNotDisturb = pkgs.callPackage ../../pkgs/do-not-disturb.nix {}; screenshot-path = "/home/malte/Pictures/screenshots/screenshot.png"; @@ -39,7 +36,7 @@ cfg = config.settings.sway; inherit (nixosConfig.settings) nvidiaUsed; - hiDPI = nixosConfig.hardware.video.hidpi.enable; + hiDPI = nixosConfig.settings.hiDPI.enable; in { imports = [./waybar.nix ./gtk.nix ./qt.nix ./pass.nix ./mako.nix ./kanshi.nix]; @@ -222,24 +219,20 @@ in { size = 8.0; }; - modes = let - mod = config.wayland.windowManager.sway.config.modifier; - in - lib.mkOptionDefault { - window = { - "Escape" = "mode default"; - "1" = let - width = 1920; - win_width = 500; - win_height = 500 * 9 / 16; - str = builtins.toString; - in "floating enable; sticky enable; resize set width ${ - str win_width - }px height ${str win_height}px; move position ${ - str (1920 - win_width) - }px 0px"; - }; + modes = lib.mkOptionDefault { + window = { + "Escape" = "mode default"; + "1" = let + win_width = 500; + win_height = 500 * 9 / 16; + str = builtins.toString; + in "floating enable; sticky enable; resize set width ${ + str win_width + }px height ${str win_height}px; move position ${ + str (1920 - win_width) + }px 0px"; }; + }; input = { # Build into the Thinkpad