This commit is contained in:
sadan 2024-07-05 11:14:34 -04:00
parent 2debe2485c
commit 2551359777
No known key found for this signature in database
4 changed files with 40 additions and 27 deletions

View file

@ -64,6 +64,7 @@ in
"networkmanager" "networkmanager"
"input" "input"
"tty" "tty"
"plugdev"
]; ];
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
@ -79,6 +80,9 @@ in
boot.loader.grub.efiSupport = true; boot.loader.grub.efiSupport = true;
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
boot.loader.grub.efiInstallAsRemovable = true; boot.loader.grub.efiInstallAsRemovable = true;
# add user to "openrazer" group
hardware.openrazer.enable = true;
hardware.openrazer.users = ["meyer"];
hardware.i2c.enable = true; hardware.i2c.enable = true;
hardware.xpadneo.enable = true; hardware.xpadneo.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

View file

@ -46,7 +46,16 @@ in
inkscape inkscape
#OCR ENGINE #OCR ENGINE
tesseract4 tesseract4
cpkg.discord # discord = cpkg.discord.override {
# withOpenASAR = true;
# withVencord = true;
# };
(pkgs.discord.override {
vencord = cpkg.vencord;
})
(pkgs.vesktop.override {
vencord = cpkg.vencord;
})
xsel xsel
spotify spotify
pulseaudioFull pulseaudioFull
@ -59,7 +68,6 @@ in
vscodium vscodium
kitty kitty
rofi rofi
cpkg.vesktop
thunderbird thunderbird
vlc vlc
jellyfin-web jellyfin-web
@ -69,6 +77,7 @@ in
libsForQt5.kinit libsForQt5.kinit
]; ];
general = with pkgs; [ general = with pkgs; [
usbutils
tree tree
ffmpeg ffmpeg
yt-dlp yt-dlp

View file

@ -1,5 +1,5 @@
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook { 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 , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
@ -10,7 +10,7 @@
, wayland , wayland
, branch , branch
, withOpenASAR ? false, openasar , withOpenASAR ? false, openasar
, withVencord ? true, vencord , withVencord ? false, vencord
, withTTS ? true }: , withTTS ? true }:
let let
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
libxshmfence libxshmfence
mesa mesa
nss nss
wrapGAppsHook wrapGAppsHook3
makeShellWrapper makeShellWrapper
]; ];

View file

@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719438532, "lastModified": 1720167120,
"narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1719220171, "lastModified": 1720188460,
"narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=", "narHash": "sha256-ydD3UPIPlOkEDStwNxzGwFhAi5vGcobn2EofOmUvKDA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"rev": "269411cfed6aab694e46f719277c972de96177bb", "rev": "7051b909b9b5e74f19791795bd769de12c5acb3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1719956923,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "rev": "706eef542dec88cc0ed25b9075d3037564b2d164",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,27 +92,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719099622, "lastModified": 1719720450,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1720031269,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1718983919, "lastModified": 1719468428,
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90338afd6177fc683a04d934199d693708c85a3b", "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1719268571, "lastModified": 1720187017,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "rev": "1b11e208cee97c47677439625dc22e5289dcdead",
"type": "github" "type": "github"
}, },
"original": { "original": {