From e79499c35fe07f22fd9826c1ed6d624a677821fa Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Thu, 17 Jul 2025 08:46:43 +0100 Subject: [PATCH] fix and update to 25.05 woo --- flake.lock | 451 ++++++++++++---------------- flake.nix | 10 +- home/c/programs/default.nix | 1 - home/c/programs/firefox/default.nix | 57 ++-- home/c/programs/waybar/default.nix | 5 +- home/c/services/default.nix | 3 +- home/c/services/kanshi/default.nix | 18 +- home/c/services/mako/default.nix | 2 +- hosts/artemis/configuration.nix | 6 +- hosts/artemis/styling.nix | 2 +- modules/nix.nix | 7 +- 11 files changed, 261 insertions(+), 301 deletions(-) diff --git a/flake.lock b/flake.lock index 692f210..2fc5c39 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1725883717, - "narHash": "sha256-QifFNLfu5bzKPO4iznCj1h+nHhqGZ8NR2Lo7tzh9FRc=", + "lastModified": 1750151065, + "narHash": "sha256-il+CAqChFIB82xP6bO43dWlUVs+NlG7a4g8liIP5HcI=", "owner": "rustsec", "repo": "advisory-db", - "rev": "7fbf1e630ae52b7b364791a107b5bee5ff929496", + "rev": "7573f55ba337263f61167dbb0ea926cdc7c8eb5d", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -123,10 +123,7 @@ }, "crane": { "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1717535930, @@ -144,11 +141,11 @@ }, "crane_2": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -211,11 +208,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -248,11 +245,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726116637, - "narHash": "sha256-tU2GhwU887mPg6C4c2k+CEBAnKY6R0tSeQYtoqjZmLM=", + "lastModified": 1751870679, + "narHash": "sha256-aP4korVsN5Yy+PB9zjjm8Qbo3a69/m8vlFXS5mdVXtk=", "owner": "nix-community", "repo": "fenix", - "rev": "96a04a213838c5001619ad57400c5a176fa040b1", + "rev": "95606d64662a730da5d3031ed798dd6315d35f33", "type": "github" }, "original": { @@ -269,11 +266,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1744631258, - "narHash": "sha256-nTp6oMFtMaCSxO2b68M+rGOnwZadl6l3u1nBOQTPQVU=", + "lastModified": 1752033806, + "narHash": "sha256-XUHXDV8vwVjX6aYeJmPShMGJI9jx+JC0yWw0hsKbtMw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9c0fd77a2592f26690beb9ad5cf7d92300ba7912", + "rev": "08bd298d38f4110a3049cbe1876c1c77a8b4797f", "type": "gitlab" }, "original": { @@ -301,11 +298,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -346,22 +343,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -369,11 +350,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -426,11 +407,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -460,6 +441,27 @@ "type": "github" } }, + "flake-parts_6": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-root": { "locked": { "lastModified": 1692742795, @@ -479,24 +481,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -511,12 +495,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": [ - "stylix", - "systems" - ] + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -564,32 +545,6 @@ "type": "github" } }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -633,41 +588,19 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -680,11 +613,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -700,16 +633,16 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1752391422, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "c26266790678863cce8e7460fdbf0d80991b1906", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -736,7 +669,6 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -744,27 +676,27 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } }, "mnw": { "locked": { - "lastModified": 1742255973, - "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -773,34 +705,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nish": { "inputs": { "advisory-db": "advisory-db", @@ -823,11 +727,11 @@ ] }, "locked": { - "lastModified": 1726125131, - "narHash": "sha256-b6wzPTyJTpxj75m+rklNY6FhTsXG+HAA9664qC+U+ew=", + "lastModified": 1751876103, + "narHash": "sha256-RdaB+ZyGJp9HYWVov8mv768dXVv63JnMWNql5dErWEE=", "owner": "callumio", "repo": "nish", - "rev": "75e7c33a87873f2b4bbcf3d8cfd221bab91eba9f", + "rev": "e0d8eec64f06f26fa474d27aec125ba9809c5f77", "type": "github" }, "original": { @@ -934,16 +838,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1752683762, + "narHash": "sha256-CVC4bpthYhKk4Qb4mt00SqfJ7CJ4vfTX06pLN2OHa1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "fa64ec5c1ca6f17746f3defedb988b9248e97616", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -968,11 +872,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -998,6 +902,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1752308619, + "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1711163522, "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", @@ -1013,13 +933,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1743076231, - "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c5963357f3c1c840201eda129a99d455074db04", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "type": "github" }, "original": { @@ -1029,7 +949,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1075,6 +995,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752479139, + "narHash": "sha256-GXg1mOZdVPeAiMrm1pfG+h4yg2dZ+XHcg/ur6Gelko4=", + "owner": "nix-community", + "repo": "NUR", + "rev": "e73ef793ac91b183505a7a5122e12ce86da2fe63", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nvf": { "inputs": { "nixpkgs": [ @@ -1083,11 +1028,11 @@ "nvf": "nvf_2" }, "locked": { - "lastModified": 1744191266, - "narHash": "sha256-c8sBC1Kr67IVAUm4xjeNbm7BM+5Wyy2BqlJuUQssxEg=", + "lastModified": 1752050492, + "narHash": "sha256-vSqGDFGeECMDAWt4NPJzwhQgjC8U5cNDsqndaBQFSB0=", "owner": "callumio", "repo": "nvf", - "rev": "502e30cfbd4582994efb75c8f68a8387046c8a94", + "rev": "89fb54a7bb0220a28166a288cbab236948ae5477", "type": "github" }, "original": { @@ -1101,16 +1046,15 @@ "flake-parts": "flake-parts_4", "flake-utils": "flake-utils_2", "mnw": "mnw", - "nil": "nil", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "systems": "systems_4" }, "locked": { - "lastModified": 1743551988, - "narHash": "sha256-tUfTPHXiVf0LxjbMqw0nDAtnLdKcL8Ha0LfrgTwcBb8=", + "lastModified": 1752001027, + "narHash": "sha256-JgP8lW4QBr9v/U4ETaIOMvGCd/DAA1AjZ1lqjIwfWno=", "owner": "notashelf", "repo": "nvf", - "rev": "ae23c34be1e358f28b9cb54f304bcf4cb9ae28f8", + "rev": "c4d80273aaefeadaad96db97d077c647942b0e96", "type": "github" }, "original": { @@ -1131,7 +1075,7 @@ "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-flake": "rust-flake", "systems": [ "systems" @@ -1139,11 +1083,11 @@ "true": "true" }, "locked": { - "lastModified": 1743926309, - "narHash": "sha256-hXoaIE4/6Gs8l7TTHsrM7lufHT2raLnSjMxl24BC8bw=", + "lastModified": 1750915300, + "narHash": "sha256-rPuCq5BcREVsNtc62WXF05WH319bZvdJqeDFJiWoBH0=", "owner": "juspay", "repo": "omnix", - "rev": "507639d4e64e618d1e95546d074d056748f5ecfb", + "rev": "d53458b11aced6939e237141253edab13f26fbed", "type": "github" }, "original": { @@ -1163,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -1215,7 +1159,7 @@ "lanzaboote": "lanzaboote", "nish": "nish", "nixinate": "nixinate", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nsbm": "nsbm", "nvf": "nvf", "omnix": "omnix", @@ -1229,11 +1173,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1725890120, - "narHash": "sha256-7bsWAKG/otbHj7wmCBrJ9P6ve2MFcoOlIh6wcx6ffKg=", + "lastModified": 1751792916, + "narHash": "sha256-YjyurHKMrUYKjnujSqjpFtHGYFCGr2Xpo1Xc1AYT1+M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e35227d186acd47d8e5f78cbd792d57ddf47d74b", + "rev": "0ac65592a833bf40238831dd10e15283d63c46d5", "type": "github" }, "original": { @@ -1250,7 +1194,7 @@ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1741121204, @@ -1268,10 +1212,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -1292,29 +1233,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nvf", - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "omnix", @@ -1342,7 +1260,7 @@ "flake-parts": "flake-parts_3", "flake-root": "flake-root", "nix-visualize": "nix-visualize", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix", "vulnix": "vulnix" }, @@ -1367,32 +1285,30 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "git-hooks": "git-hooks_2", + "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", - "home-manager": [ - "home-manager" - ], "nixpkgs": [ "nixpkgs" ], + "nur": "nur", "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744152965, - "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", + "lastModified": 1752450546, + "narHash": "sha256-LDZ5+izyjRnctLcxAOul7CVpSTV58NTpUdhYkj0Pq1c=", "owner": "danth", "repo": "stylix", - "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", + "rev": "752b31495507d3a693ad8fdfd0df6f4044fab6a3", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -1507,17 +1423,32 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, @@ -1537,6 +1468,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1566,11 +1513,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -1596,11 +1543,11 @@ }, "unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 59f4500..a9929b8 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixinate = { @@ -110,16 +110,14 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-24.11"; + url = "github:danth/stylix/release-25.05"; #url = "github:danth/stylix/993fcabd83d1e0ee5ea038b87041593cc73c1ebe"; inputs.nixpkgs.follows = "nixpkgs"; - - inputs.home-manager.follows = "home-manager"; }; omnix = { @@ -160,7 +158,7 @@ treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; + url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/c/programs/default.nix b/home/c/programs/default.nix index dc7a3f4..0321340 100644 --- a/home/c/programs/default.nix +++ b/home/c/programs/default.nix @@ -14,6 +14,5 @@ programs = { gpg.enable = true; - wpaperd.enable = true; }; } diff --git a/home/c/programs/firefox/default.nix b/home/c/programs/firefox/default.nix index 149322a..0c9ad1a 100644 --- a/home/c/programs/firefox/default.nix +++ b/home/c/programs/firefox/default.nix @@ -7,32 +7,35 @@ }; profiles.c = { - bookmarks = [ - { - name = "NixOS"; - toolbar = true; - bookmarks = [ - { - name = "Packages"; - url = "https://search.nixos.org"; - } - { - name = "Wiki"; - url = "https://nixos.wiki"; - } - ]; - } - { - name = "News"; - toolbar = true; - bookmarks = [ - { - name = "Al Jazeera"; - url = "https://aljazeera.com"; - } - ]; - } - ]; + bookmarks = { + force = true; + settings = [ + { + name = "NixOS"; + toolbar = true; + bookmarks = [ + { + name = "Packages"; + url = "https://search.nixos.org"; + } + { + name = "Wiki"; + url = "https://nixos.wiki"; + } + ]; + } + { + name = "News"; + toolbar = true; + bookmarks = [ + { + name = "Al Jazeera"; + url = "https://aljazeera.com"; + } + ]; + } + ]; + }; containers = {}; @@ -42,7 +45,7 @@ userContent = ""; - extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ + extensions.packages = with inputs.firefox-addons.packages."x86_64-linux"; [ bitwarden ublock-origin darkreader diff --git a/home/c/programs/waybar/default.nix b/home/c/programs/waybar/default.nix index 1d941fc..d11c151 100644 --- a/home/c/programs/waybar/default.nix +++ b/home/c/programs/waybar/default.nix @@ -7,10 +7,7 @@ in { programs.waybar = { enable = true; - package = pkgs.waybar.override { - hyprlandSupport = true; - swaySupport = false; - }; + package = pkgs.waybar; systemd.enable = true; settings = { mainBar = { diff --git a/home/c/services/default.nix b/home/c/services/default.nix index 803374c..0a19433 100644 --- a/home/c/services/default.nix +++ b/home/c/services/default.nix @@ -3,10 +3,11 @@ services = { network-manager-applet.enable = true; mpris-proxy.enable = true; + wpaperd.enable = true; gpg-agent = { enable = true; enableSshSupport = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentry.package = pkgs.pinentry-gnome3; }; }; } diff --git a/home/c/services/kanshi/default.nix b/home/c/services/kanshi/default.nix index 244c608..4038606 100644 --- a/home/c/services/kanshi/default.nix +++ b/home/c/services/kanshi/default.nix @@ -14,7 +14,7 @@ ]; } { - profile.name = "work"; + profile.name = "work1"; profile.outputs = [ { criteria = "HP Inc. HP E27 G5 CNC33810R4"; @@ -29,6 +29,22 @@ } ]; } + { + profile.name = "work2"; + profile.outputs = [ + { + criteria = "Samsung Electric Company LF27T35 H4ZNB01306"; + mode = "1920x1080@60.00Hz"; + position = "0,0"; + } + { + criteria = "eDP-1"; + status = "enable"; + scale = 1.0; + position = "1920,0"; + } + ]; + } ]; }; } diff --git a/home/c/services/mako/default.nix b/home/c/services/mako/default.nix index cb6b0e2..3a67789 100644 --- a/home/c/services/mako/default.nix +++ b/home/c/services/mako/default.nix @@ -1,6 +1,6 @@ {...}: { services.mako = { enable = true; - defaultTimeout = 7000; + settings.defaultTimeout = 7000; }; } diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index 6b513dd..faffddd 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -50,5 +50,9 @@ shells = with pkgs; [fish]; }; - fonts.packages = with pkgs; [nerdfonts meslo-lgs-nf]; + fonts.packages = with pkgs; [meslo-lgs-nf] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); + services.udev.packages = [ + pkgs.platformio-core.udev + pkgs.openocd + ]; } diff --git a/hosts/artemis/styling.nix b/hosts/artemis/styling.nix index bbf2941..dd3ae0e 100644 --- a/hosts/artemis/styling.nix +++ b/hosts/artemis/styling.nix @@ -19,7 +19,7 @@ fonts = { monospace = { - package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrainsMono Nerd Font Mono"; }; diff --git a/modules/nix.nix b/modules/nix.nix index 7e99582..df56701 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,10 +1,5 @@ -{ - pkgs, - inputs, - ... -}: { +{inputs, ...}: { nix = { - package = pkgs.nixVersions.nix_2_23; registry.nixpkgs.flake = inputs.nixpkgs; gc = { automatic = true;