diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index 88d8520..5621c2c 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -64,6 +64,7 @@ in "networkmanager" "input" "tty" + "plugdev" ]; shell = pkgs.zsh; }; @@ -79,6 +80,9 @@ in boot.loader.grub.efiSupport = true; boot.loader.grub.useOSProber = true; boot.loader.grub.efiInstallAsRemovable = true; + # add user to "openrazer" group + hardware.openrazer.enable = true; + hardware.openrazer.users = ["meyer"]; hardware.i2c.enable = true; hardware.xpadneo.enable = true; hardware.bluetooth.enable = true; diff --git a/common/pkgs.nix b/common/pkgs.nix index 2591386..a54174e 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -46,7 +46,16 @@ in inkscape #OCR ENGINE tesseract4 - cpkg.discord + # discord = cpkg.discord.override { + # withOpenASAR = true; + # withVencord = true; + # }; + (pkgs.discord.override { + vencord = cpkg.vencord; + }) + (pkgs.vesktop.override { + vencord = cpkg.vencord; + }) xsel spotify pulseaudioFull @@ -59,7 +68,6 @@ in vscodium kitty rofi - cpkg.vesktop thunderbird vlc jellyfin-web @@ -69,6 +77,7 @@ in libsForQt5.kinit ]; general = with pkgs; [ + usbutils tree ffmpeg yt-dlp diff --git a/customPackages/discord/linux.nix b/customPackages/discord/linux.nix index 1b45531..eb3f29c 100644 --- a/customPackages/discord/linux.nix +++ b/customPackages/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook3, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -10,7 +10,7 @@ , wayland , branch , withOpenASAR ? false, openasar -, withVencord ? true, vencord +, withVencord ? false, vencord , withTTS ? true }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + wrapGAppsHook3 makeShellWrapper ]; diff --git a/flake.lock b/flake.lock index 33c5e57..39e4d2b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1719438532, - "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", + "lastModified": 1720167120, + "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", + "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719220171, - "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=", + "lastModified": 1720188460, + "narHash": "sha256-ydD3UPIPlOkEDStwNxzGwFhAi5vGcobn2EofOmUvKDA=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "269411cfed6aab694e46f719277c972de96177bb", + "rev": "7051b909b9b5e74f19791795bd769de12c5acb3d", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1719956923, + "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "type": "github" }, "original": { @@ -92,27 +92,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1719720450, + "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718983919, - "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90338afd6177fc683a04d934199d693708c85a3b", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": {