asonix/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

extract dual-graphics to firestar, add lix

Browse source
This commit is contained in:
asonix 2024-05-06 17:12:15 -05:00
parent 4a28a9e671
commit 62e89bb120
5 changed files with 134 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
firestar/default.nix
View file

@ -8,9 +8,10 @@
imports =
[ # Include the results of the hardware scan.
./btrbk.nix
./builder.nix
./dual-graphics.nix
./hardware-configuration.nix
./wireguard.nix
./builder.nix
];
# Nix cache

12
firestar/dual-graphics.nix Normal file
View file

@ -0,0 +1,12 @@
{ config, pkgs, ... }:
{
hardware.nvidia = {
modesetting.enable = true;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
hardware.opengl.extraPackages = with pkgs; [ vaapiVdpau ];
services.xserver.videoDrivers = ["amdgpu" "nvidia"];
}

92
flake.lock
View file

@ -1,5 +1,80 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1714955862,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"ref": "refs/tags/2.90-beta.1",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"revCount": 15501,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
"original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714868057,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 62,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1714746424,
@ -33,9 +108,26 @@
},
"root": {
"inputs": {
"lix": "lix",
"lix-module": "lix-module",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

29
flake.nix
View file

@ -1,28 +1,29 @@
{
inputs = {
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "nixpkgs/nixos-23.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs = { self, nixpkgs, nixos-hardware, ... }@attrs: {
outputs = { self, lix-module, nixpkgs, nixos-hardware, ... }@attrs: {
nixosConfigurations.firestar = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules = [
lix-module.nixosModules.default
nixos-hardware.nixosModules.common-gpu-amd
({ config, pkgs, ... }: {
hardware.nvidia = {
modesetting.enable = true;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
hardware.opengl.extraPackages = with pkgs; [ vaapiVdpau ];
services.xserver.videoDrivers = ["amdgpu" "nvidia"];
})
./desktop.nix
./firestar
./fonts.nix
./lix-cache.nix
./packages.nix
(import ./user.nix {
name = "Aode";
@ -42,10 +43,12 @@
system = "x86_64-linux";
specialArgs = attrs;
modules = [
lix-module.nixosModules.default
nixos-hardware.nixosModules.framework-11th-gen-intel
./desktop.nix
./fonts.nix
./graystripe
./lix-cache.nix
./packages.nix
(import ./user.nix { name = "Tavi"; })
{
@ -60,11 +63,13 @@
system = "x86_64-linux";
specialArgs = attrs;
modules = [
lix-module.nixosModules.default
nixos-hardware.nixosModules.framework-16-7040-amd
./desktop.nix
./fonts.nix
./squirrelflight
./lix-cache.nix
./packages.nix
./squirrelflight
(import ./user.nix { name = "Tavi"; })
{
services.openssh = {

11
lix-cache.nix Normal file
View file

@ -0,0 +1,11 @@
{ ... }:
{
nix.settings.extra-substituters = [
"https://cache.lix.systems"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
}