From 140f6040c51c0c7ec1ffd9676f04246c2918ac3a Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 26 Mar 2025 17:09:07 -0400 Subject: [PATCH] refactor --- .../dot_local => assets}/wallpapers/akira.png | Bin .../wallpapers/cornell1.jpg | Bin .../wallpapers/cornell2.jpg | Bin .../wallpapers/cornell3.jpg | Bin .../wallpapers/cornell4.jpg | Bin .../dot_local => assets}/wallpapers/crt1.jpg | Bin .../dot_local => assets}/wallpapers/crt2.jpg | Bin modules/home/desktop.nix | 2 +- modules/home/music.nix | 4 +- .../home/yabridge/vst3}/yabridge.toml | 0 modules/home/yazi.nix | 2 - patches/openrazer-384992.patch | 77 ------------------ 12 files changed, 2 insertions(+), 83 deletions(-) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/akira.png (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/cornell1.jpg (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/cornell2.jpg (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/cornell3.jpg (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/cornell4.jpg (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/crt1.jpg (100%) rename {homes/emenel/dotfiles/dot_local => assets}/wallpapers/crt2.jpg (100%) rename {homes/emenel/dotfiles/dot_vst3 => modules/home/yabridge/vst3}/yabridge.toml (100%) delete mode 100644 patches/openrazer-384992.patch diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/akira.png b/assets/wallpapers/akira.png similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/akira.png rename to assets/wallpapers/akira.png diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/cornell1.jpg b/assets/wallpapers/cornell1.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/cornell1.jpg rename to assets/wallpapers/cornell1.jpg diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/cornell2.jpg b/assets/wallpapers/cornell2.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/cornell2.jpg rename to assets/wallpapers/cornell2.jpg diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/cornell3.jpg b/assets/wallpapers/cornell3.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/cornell3.jpg rename to assets/wallpapers/cornell3.jpg diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/cornell4.jpg b/assets/wallpapers/cornell4.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/cornell4.jpg rename to assets/wallpapers/cornell4.jpg diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/crt1.jpg b/assets/wallpapers/crt1.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/crt1.jpg rename to assets/wallpapers/crt1.jpg diff --git a/homes/emenel/dotfiles/dot_local/wallpapers/crt2.jpg b/assets/wallpapers/crt2.jpg similarity index 100% rename from homes/emenel/dotfiles/dot_local/wallpapers/crt2.jpg rename to assets/wallpapers/crt2.jpg diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 6e8e794..d2f0fda 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -205,7 +205,7 @@ }; xdg.configFile."wpaperd/config.toml".source = ../../homes/emenel/dotfiles/dot_config/wpaperd/config.toml; - home.file.".local/wallpapers".source = ../../homes/emenel/dotfiles/dot_local/wallpapers; + home.file.".local/wallpapers".source = ../../assets/wallpapers; xdg.desktopEntries = { isd = { diff --git a/modules/home/music.nix b/modules/home/music.nix index 93602e8..5ebec51 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -64,8 +64,6 @@ }; }; - # xdg.configFile."labwx/rc.xml" - home.file.".local/share/The Usual Suspects/Vavra" = { recursive = true; source = ../../packages/the-usual-suspects/vavra; @@ -87,5 +85,5 @@ source = ../../packages/the-usual-suspects/nodal-red; }; - home.file.".vst3/yabridge/yabridge.toml".source = ../../homes/emenel/dotfiles/dot_vst3/yabridge.toml; + home.file.".vst3/yabridge/yabridge.toml".source = ./yabridge/vst3/yabridge.toml; } diff --git a/homes/emenel/dotfiles/dot_vst3/yabridge.toml b/modules/home/yabridge/vst3/yabridge.toml similarity index 100% rename from homes/emenel/dotfiles/dot_vst3/yabridge.toml rename to modules/home/yabridge/vst3/yabridge.toml diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index ee5aaf0..0d6411d 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -83,7 +83,6 @@ append_previewers = [ { mime = "{image,audio,video}/*"; run = "mediainfo";} { mime = "application/x-subrip"; run = "mediainfo";} - # Archive previewer { mime = "application/*zip"; run = "ouch"; } { mime = "application/x-tar"; run = "ouch"; } @@ -92,7 +91,6 @@ { mime = "application/x-rar"; run = "ouch"; } { mime = "application/x-xz"; run = "ouch"; } { mime = "application/octet-stream"; run = "ouch"; } - ]; _spotters = [ { name = "*"; run = "file-extra-metadata"; } diff --git a/patches/openrazer-384992.patch b/patches/openrazer-384992.patch deleted file mode 100644 index 77161ff..0000000 --- a/patches/openrazer-384992.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3775c5a66437e9624405e23dfecbb6d7d8331c72 Mon Sep 17 00:00:00 2001 -From: emaryn -Date: Tue, 25 Feb 2025 19:52:54 +0800 -Subject: [PATCH] openrazer-daemon: 3.9.0 -> 3.10.0 - ---- - .../python-modules/openrazer/common.nix | 14 +++++++------- - .../python-modules/openrazer/daemon.nix | 4 +++- - .../development/python-modules/openrazer/pylib.nix | 2 +- - 3 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix -index a54f14c996029..8478b03a8133c 100644 ---- a/pkgs/development/python-modules/openrazer/common.nix -+++ b/pkgs/development/python-modules/openrazer/common.nix -@@ -1,19 +1,19 @@ - { lib, fetchFromGitHub }: - rec { -- version = "3.9.0"; -+ version = "3.10.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; -- rev = "v${version}"; -- hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY="; -+ tag = "v${version}"; -+ hash = "sha256-F7lAWM/14texc1PVhch5R2oztcfkoub/9oGdjEmtTZ8="; - }; - -- meta = with lib; { -+ meta = { - homepage = "https://openrazer.github.io/"; -- license = licenses.gpl2Only; -- maintainers = with maintainers; [ evanjs ] ++ teams.lumiguide.members; -- platforms = platforms.linux; -+ license = lib.licenses.gpl2Only; -+ maintainers = with lib.maintainers; [ evanjs ] ++ lib.teams.lumiguide.members; -+ platforms = lib.platforms.linux; - }; - } -diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix -index 0bcfd6b516540..ac6f14869203d 100644 ---- a/pkgs/development/python-modules/openrazer/daemon.nix -+++ b/pkgs/development/python-modules/openrazer/daemon.nix -@@ -33,6 +33,8 @@ buildPythonPackage ( - postPatch = '' - substituteInPlace openrazer_daemon/daemon.py \ - --replace-fail "plugdev" "openrazer" -+ substituteInPlace run_openrazer_daemon.py \ -+ --replace-fail "/usr" "$out" - ''; - - nativeBuildInputs = [ -@@ -46,7 +48,7 @@ buildPythonPackage ( - gtk3 - ]; - -- propagatedBuildInputs = [ -+ dependencies = [ - daemonize - dbus-python - pygobject3 -diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix -index 577f8595aba6b..9f711dafa64e2 100644 ---- a/pkgs/development/python-modules/openrazer/pylib.nix -+++ b/pkgs/development/python-modules/openrazer/pylib.nix -@@ -20,7 +20,7 @@ buildPythonPackage ( - - nativeBuildInputs = [ setuptools ]; - -- propagatedBuildInputs = [ -+ dependencies = [ - dbus-python - numpy - openrazer-daemon