revert nur flake input

add homeage flake input
This commit is contained in:
Pim Kunis 2023-10-09 20:56:41 +02:00
parent 848a040202
commit d0e1490628
4 changed files with 36 additions and 9 deletions

View file

@ -16,6 +16,26 @@
"url": "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz" "url": "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"
} }
}, },
"homeage": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1669234151,
"narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=",
"owner": "jordanisaacs",
"repo": "homeage",
"rev": "02bfe4ca06962d222e522fff0240c93946b20278",
"type": "github"
},
"original": {
"owner": "jordanisaacs",
"repo": "homeage",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696697597, "lastModified": 1696697597,
@ -50,6 +70,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"homeage": "homeage",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur" "nur": "nur"
} }

View file

@ -8,6 +8,10 @@
url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
homeage = {
url = "github:jordanisaacs/homeage";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, nur, ... }: { outputs = { nixpkgs, home-manager, nur, ... }: {
@ -15,9 +19,11 @@
pim = nixpkgs.lib.nixosSystem { pim = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ nixpkgs.overlays = [ nur.overlay ]; } ./configuration.nix
(args: home-manager.nixosModules.home-manager { # { nixpkgs.overlays = [ nur.overlay ]; }
inherit (args) lib pkgs config utils; # (args: home-manager.nixosModules.home-manager {
home-manager.nixosModules.home-manager {
# inherit (args) lib pkgs config utils;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.pim = { home-manager.users.pim = {
@ -25,8 +31,7 @@
./home/home.nix ./home/home.nix
]; ];
}; };
}) }
./configuration.nix
]; ];
}; };
}; };

View file

@ -1,6 +1,6 @@
{pkgs, lib, ...}@args: {nurpkgs, lib, ...}@args:
let let
rycee-addons = pkgs.repos.rycee.firefox-addons; rycee-addons = nurpkgs.repos.rycee.firefox-addons;
custom-addons = import ./custom-addons.nix args; custom-addons = import ./custom-addons.nix args;
in in
{ {

View file

@ -1,7 +1,8 @@
args: {pkgs, ...}@args:
let let
firefoxAddons = import ./addons.nix args; nurpkgs = import (builtins.fetchTarball {url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; sha256 = "1gb3wkmyl6xbs4kval2ml48nlil39853dj62rxfrlk9i2nky2ly4"; }) { inherit pkgs; };
firefoxAddons = import ./addons.nix (args // {inherit nurpkgs; });
firefoxSettings = { firefoxSettings = {
"browser.aboutConfig.showWarning" = false; "browser.aboutConfig.showWarning" = false;
"browser.toolbars.bookmarks.visibility" = "always"; "browser.toolbars.bookmarks.visibility" = "always";