From 8643c8b23a5e0d8e4b0767c55e050aca48566100 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 18 Mar 2025 10:23:57 -0400 Subject: [PATCH] updates --- flake.lock | 48 +++++++++++++++++------------------ flake.nix | 5 ++++ hosts/eddie/configuration.nix | 19 +++++++++++--- modules/home/desktop.nix | 7 ++--- modules/home/gnome.nix | 1 + 5 files changed, 50 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index f6e3f80..f56abfc 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742228686, - "narHash": "sha256-5Rg4Ew3RePdKDuBS2vHW08chCXNLTzzrbLe1JPWvKgI=", + "lastModified": 1742306570, + "narHash": "sha256-Lb4kJSRlpT3QjfC8IDbNP8QLyeKDCkCM1IH2K8DBWvo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d706c55c58c012dc917be46b9f973b048ea4cb53", + "rev": "3d30a184b68deddb95990a24c95f821f82c5abbe", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1742246081, - "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", + "lastModified": 1742305478, + "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", + "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742220949, - "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", + "lastModified": 1742305115, + "narHash": "sha256-EJu/9UNo8ndiZ7AUVTazWQOA4lHUaTkorvgVExo2LLs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", + "rev": "bc4f3a4d3d0fb9be399faf525caffd5b664c5d31", "type": "github" }, "original": { @@ -759,11 +759,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742103165, - "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "lastModified": 1742276600, + "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=", "owner": "YaLTeR", "repo": "niri", - "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a", "type": "github" }, "original": { @@ -963,11 +963,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -995,11 +995,11 @@ }, "nixpkgs-stable_4": { "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": { @@ -1463,11 +1463,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742083780, - "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "lastModified": 1742249030, + "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc", "type": "github" }, "original": { @@ -1485,11 +1485,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742199163, - "narHash": "sha256-LBmuV18HLukixHmbAKGqgHN9I5tAso0QnuFb18d2nfc=", + "lastModified": 1742288780, + "narHash": "sha256-6nJO2SlIvXs0y1DhKjTebj7+qoDmagDXzaPBkaTV+4c=", "owner": "sxyazi", "repo": "yazi", - "rev": "c5808a0db43f8924b014b1f4c3653683a207fa57", + "rev": "7632163678b1a24f39d0513a5ff4781056723bdb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d3d78d1..f8a03a7 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + xwayland-satellite = { + url = "github:Supreeeme/xwayland-satellite"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + yazi = { url = "github:sxyazi/yazi"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 43d54fc..f80ef3d 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=" @@ -150,7 +150,7 @@ # glfw-wayland # openssl appimage-run - xwayland-satellite + inputs.xwayland-satellite.xwayland-satellite xwayland-run cifs-utils # samba @@ -221,6 +221,15 @@ }; hardware = { + sane = { + enable = true; + extraBackends = [ + pkgs.hplipWithPlugin + pkgs.sane-airscan + pkgs.epkowa + pkgs.utsushi + ]; + }; i2c.enable = true; uinput.enable = true; openrazer = { @@ -311,6 +320,8 @@ pkgs.vial pkgs.ddcutil pkgs.game-devices-udev-rules + pkgs.sane-airscan + pkgs.utsushi (pkgs.writeTextFile { name = "on-battery"; @@ -564,7 +575,7 @@ libressl.out libudev-zero.out mesa.out - gtk4.out + # gtk4.out gst_all_1.gstreamer gst_all_1.gst-plugins-base glib @@ -650,6 +661,8 @@ "openrazer" "plugdev" "i2c-dev" + "scanner" + "lp" ]; packages = with pkgs; [ git diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 1d3c4c0..a230852 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -9,7 +9,6 @@ shikane mpv gnome - hyprlock hypridle ]; @@ -172,13 +171,15 @@ }; iconTheme = { name = "Colloid"; - package = pkgs.colloid-icon-theme; + package = pkgs.colloid-icon-theme.override { + colorVariants = [ "grey" ]; + schemeVariants = [ "nord" ]; + }; }; }; qt = { enable = true; - platformTheme.name = "gtk3"; style = { package = pkgs.adwaita-qt; name = "adwaita-dark"; diff --git a/modules/home/gnome.nix b/modules/home/gnome.nix index ce58cc0..22198e5 100644 --- a/modules/home/gnome.nix +++ b/modules/home/gnome.nix @@ -25,6 +25,7 @@ "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; + # gtk-theme = "Colloid-Grey-Dark-Nord"; }; "org/gnome/shell/keybindings" = {