Compare commits

..

No commits in common. "848a04020227670ad635267c7116c1800efeffbd" and "bbfa8b1d4c28d083ecb3bc34f52b1130a4e8bd2d" have entirely different histories.

5 changed files with 11 additions and 32 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
result

View file

@ -32,26 +32,10 @@
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1696831218,
"narHash": "sha256-UBtOKflBTUBfeFB7oYvMUzlc2uBLpZc+15JC9bPwKF4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "be4322f9eaf6158baa87b3c08fc0a8d8805db181",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nur": "nur"
"nixpkgs": "nixpkgs"
}
}
},

View file

@ -3,30 +3,25 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nur.url = "github:nix-community/NUR";
home-manager = {
url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { nixpkgs, home-manager, nur, ... }: {
outputs = { self, nixpkgs, home-manager }: {
nixosConfigurations = {
pim = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
{ nixpkgs.overlays = [ nur.overlay ]; }
(args: home-manager.nixosModules.home-manager {
inherit (args) lib pkgs config utils;
./configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.pim = {
imports = [
./home/home.nix
];
imports = [ ./home/home.nix ];
};
})
./configuration.nix
}
];
};
};

View file

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

View file

@ -1,7 +1,8 @@
args:
{ pkgs, ...}@args:
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 = {
"browser.aboutConfig.showWarning" = false;
"browser.toolbars.bookmarks.visibility" = "always";