chore: remove figsoda packages
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-09-12 13:30:14 -04:00
parent bb5d2d380a
commit 1d23ec588b
6 changed files with 19 additions and 52 deletions

View file

@ -3,8 +3,6 @@
home-manager, home-manager,
lib, lib,
nh, nh,
nix-melt,
nurl,
pkgs, pkgs,
self, self,
... ...
@ -29,7 +27,7 @@
}; };
nix = { nix = {
# FIXME: vulnerability with <= 2.24.5 # FIXME: wait for this to reach nixos-unstable https://pr-tracker.nelim.org/?pr=341007
package = pkgs.nixVersions.nix_2_24.overrideAttrs (o: rec { package = pkgs.nixVersions.nix_2_24.overrideAttrs (o: rec {
version = "2.24.6"; version = "2.24.6";
@ -97,27 +95,19 @@
update-notifier = false update-notifier = false
''; '';
environment.systemPackages = environment.systemPackages = builtins.attrValues {
(builtins.attrValues { # Peripherals
# Peripherals inherit
inherit (pkgs)
(pkgs) hdparm
hdparm pciutils
pciutils usbutils
usbutils rar
rar ;
; };
})
++ [
nix-melt.packages.${pkgs.system}.default
(nurl.packages.${pkgs.system}.default.override { home-manager.users = let
nix = config.nix.package; inherit (lib) mkIf mkOption types;
})
];
home-manager = let
inherit (lib) mapAttrs' mkIf mkOption nameValuePair types;
inherit (config.vars) mainUser; inherit (config.vars) mainUser;
default = { default = {
@ -141,20 +131,11 @@
./home/trash-d ./home/trash-d
]; ];
# Cache devShells
home.file = mapAttrs' (n: v:
nameValuePair ".cache/devShells/${n}" {
source = v;
})
self.devShells.${pkgs.system};
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
}; };
in { in {
users = { root = default;
root = default; greeter = mkIf (config.services.greetd.enable) default;
greeter = mkIf (config.services.greetd.enable) default; ${mainUser} = default;
${mainUser} = default;
};
}; };
} }

View file

@ -70,7 +70,7 @@ defaultSession: {
pkgs.r2modman pkgs.r2modman
self.packages.${pkgs.system}.protonhax self.packages.${pkgs.system}.protonhax
# FIXME:Ryujinx ACNH crashes on OpenGL AND Vulkan # FIXME: Ryujinx ACNH crashes on OpenGL AND Vulkan
# https://github.com/Ryujinx/Ryujinx/issues/6993 # https://github.com/Ryujinx/Ryujinx/issues/6993
# https://github.com/Ryujinx/Ryujinx/issues/6708 # https://github.com/Ryujinx/Ryujinx/issues/6708
self.packages.${pkgs.system}.yuzu self.packages.${pkgs.system}.yuzu

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -9,11 +9,6 @@ let
repo = "nix-fast-build"; repo = "nix-fast-build";
}; };
nurl = mkDep {
owner = "matt1432";
repo = "nurl";
};
nix-index-db = mkDep { nix-index-db = mkDep {
owner = "Mic92"; owner = "Mic92";
repo = "nix-index-database"; repo = "nix-index-database";
@ -24,14 +19,6 @@ let
repo = "nh"; repo = "nh";
}; };
# FIXME: go back to upstream once fixed
nix-melt = mkDep {
# owner = "nix-community";
owner = "bryango";
repo = "nix-melt";
ref = "rust-1.80-fix-build";
};
# These are here to make sure all 'systems' are the same # These are here to make sure all 'systems' are the same
flake-utils = mkInput { flake-utils = mkInput {
owner = "numtide"; owner = "numtide";
@ -140,8 +127,7 @@ let
repo = "hyprgrass"; repo = "hyprgrass";
}; };
# FIXME: use mkDep when it stops breaking hyprpaper = mkDep {
hyprpaper = mkInput {
owner = "hyprwm"; owner = "hyprwm";
repo = "hyprpaper"; repo = "hyprpaper";
}; };

View file

@ -15,7 +15,7 @@ in
src = home-llm-src; src = home-llm-src;
# FIXME: https://github.com/acon96/home-llm/issues/214 # FIXME: remove this on next release https://github.com/acon96/home-llm/issues/214
postPatch = '' postPatch = ''
substituteInPlace ./custom_components/llama_conversation/manifest.json \ substituteInPlace ./custom_components/llama_conversation/manifest.json \
--replace-warn "huggingface-hub==0.23.0" "huggingface-hub>=0.23.0" --replace-warn "huggingface-hub==0.23.0" "huggingface-hub>=0.23.0"