From a0fa73b873a0b5e5cc54c4ecfe77ab8b3195945a Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 10 Dec 2023 21:11:57 +0300 Subject: [PATCH] Move commented code to BROKEN.md --- BROKEN.md | 38 ++++++++++++++++++++++++++++++++++++++ flake.nix | 29 ----------------------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/BROKEN.md b/BROKEN.md index acec555..e9e2ebf 100644 --- a/BROKEN.md +++ b/BROKEN.md @@ -1,3 +1,41 @@ # Broken Stuff - QT theme doesn't work. + +- Nix Super errors, saying it expected an attrset and got a + trunk when evaluating the non-outputs section. This should + work, as it is an advertised feature (And it does! Don't get + me wrong, it works if you don't use the builtins namespace) + but doesn't work completely. Max is working on a fix, so I've + put the soon-to-be attributes here, so I don't forget. + + ```nix + nixConfig = with builtins; mapAttrs (_: concatStringsSep " ") { + extra-substituters = [ + "https://nix-community.cachix.org/" + "https://hyprland.cachix.org/" + "https://cache.privatevoid.net/" + ]; + + extra-trusted-public-keys = [ + "nix-community.cachix.org:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "hyprland.cachix.org:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" + ]; + }; + + inputs = with builtins; mapAttrs (name: url: { + url = "git+https://${url}"; + } // (if elem name [ "nixSuper" "hyprland" "hyprpicker" ] then {} else { + inputs.nixpkgs.follows = "nixpkgs"; + })) { + nixSuper = "github.com/privatevoid-net/nix-super"; + nixpkgs = "github.com/NixOS/nixpkgs/tree/nixos-unstable"; + homeManager = "github.com/nix-community/home-manager"; + hyprland = "github.com/hyprwm/Hyprland"; + hyprpicker = "github.com/hyprwm/hyprpicker"; + fenix = "github.com/nix-community/fenix"; + tools = "github.com/RGBCube/FlakeTools"; + themes = "github.com/RGBCube/ThemeNix"; + }; + ``` diff --git a/flake.nix b/flake.nix index e56c861..0f7e6bf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,35 +1,6 @@ { description = "All my NixOS configurations."; - # nixConfig = with builtins; mapAttrs (_: concatStringsSep " ") { - # extra-substituters = [ - # "https://nix-community.cachix.org/" - # "https://hyprland.cachix.org/" - # "https://cache.privatevoid.net/" - # ]; - - # extra-trusted-public-keys = [ - # "nix-community.cachix.org:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "hyprland.cachix.org:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" - # ]; - # }; - - # inputs = with builtins; mapAttrs (name: url: { - # url = "git+https://${url}"; - # } // (if elem name [ "nixSuper" "hyprland" "hyprpicker" ] then {} else { - # inputs.nixpkgs.follows = "nixpkgs"; - # })) { - # nixSuper = "github.com/privatevoid-net/nix-super"; - # nixpkgs = "github.com/NixOS/nixpkgs/tree/nixos-unstable"; - # homeManager = "github.com/nix-community/home-manager"; - # hyprland = "github.com/hyprwm/Hyprland"; - # hyprpicker = "github.com/hyprwm/hyprpicker"; - # fenix = "github.com/nix-community/fenix"; - # tools = "github.com/RGBCube/FlakeTools"; - # themes = "github.com/RGBCube/ThemeNix"; - # }; - nixConfig = { extra-substituters = '' https://nix-community.cachix.org/