From 6622ba500146282e123eda65a70311987483a0b5 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 18 Mar 2025 17:34:57 -0400 Subject: [PATCH] updates --- flake.lock | 12 ++++++------ flake.nix | 1 - hosts/eddie/configuration.nix | 4 +--- modules/home/desktop.nix | 5 +---- modules/home/gnome.nix | 4 ++-- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 4ade433..7768ed6 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742311820, - "narHash": "sha256-35Rkoka7A/UT5gJwQm/7+ojj2BFKZzybJEL9QAL72y8=", + "lastModified": 1742317536, + "narHash": "sha256-z4BKMFoBT9RR7UVnOxmxtqlgKv193Suu6gLEEGImVP8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "91c89f41cb7c5a8804a7970cdfdaf9c401db6164", + "rev": "ad79b25bb65446895c811ccf348b961583649a16", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1742305478, - "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e979de0..e4a9e55 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,6 @@ #pr's nixpkgs-zotero.url = "github:Juul-Mc-Goa/nixpkgs/fix-zotero-linux"; - # nixpkgs-openrazer.url = "github:emaryn/nixpkgs/openrazer-daemon"; }; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 3163dcc..bbe3ee0 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -33,9 +33,8 @@ inputs.emacs-lsp-booster.overlays.default (final: prev: { + # use unmerged pr's inherit (inputs.nixpkgs-zotero.legacyPackages.${prev.system}) zotero; - # inherit (inputs.nixpkgs-openrazer.legacyPackages.${prev.system}.python3Packages) openrazer; - # inherit (inputs.nixpkgs-openrazer.legacyPackages.${prev.system}) openrazer-daemon; }) (final: prev: { @@ -572,7 +571,6 @@ libressl.out libudev-zero.out mesa.out - # gtk4.out gst_all_1.gstreamer gst_all_1.gst-plugins-base glib diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index a230852..458a78e 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -171,10 +171,7 @@ }; iconTheme = { name = "Colloid"; - package = pkgs.colloid-icon-theme.override { - colorVariants = [ "grey" ]; - schemeVariants = [ "nord" ]; - }; + package = pkgs.colloid-icon-theme; }; }; diff --git a/modules/home/gnome.nix b/modules/home/gnome.nix index 22198e5..ca3deb6 100644 --- a/modules/home/gnome.nix +++ b/modules/home/gnome.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { @@ -25,7 +25,7 @@ "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; - # gtk-theme = "Colloid-Grey-Dark-Nord"; + gtk-theme = lib.mkForce "Colloid-Grey-Dark-Nord"; }; "org/gnome/shell/keybindings" = {