mirror of
https://forgejo.merr.is/annika/nixos.git
synced 2026-02-04 15:46:43 -05:00
Sync
This commit is contained in:
parent
68fad0c3b4
commit
f1070ffc2b
3 changed files with 19 additions and 8 deletions
14
flake.lock
generated
14
flake.lock
generated
|
|
@ -97,16 +97,18 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715996989,
|
"lastModified": 1715288647,
|
||||||
"narHash": "sha256-ObD9YSelkwCAylEXJHcNjrn3hLOfIVScB1tPz9zeDN8=",
|
"narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=",
|
||||||
"owner": "NixOS",
|
"owner": "auxolotl",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63d3e5d82edf5a138e7d0872231cc23ed4e740fd",
|
"rev": "fb0bb336c1365f5ab5250df84cb1406337f7d9d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"owner": "auxolotl",
|
||||||
"type": "indirect"
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
description = "Lix/Auxolotl config flake";
|
description = "Lix/Auxolotl config flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# nixpkgs.url = "github:auxolotl/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:auxolotl/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
lix = {
|
lix = {
|
||||||
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
|
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
|
||||||
|
|
@ -50,6 +50,7 @@
|
||||||
inherit inputs globals;
|
inherit inputs globals;
|
||||||
};
|
};
|
||||||
virt-nix = import ./hosts/virt-nix {
|
virt-nix = import ./hosts/virt-nix {
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
inherit inputs globals;
|
inherit inputs globals;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,11 @@
|
||||||
with inputs;
|
with inputs;
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem {
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
globals
|
globals
|
||||||
|
lix-module.nixosModules.default
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
# ../../modules/common
|
# ../../modules/common
|
||||||
../../modules/nixos
|
../../modules/nixos
|
||||||
|
|
@ -62,7 +64,13 @@ inputs.nixpkgs.lib.nixosSystem {
|
||||||
extraGroups = [ "networkmanager" "wheel" ];
|
extraGroups = [ "networkmanager" "wheel" ];
|
||||||
};
|
};
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with inputs.pkgs; [];
|
environment.systemPackages = [
|
||||||
|
pkgs.git
|
||||||
|
pkgs.vim
|
||||||
|
pkgs.curl
|
||||||
|
pkgs.wget
|
||||||
|
pkgs.vscode
|
||||||
|
];
|
||||||
|
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue