From b4c0daf345c5f32bef5ef466455127afea368a0b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 10 Feb 2025 16:13:25 -0500 Subject: [PATCH] fixed renoise overlay --- flake.lock | 72 +++++++++---------- .../emenel/dotfiles/dot_config/waybar/config | 5 +- modules/home/desktop.nix | 9 +-- modules/home/music.nix | 8 +-- modules/home/waybar.nix | 1 + overlays/openrazer.nix | 11 +++ overlays/renoise.nix | 5 ++ 7 files changed, 60 insertions(+), 51 deletions(-) create mode 100644 overlays/openrazer.nix create mode 100644 overlays/renoise.nix diff --git a/flake.lock b/flake.lock index ea022c9..199b9bb 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739067033, - "narHash": "sha256-On2apbig9LjjSJDDzyCUZkxdWoQIBOavaG02vh693PQ=", + "lastModified": 1739207663, + "narHash": "sha256-H0Z/Uxh1EIoZRzpXgezQPekp3ccFd/WdUVinILVnM+Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6c02db1d65ff3c8d1a871c50bd2cdf3b4822fafd", + "rev": "66b6a800edf6c6ef58d021b81ab7e6a10ae34834", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1739198052, + "narHash": "sha256-fvAgCGK2phagbKv2S4YH4AIM566TKasfWMqYl3c3mPQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "b0bd29bb4b8df265b13bbb4a6639afa74faaa831", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1737984253, - "narHash": "sha256-h4KWLijrHK7rugD2oV8JfVgloD+xPW1jCVT2B7K+bjQ=", + "lastModified": 1739048878, + "narHash": "sha256-zTyoyIWe/yPtyMl6ZXuEk3gUAwrzT6yTY5pLpW3GYAU=", "owner": "hyprwm", "repo": "hypridle", - "rev": "15ca902b2cb845a8a5378ec022c11a4a77155b83", + "rev": "cf5b4dab9ddaa10d688012c0a45a20061dd647d4", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1738841768, - "narHash": "sha256-T3fWbhR7mciPIh1Vd3zyigPJlgA2eGQPkSbm5v8M/xI=", + "lastModified": 1739183634, + "narHash": "sha256-z//x2artwXwoCKc1QEqu4wbP6K8QheFUH6EZemlFqxo=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "dc6d72158c22d802845679e783231061b717ffd1", + "rev": "82b63a6930931f9a10db578d30bb868b0e91a211", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739136145, - "narHash": "sha256-KgADxpdWMVevqNaxpJzlocRU+DclrFSyzvUiGFsARcQ=", + "lastModified": 1739206396, + "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c5a3826e2bf96f3092b79415e17703a7b194e1a8", + "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738911818, - "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=", + "lastModified": 1739201373, + "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=", "owner": "YaLTeR", "repo": "niri", - "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f", + "rev": "20769b4c2f843566880f020f117e7bde36edc332", "type": "github" }, "original": { @@ -814,11 +814,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1738175805, - "narHash": "sha256-fPjaARmK522JLJ7wxFebxG4eE/3HHSmuAA78iAZ+A7g=", + "lastModified": 1739126374, + "narHash": "sha256-jwvjuCKgyfsie7Ro6IQuKEodV80YXISApTGMJebngH0=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "d4c75a33c4a7a16bf87cfd804fb5444a1ec53d49", + "rev": "2cd8e2d08cb5ff22f0e96ecb2e754e7188b05380", "type": "github" }, "original": { @@ -912,11 +912,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738843498, - "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -960,11 +960,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1738843498, - "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1373,11 +1373,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1739151822, - "narHash": "sha256-eyyHM1h0wU5o5OFIUJ8E/PO/VLLF6EaGSOQ/nislPCo=", + "lastModified": 1739213592, + "narHash": "sha256-/KPhlBr2a3Be6X72H3oOubQBDIF21+ViU9czwEhL1A8=", "owner": "wez", "repo": "wezterm", - "rev": "0c7a8fc8166900694c505ecdd3a1d49dc2b6c968", + "rev": "52c1ca749552af4d8a2f18ec10fe8f14b6622519", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739083819, - "narHash": "sha256-GVapniFyZHtKVxIxgIZihpTRzYjBN9461qN4R48uJ84=", + "lastModified": 1739209832, + "narHash": "sha256-HIguPyqa25pNd9sZr9V4Hc+9LtrLri8EtEXdMu1kgQM=", "owner": "sxyazi", "repo": "yazi", - "rev": "793c90f021fd5d0491575d43ee68f92169ba2eb5", + "rev": "498623191a86b31cba990c963e22508db14a51ee", "type": "github" }, "original": { diff --git a/homes/emenel/dotfiles/dot_config/waybar/config b/homes/emenel/dotfiles/dot_config/waybar/config index 12c9c7d..9be8541 100644 --- a/homes/emenel/dotfiles/dot_config/waybar/config +++ b/homes/emenel/dotfiles/dot_config/waybar/config @@ -60,9 +60,10 @@ "on-click": "$HOME/.local/bin/wezapp htop" }, "network": { - "format-wifi": "{essid} ", - "format-ethernet": "{ifname} ", + "format-wifi": "", + "format-ethernet": "", "format-disconnected": "!", + "tooltip-format": "{essid} {ifname}" "max-length": 50, "on-click": "$HOME/.local/bin/wezlauncher nmtui", }, diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 5df73e8..ad2cb01 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -31,10 +31,7 @@ soundconverter wmctrl - colloid-icon-theme - whitesur-gtk-theme - whitesur-cursors - whitesur-icon-theme + # colloid-icon-theme bibata-cursors adwaita-qt @@ -43,7 +40,7 @@ sane-airscan xsane - bitwarden-cli + # bitwarden-cli bitwarden-desktop tailscale trayscale @@ -83,7 +80,7 @@ switcheroo - blender + # blender davinci-resolve-studio steam processing diff --git a/modules/home/music.nix b/modules/home/music.nix index 83347fd..03df35f 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -1,4 +1,4 @@ -{ nix-config, inputs, lib, pkgs, ... }: +{ nix-config, lib, pkgs, ... }: { home.packages = lib.mkMerge [ (with nix-config.packages.x86_64-linux; [ @@ -56,12 +56,6 @@ ]) ]; - nixpkgs.config.packageOverrides = pkgs: { - renoise = pkgs.renoise.override { - releasePath = ../../assets/binary-installers/rns_344_linux_x86_64.tar.gz; - }; - }; - xdg.desktopEntries = { bitwig-labwc = { name = "Bitwig (labwc)"; diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index 32fda52..7d5a0f7 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -69,6 +69,7 @@ window#waybar { #custom-notification { min-width: 30px; + padding-right: 5px; } #power-profiles-daemon { diff --git a/overlays/openrazer.nix b/overlays/openrazer.nix new file mode 100644 index 0000000..497093c --- /dev/null +++ b/overlays/openrazer.nix @@ -0,0 +1,11 @@ +final: prev: { + development.python-modules.openrazer = prev.development.python-modules.openrazer.overrideAttrs (old: { + version = "master"; + src = prev.fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + rev = "master"; + hash = "sha256-5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + }; + }); +} diff --git a/overlays/renoise.nix b/overlays/renoise.nix new file mode 100644 index 0000000..172978d --- /dev/null +++ b/overlays/renoise.nix @@ -0,0 +1,5 @@ +final: prev: { + renoise = prev.renoise.override (old: { + releasePath = ../assets/binary-installers/rns_344_linux_x86_64.tar.gz; + }); +}