From a52094c8a76d3686986fcbd932d0dcfcb7193875 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 7 Jan 2026 15:30:25 -0600 Subject: [PATCH] updating --- flake.lock | 288 +++++++++++++++++++------------------- modules/desktop.nix | 4 +- pkgs/desktop-packages.nix | 1 + 3 files changed, 150 insertions(+), 143 deletions(-) diff --git a/flake.lock b/flake.lock index a37c088..440caf2 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1764799851, - "narHash": "sha256-GSwYx+yFEZWUtRrUUyQjikvAErXZM/yLWtJYOWYlfKA=", + "lastModified": 1767742577, + "narHash": "sha256-ccMNAjOT8oU9rfOuZ5YV5lSyYRTf+ZrctJDawJMODvo=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "8c939e11edda228a529ed78701c327df4d38a4c4", + "rev": "4d482d71a8fd3d98c7771b97ff8d0c2d631f65df", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1765480787, - "narHash": "sha256-V5DTurvmO0tQZbcmejUDOErigARS3zzqUmLuzE1Hj28=", + "lastModified": 1767307217, + "narHash": "sha256-bngIoZrEK4GRItgdaym3bAatBrXV/HlRA7nsuCZQ614=", "owner": "sdaqo", "repo": "anipy-cli", - "rev": "7c0b8b4e7514b31df2e1fcc16df8c90b9740921e", + "rev": "6177ff227c3117107bfe472b6a84ea0d7f8374ef", "type": "github" }, "original": { @@ -66,17 +66,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -134,7 +134,7 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -154,14 +154,14 @@ }, "darkly": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1765222869, - "narHash": "sha256-LUYJ9Qgp0nELw3V2NyfMgAZnE+rx8eHbHgBKCNt5NWY=", + "lastModified": 1766433187, + "narHash": "sha256-REpIGNEntVGSffMhK1d3vz3QRfxjMiPpOLSuA1LOU74=", "owner": "Bali10050", "repo": "Darkly", - "rev": "f000d5a198d87ea2cb7fcb0a9906dcf0837dcdf8", + "rev": "e1c7e986c968c79849bb07e28395f3ef4c47cc40", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1765790297, - "narHash": "sha256-z7rsQrdC+6XAX/gwUbRkCNLpy6LNwfEQnunPE9oqmpc=", + "lastModified": 1767803522, + "narHash": "sha256-S6podKjKK1zlogdq7YBI7rmeQNp2e/A7fJjcnBMEBz8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2032215e38abcdf5a21bdc8c6a3565a0362063c8", + "rev": "4a1550b5d54ef8cdb5dd4db5558942e3466a946b", "type": "github" }, "original": { @@ -222,16 +222,16 @@ ] }, "locked": { - "lastModified": 1734005403, - "narHash": "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=", + "lastModified": 1766155727, + "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "f4de6c329b306a9d3a9798a30e060c166f781baa", + "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", "type": "github" }, "original": { "owner": "erikarvstedt", - "ref": "0.13", + "ref": "0.14", "repo": "extra-container", "type": "github" } @@ -320,11 +320,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1765480374, - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", + "lastModified": 1767811801, + "narHash": "sha256-QICeGwbXfqtaOZmgh6BrSBB72drPuHO3pjuyh+x8eIY=", "owner": "nix-community", "repo": "home-manager", - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", + "rev": "c068188a8e5c277f7bc8671557a7568864b57515", "type": "github" }, "original": { @@ -571,11 +571,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765528203, - "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", + "lastModified": 1767797159, + "narHash": "sha256-vbUQBtsyKtFB5YqTKdvOBstAKObPC1pxRigP/LZy8fw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", + "rev": "acfdefdd43810c099c0783862d7a41037f874d16", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765524373, - "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", + "lastModified": 1767792726, + "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", "owner": "YaLTeR", "repo": "niri", - "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", + "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", "type": "github" }, "original": { @@ -621,15 +621,16 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", + "nixpkgs-25_05": "nixpkgs-25_05", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1763988628, - "narHash": "sha256-ss6OdixftoK6Mttp7MLAo4ROxT1OCvfHP8JLsVmuhc0=", + "lastModified": 1767721199, + "narHash": "sha256-UzRxDiJlopBGPTjyhCdMP+QdTwXK+l+y45urXCyH69A=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "f1ebb5d2cd10a6fd4b94e370ceec9a7b7a6e3cd7", + "rev": "5b532698ce9e8bd79b07d77ab4fc60e1a8408f73", "type": "github" }, "original": { @@ -648,11 +649,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -686,11 +687,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -702,11 +703,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1765493315, - "narHash": "sha256-kbHgMF9VtVr8YpQs3DK9C1oIQE7CDbfCRXGhontsNJg=", + "lastModified": 1767808640, + "narHash": "sha256-sNFuxUl3VxbKbKc5paKLex9YnsGA1JeL88A3gGsOd4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "de8efc1c6e7c3cf774a41a075cff70da009b4e9a", + "rev": "0a2a75c03be78dd84edb14f4ae1a36a8228aa6d1", "type": "github" }, "original": { @@ -747,6 +748,22 @@ "type": "indirect" } }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1761765539, @@ -764,11 +781,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -779,11 +796,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -795,11 +812,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1767634882, + "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", "type": "github" }, "original": { @@ -811,11 +828,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -827,11 +844,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -858,22 +875,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -889,7 +890,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1735264675, "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", @@ -903,7 +904,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -952,11 +953,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -967,22 +968,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1714463564, - "narHash": "sha256-8+w/34w9azAHZA9TwvzdT2z7VFFEey7tXsan5q5bR1M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b03589f4d174bfd6ea9a9de6fb85333fd190f8b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -998,7 +983,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -1014,33 +999,49 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", - "owner": "nixos", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1074,16 +1075,16 @@ "octotype": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2", "systems": "systems_4" }, "locked": { - "lastModified": 1765067833, - "narHash": "sha256-gz+qNSbcjplDXLeeMgrL4YbTBJheq/wIRPYamKNt3Os=", + "lastModified": 1767487117, + "narHash": "sha256-LFQesCM2z5fa5mVmqwUmuMmhOqmBIXOGccO4aUOv5MU=", "owner": "mahlquistj", "repo": "octotype", - "rev": "6370a25b76bf293f3102db9267965b5ab51768a3", + "rev": "35dbd36249bdd903b00e88baea132309c40bd881", "type": "github" }, "original": { @@ -1125,20 +1126,24 @@ "inputs": { "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "anipy-cli", + "nixpkgs" + ], "systems": "systems_2", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716724736, - "narHash": "sha256-/KKrshurDivObtcKjDvXkyrdBaZXpBdlQ5KlOKrcBDg=", - "owner": "nix-community", + "lastModified": 1765578053, + "narHash": "sha256-pV/v6HWoygn9MvLWpVwA9HofKv3bMez+FwTr43DHcM4=", + "owner": "sdaqo", "repo": "poetry2nix", - "rev": "68df56fbb08ce0e9db98ce7fde737ab26525835b", + "rev": "816d5ec3fec51eac670f6a6ff24331bd010bcd5d", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "sdaqo", + "ref": "update-vendored-pyproject-nix", "repo": "poetry2nix", "type": "github" } @@ -1146,7 +1151,7 @@ "quickemu": { "inputs": { "flake-schemas": "flake-schemas_2", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1735561406, @@ -1173,7 +1178,7 @@ "nix-bitcoin": "nix-bitcoin", "nixos-hardware": "nixos-hardware", "nixos-unstable-small": "nixos-unstable-small", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_3", "octotype": "octotype", "quickemu": "quickemu", @@ -1204,14 +1209,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1764988672, - "narHash": "sha256-FIJtt3Zil89/hLy9i7f0R2xXcJDPc3CeqiiCLfsFV0Y=", + "lastModified": 1767408057, + "narHash": "sha256-0TD2PNTt6olOonFgcvZJcNGiU3x5cX+RMzrfWfHB9Jw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "086fd19a68e80fcc8a298e9df4674982e4c498a6", + "rev": "294198315a13d6d130565ad08e97685df7b0d458", "type": "github" }, "original": { @@ -1224,7 +1229,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -1263,11 +1268,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765474444, - "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "danth", "repo": "stylix", - "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { @@ -1301,8 +1306,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "systems_3": { @@ -1459,11 +1465,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "type": "github" }, "original": { @@ -1492,11 +1498,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765343581, - "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { diff --git a/modules/desktop.nix b/modules/desktop.nix index 66c399e..33f3a17 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -225,7 +225,7 @@ in environment.variables = { SAL_USE_VCLPLUGIN = "kf5"; - EDITOR = "emacsclient -t -a"; + EDITOR = lib.mkForce "emacsclient -t -a"; VISUAL = "emacsclient -c -a"; QT_LOGGING_RULES = "js=true; kwin_*.debug=true"; # GTK_USE_PORTAL = "1"; @@ -364,7 +364,7 @@ in # Android Tools - programs.adb.enable = true; + # programs.adb.enable = true; # services.udev.packages = [ pkgs.android-udev-rules ]; services.esphome = { enable = true; }; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 495cf8e..5658d0f 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -37,6 +37,7 @@ kdePackages.kdegraphics-thumbnailers kdePackages.kdesdk-thumbnailers inputs.affinity-nix.packages.x86_64-linux.v3 + android-tools # xfce.thunar # xfce.tumbler # xfce.thunar-media-tags-plugin