chore: remove figsoda packages

2024-09-12 13:30:14 -04:00 · 2024-09-12 13:30:14 -04:00 · 1d23ec588b
commit 1d23ec588b
parent bb5d2d380a
6 changed files with 31 additions and 131 deletions
--- a/common/default.nix
+++ b/common/default.nix
@ -3,8 +3,6 @@
  home-manager,
  lib,
  nh,
-  nix-melt,
-  nurl,
  pkgs,
  self,
  ...
@ -29,7 +27,7 @@
  };

  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 {
      version = "2.24.6";

@ -97,27 +95,19 @@
    update-notifier = false
  '';

-  environment.systemPackages =
-    (builtins.attrValues {
-      # Peripherals
-      inherit
-        (pkgs)
-        hdparm
-        pciutils
-        usbutils
-        rar
-        ;
-    })
-    ++ [
-      nix-melt.packages.${pkgs.system}.default
+  environment.systemPackages = builtins.attrValues {
+    # Peripherals
+    inherit
+      (pkgs)
+      hdparm
+      pciutils
+      usbutils
+      rar
+      ;
+  };

-      (nurl.packages.${pkgs.system}.default.override {
-        nix = config.nix.package;
-      })
-    ];
-
-  home-manager = let
-    inherit (lib) mapAttrs' mkIf mkOption nameValuePair types;
+  home-manager.users = let
+    inherit (lib) mkIf mkOption types;
    inherit (config.vars) mainUser;

    default = {
@ -141,20 +131,11 @@
        ./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;
    };
  in {
-    users = {
-      root = default;
-      greeter = mkIf (config.services.greetd.enable) default;
-      ${mainUser} = default;
-    };
+    root = default;
+    greeter = mkIf (config.services.greetd.enable) default;
+    ${mainUser} = default;
  };
 }
--- a/devices/bbsteamie/modules/desktop/steam.nix
+++ b/devices/bbsteamie/modules/desktop/steam.nix
@ -70,7 +70,7 @@ defaultSession: {
      pkgs.r2modman
      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/6708
      self.packages.${pkgs.system}.yuzu
--- a/flake.lock
+++ b/flake.lock
@ -761,7 +761,9 @@
        "hyprlang": "hyprlang_2",
        "hyprutils": "hyprutils_2",
        "hyprwayland-scanner": "hyprwayland-scanner_2",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "systems": [
          "systems"
        ]
@ -1087,7 +1089,7 @@
      "inputs": {
        "flake-parts": "flake-parts_4",
        "nix-github-actions": "nix-github-actions_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
        "treefmt-nix": "treefmt-nix_3"
      },
      "locked": {
@ -1238,27 +1240,6 @@
        "type": "github"
      }
    },
-    "nix-melt": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723516630,
-        "narHash": "sha256-M4Vbnjd0WKCGdT4929zDDHtxWwfEIKdRqzWA71IkQMQ=",
-        "owner": "bryango",
-        "repo": "nix-melt",
-        "rev": "5763489f6b163e62a63e3ef37f81b7bb4f2ce0b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "bryango",
-        "ref": "rust-1.80-fix-build",
-        "repo": "nix-melt",
-        "type": "github"
-      }
-    },
    "nix-on-droid": {
      "inputs": {
        "home-manager": [
@ -1311,11 +1292,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725634671,
+        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
        "type": "github"
      },
      "original": {
@ -1456,22 +1437,6 @@
      }
    },
    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
      "locked": {
        "lastModified": 1723221148,
        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
@ -1525,26 +1490,6 @@
        "type": "gitlab"
      }
    },
-    "nurl": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717601522,
-        "narHash": "sha256-3S6pdNj+ui0fX1tBtWQlEYIuY3Uy3xiSzjfMxAjSlD8=",
-        "owner": "matt1432",
-        "repo": "nurl",
-        "rev": "d6b2a5d3ec5de4469d3fbff55aafd9b0d1e681bc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matt1432",
-        "repo": "nurl",
-        "type": "github"
-      }
-    },
    "nvim-theme-src": {
      "flake": false,
      "locked": {
@ -1723,12 +1668,10 @@
        "nix-fast-build": "nix-fast-build",
        "nix-gaming": "nix-gaming",
        "nix-index-db": "nix-index-db",
-        "nix-melt": "nix-melt",
        "nix-on-droid": "nix-on-droid",
        "nixd": "nixd",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
        "nixpkgs-wayland": "nixpkgs-wayland",
-        "nurl": "nurl",
        "nvim-theme-src": "nvim-theme-src",
        "pam-fprint-grosshack-src": "pam-fprint-grosshack-src",
        "pcsd": "pcsd",
--- a/flake.nix
+++ b/flake.nix
@ -160,7 +160,10 @@
      type = "github";
    };
    hyprpaper = {
-      inputs.systems.follows = "systems";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
      owner = "hyprwm";
      repo = "hyprpaper";
      type = "github";
@ -249,13 +252,6 @@
      repo = "nix-index-database";
      type = "github";
    };
-    nix-melt = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      owner = "bryango";
-      ref = "rust-1.80-fix-build";
-      repo = "nix-melt";
-      type = "github";
-    };
    nix-on-droid = {
      inputs = {
        home-manager.follows = "home-manager";
@ -286,12 +282,6 @@
      repo = "nixpkgs-wayland";
      type = "github";
    };
-    nurl = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      owner = "matt1432";
-      repo = "nurl";
-      type = "github";
-    };
    nvim-theme-src = {
      flake = false;
      owner = "Mofiqul";
--- a/inputs.nix
+++ b/inputs.nix
@ -9,11 +9,6 @@ let
      repo = "nix-fast-build";
    };

-    nurl = mkDep {
-      owner = "matt1432";
-      repo = "nurl";
-    };
-
    nix-index-db = mkDep {
      owner = "Mic92";
      repo = "nix-index-database";
@ -24,14 +19,6 @@ let
      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
    flake-utils = mkInput {
      owner = "numtide";
@ -140,8 +127,7 @@ let
        repo = "hyprgrass";
      };

-      # FIXME: use mkDep when it stops breaking
-      hyprpaper = mkInput {
+      hyprpaper = mkDep {
        owner = "hyprwm";
        repo = "hyprpaper";
      };
--- a/legacyPackages/hass-components/home-llm.nix
+++ b/legacyPackages/hass-components/home-llm.nix
@ -15,7 +15,7 @@ in

    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 = ''
      substituteInPlace ./custom_components/llama_conversation/manifest.json \
          --replace-warn "huggingface-hub==0.23.0" "huggingface-hub>=0.23.0"