From 7309e102bf3bfbc6869ad70d3340efad78ea9f7b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 15 May 2025 23:02:11 -0400 Subject: [PATCH] flake openrgb and beets --- a.out | 0 flake.lock | 80 +++++++++++++++++++++++----------- flake.nix | 2 - homes/emenel/default.nix | 1 + hosts/eddie/configuration.nix | 9 ++++ modules/home/beets/config.yaml | 2 +- modules/system/kanata.nix | 6 ++- 7 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 a.out diff --git a/a.out b/a.out new file mode 100644 index 0000000..e69de29 diff --git a/flake.lock b/flake.lock index e6a6828..c5dd210 100644 --- a/flake.lock +++ b/flake.lock @@ -4,9 +4,7 @@ "inputs": { "elemental-wine-source": "elemental-wine-source", "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -90,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1747330516, - "narHash": "sha256-8yvJkWH/VarFQXUS6uBuGveBjFJuWf4kDrCVDYaILs4=", + "lastModified": 1747362374, + "narHash": "sha256-nHXQ8mq3eYq0aLGkGJudJFmq8NoQ0uCBQ+q2NISmDAY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f2919b676a957d15a7ef9976192acddf2b8325b2", + "rev": "6876891497fa209feda114600f4170d905abde53", "type": "github" }, "original": { @@ -293,7 +291,7 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -378,11 +376,11 @@ ] }, "locked": { - "lastModified": 1747334031, - "narHash": "sha256-AoicyrJCTsPAio47Vbwy+gJjUeDZtB+WMbzxZRwc7k0=", + "lastModified": 1747340209, + "narHash": "sha256-tUiXrwlJoG3dzJ+fSwv1S3VPU5ODSPZJHoBmlu4t344=", "owner": "nix-community", "repo": "home-manager", - "rev": "dbc90cc3ae9c8f927200a6ceaf4aa247ea6bc443", + "rev": "098e365dd83311cc8236f83ea6be42abb49a6c76", "type": "github" }, "original": { @@ -836,7 +834,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1725758175, @@ -946,16 +944,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1052,6 +1050,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1725103162, "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", @@ -1067,7 +1081,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1083,7 +1097,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -1099,7 +1113,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1745391562, "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", @@ -1115,11 +1129,27 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1735882644, @@ -1202,7 +1232,7 @@ "nix-rice": "nix-rice", "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_4", "sops-nix": "sops-nix", "waybar": "waybar", @@ -1479,7 +1509,7 @@ "waybar": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1745487176, @@ -1523,9 +1553,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay", "zlib": "zlib" }, diff --git a/flake.nix b/flake.nix index 7702143..294c0f7 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,6 @@ wezterm = { url = "github:wez/wezterm?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { @@ -85,7 +84,6 @@ affinity-nix = { url = "github:mrshmllow/affinity-nix"; - inputs.nixpkgs.follows = "nixpkgs"; }; isd = { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index c0af3ea..399dd39 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -30,6 +30,7 @@ ispell (aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ])) texlive.combined.scheme-full + openrgb-with-all-plugins ]) ]; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 0fef21d..345268f 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -145,6 +145,7 @@ win-spice xwayland-satellite openrazer-daemon + openrgb-with-all-plugins xdg-desktop-portal-termfilechooser ]; @@ -251,6 +252,7 @@ }; nvidiaSettings = true; }; + brillo.enable = true; steam-hardware.enable = true; bluetooth = { @@ -267,6 +269,12 @@ services.fstrim.enable = true; + services.hardware.openrgb = { + enable = true; + package = pkgs.openrgb-with-all-plugins; + motherboard = "amd"; + }; + services.logind = { extraConfig = '' IdleAction=lock @@ -290,6 +298,7 @@ pkgs.game-devices-udev-rules pkgs.sane-airscan pkgs.utsushi + pkgs.openrgb-with-all-plugins (pkgs.writeTextFile { name = "on-battery"; diff --git a/modules/home/beets/config.yaml b/modules/home/beets/config.yaml index 90552d5..87806c8 100644 --- a/modules/home/beets/config.yaml +++ b/modules/home/beets/config.yaml @@ -14,7 +14,7 @@ import: none_rec_action: asis duplicate_action: merge default_action: asis -plugins: fish discogs the duplicates embedart fetchart mbsync missing unimported inline lastgenre albumtypes ftintitle plexupdate importadded edit info mpdupdate +plugins: fish discogs the duplicates embedart fetchart mbsync missing unimported inline lastgenre albumtypes ftintitle plexupdate edit info mpdupdate match: ignored_media: ['Data CD', 'DVD', 'DVD-Video', 'Blu-ray', 'HD-DVD', 'VCD', 'SVCD', 'UMD', 'VHS'] diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 555ca91..fbec19e 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -1,7 +1,9 @@ -{ config, lib, pkgs, ... }: +{ inputs, pkgs, ... }: { - environment.systemPackages = [ pkgs.kanata ]; + environment.systemPackages = [ + pkgs.kanata + ]; # Add the Kanata service user to necessary groups systemd.services.kanata-razer.serviceConfig = {