use NUR as flake input

closes #12
This commit is contained in:
Pim Kunis 2023-10-16 17:45:15 +02:00
parent db10ca11f3
commit fd51e1f396
5 changed files with 28 additions and 26 deletions

View file

@ -19,25 +19,24 @@
};
};
outputs = { nixpkgs, home-manager, homeage, agenix, ... }: {
nixosConfigurations = {
pim = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.pim = {
imports = [
./home
homeage.homeManagerModules.homeage
];
};
}
];
};
outputs = { nixpkgs, home-manager, homeage, agenix, nur, ... }: {
nixosConfigurations.pim = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit nur; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.pim = {
imports = [
./home
homeage.homeManagerModules.homeage
];
};
}
];
};
};
}

View file

@ -1,10 +1,13 @@
{ pkgs, config, ... }:
{ pkgs, nur, ... }:
let
nur-no-pkgs = import (nur) { inherit pkgs; nurpkgs = pkgs; };
in
{
imports = [
./bash
./neovim
./firefox
(import ./firefox nur-no-pkgs) # TODO: bit of a hack, but better than before
./ssh
./syncthing
./alacritty

View file

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

View file

@ -1,8 +1,8 @@
{pkgs, lib, ...}@args:
nurpkgs:
{ pkgs, lib, ... }@args:
let
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; });
firefoxAddons = import ./addons.nix (args // { inherit nurpkgs; });
firefoxSettings = {
"browser.aboutConfig.showWarning" = false;
"browser.toolbars.bookmarks.visibility" = "always";

View file

@ -1,3 +1,3 @@
#!/usr/bin/env bash
sudo nixos-rebuild switch --flake ./#pim --impure
sudo nixos-rebuild switch --flake ./#pim