From 6f7b746fdb961794a389239d6c7bd40b3cc8155c Mon Sep 17 00:00:00 2001 From: cspark Date: Thu, 24 Oct 2024 08:33:46 +0100 Subject: [PATCH] Update nix flakes and disable prettier for now as causing issues --- flake.lock | 93 ++++++-------------- flake.nix | 6 +- global.nix | 2 +- modules/nixos/cspark-desktop-niri/module.nix | 2 +- 4 files changed, 34 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 49603ded..140bdab5 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726426731, - "narHash": "sha256-h3m3ld3Awh8PzBPWV1i7/DtxGVTIjBMxCjPKQTr5W4Q=", + "lastModified": 1729714794, + "narHash": "sha256-PEwoiKu9wTp21eFldyDkRJWB9pq8DE9wGC9hL5jfZnI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fd00de202cc0287f7b34c237b8585e67fe7b85f7", + "rev": "c8a91169d21f16a9eb046c25a7964348e9726bb6", "type": "github" }, "original": { @@ -117,11 +117,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1726412705, - "narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=", + "lastModified": 1729444736, + "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=", "owner": "YaLTeR", "repo": "niri", - "rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6", + "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724296831, - "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=", + "lastModified": 1729400108, + "narHash": "sha256-aKCdN1LjqHMIyVX44ETMkWCH1olh1Rd+AaKLFUDHMuA=", "owner": "nix-community", "repo": "nixd", - "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88", + "rev": "d3c7e560bb8034926628099a04deb26afd575e1f", "type": "github" }, "original": { @@ -169,14 +169,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-lib_2": { @@ -199,11 +199,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -215,27 +215,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -250,8 +234,7 @@ "home-manager": "home-manager", "niri": "niri", "nixd": "nixd", - "nixpkgs": "nixpkgs_2", - "xwayland-satellite-flake": "xwayland-satellite-flake" + "nixpkgs": "nixpkgs_2" } }, "treefmt-nix": { @@ -275,24 +258,6 @@ "type": "github" } }, - "xwayland-satellite-flake": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1722946192, - "narHash": "sha256-WvRriuUz5f11qTMu3BmEY6AUTvhPNqqfESWdhrlPv04=", - "owner": "cspark-development", - "repo": "xwayland-satellite-flake", - "rev": "beb22168c6cbc1198b93c7d6b0627b128bc964b2", - "type": "github" - }, - "original": { - "owner": "cspark-development", - "repo": "xwayland-satellite-flake", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -313,11 +278,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1726378112, - "narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=", + "lastModified": 1729664985, + "narHash": "sha256-M3uEImeFZnTUMy+mkj73ybANTdPUHtMfhN16uLDMl5s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4", + "rev": "b988762955859f1bd53f4b494ca12b6ba3e1480f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 39a423ff..7ecc5437 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,9 @@ url = "github:nix-community/nixd"; }; - xwayland-satellite-flake = { - url = "github:cspark-development/xwayland-satellite-flake"; - }; + #xwayland-satellite-flake = { + # url = "github:cspark-development/xwayland-satellite-flake"; + #}; }; diff --git a/global.nix b/global.nix index 1c9a4b7a..c124aa9d 100644 --- a/global.nix +++ b/global.nix @@ -42,7 +42,7 @@ ansible-lint nginx-language-server docker-compose-language-service - nodePackages.prettier + # nodePackages.prettier nodePackages.typescript-language-server nodePackages.bash-language-server python312Packages.jedi-language-server diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix index 9946ed21..3626ddaa 100644 --- a/modules/nixos/cspark-desktop-niri/module.nix +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -32,7 +32,7 @@ in wlprop # Clone of X11 xprop for wayland (To get window class names etc) wev # Clone of X11 xev for wayland waybar # Status bar - xwayland-satellite # Xwayland support via xwayland-satellite-flake + xwayland-satellite # Xwayland support outside your Wayland compositor swayimg # Image viewer lxqt.pcmanfm-qt # File Manager