This commit is contained in:
Varris 2022-08-07 20:14:22 +02:00
parent a545f0ba09
commit 00aecb279a
3 changed files with 56 additions and 31 deletions

View File

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1659713809, "lastModified": 1659803779,
"narHash": "sha256-M4aHuXXVnfprM8xPH2lLkYkkR0fmaG5QmvIc0DT/d4E=", "narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "93c57a988470c1948976b1bb70abbd5855c5b810", "rev": "f44884060cb94240efbe55620f38a8ec8d9af601",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,10 +36,26 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nur": {
"locked": {
"lastModified": 1659881187,
"narHash": "sha256-9QKrAdJRQlaU3nLbfNwvjwQucuy5GCRTzPH2+w6NuxM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "9bbd8c3c689e076ef17eca0c3b2208068756fcb7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nur": "nur"
} }
}, },
"utils": { "utils": {

View File

@ -3,34 +3,56 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/NUR";
}; };
outputs = inputs@{ nixpkgs, home-manager, ... }: outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system;
config = { allowUnfree = true; }; config = { allowUnfree = true; };
overlays = [ self.overlays.default ];
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in in
{ {
nixosConfigurations.terra = lib.nixosSystem { overlays.default =
inherit system; (final: prev: rec {
specialArgs = inputs; nerdfonts = prev.nerdfonts.override {
modules = [ fonts = [
./system/configuration.nix "JetBrainsMono"
home-manager.nixosModules.home-manager ];
{ };
home-manager.useGlobalPkgs = true; });
home-manager.useUserPackages = true;
home-manager.users.manuel = import ./user/home.nix; nixosConfigurations.terra = lib.nixosSystem
} {
]; inherit system;
}; specialArgs = inputs;
modules = [
./system/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager =
{
useGlobalPkgs = true;
useUserPackages = true;
users.manuel = import ./user/home.nix;
extraSpecialArgs = { inherit pkgs; };
};
}
nur.nixosModules.nur
];
};
}; };
} }

View File

@ -1,13 +0,0 @@
[
(
self: super:
{
nerdfonts = super.nerdfonts.override {
fonts = [
"JetBrainsMono"
];
};
}
)
]