From f7777a492b0e8a0ac217b9dc94425fc12ba4a2b3 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 18 Mar 2025 10:48:48 -0400 Subject: [PATCH] updates --- flake.lock | 93 ++++++++++++++++++++++++++++++++--- hosts/eddie/configuration.nix | 20 ++------ 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f56abfc..6bbf83d 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742306570, - "narHash": "sha256-Lb4kJSRlpT3QjfC8IDbNP8QLyeKDCkCM1IH2K8DBWvo=", + "lastModified": 1742307032, + "narHash": "sha256-Qt1yqpH4K1SJymFTrnFLr0woH8HopWDLcJ4Wx8FSO1s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3d30a184b68deddb95990a24c95f821f82c5abbe", + "rev": "ecaf1d4d12cd4a6007bc73674d3398aa806c3993", "type": "github" }, "original": { @@ -233,6 +233,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "freetype2": { "flake": false, "locked": { @@ -947,11 +965,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -1163,6 +1181,7 @@ "nixpkgs-stable": "nixpkgs-stable_4", "sops-nix": "sops-nix", "wezterm": "wezterm", + "xwayland-satellite": "xwayland-satellite", "yazi": "yazi" } }, @@ -1188,6 +1207,27 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "xwayland-satellite", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739240901, + "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "yazi", @@ -1354,6 +1394,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -1443,6 +1498,28 @@ "type": "github" } }, + "xwayland-satellite": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1742249030, + "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -1478,11 +1555,11 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1742288780, diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index f80ef3d..1e37085 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -58,7 +58,7 @@ ]; substituters = [ "https://nix-community.cachix.org" - # "https://cache.garnix.io" + "https://cache.garnix.io" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -130,45 +130,33 @@ environment.systemPackages = with pkgs; [ wget - # libGL.out home-manager curl git-lfs - # tailscale rsync gnupg - # clinfo alsa-utils - # alsa-oss alsa-tools - # psutils util-linux - # libgtop - # fontconfig - # freetype - # egl-wayland - # glfw-wayland - # openssl appimage-run - inputs.xwayland-satellite.xwayland-satellite xwayland-run cifs-utils - # samba ddcutil - # ddcui greetd.tuigreet bluez-tools bluetuith qemu quickemu borgbackup - virt-viewer spice spice-gtk spice-protocol win-virtio win-spice + + xwayland-satellite + # inputs.xwayland-satellite.default ]; # Bootloader.