Compare commits

..

No commits in common. "12b2c483ad3d6eacf8182e7c3537ee910fe76d0c" and "9f7f85db0f6de00f794a72d210369d5ae15f2eb2" have entirely different histories.

3 changed files with 1 additions and 30 deletions

17
flake.lock generated
View File

@ -244,22 +244,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-mesa-fix": {
"locked": {
"lastModified": 1708100828,
"narHash": "sha256-h6wKqrpRjuLY/lo4HqPti2UL8grxPKnKlcSpqdP9je8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c01128ec0a607423838f82106b4bd62abc6da9c",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c01128ec0a607423838f82106b4bd62abc6da9c",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1708847675, "lastModified": 1708847675,
@ -317,7 +301,6 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-wsl": "nix-wsl", "nix-wsl": "nix-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-mesa-fix": "nixpkgs-mesa-fix",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"pkg-android-tools": "pkg-android-tools", "pkg-android-tools": "pkg-android-tools",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",

View File

@ -6,8 +6,6 @@
# ^^^^^^^^^^^^^ this part is optional # ^^^^^^^^^^^^^ this part is optional
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-mesa-fix.url = "github:NixOS/nixpkgs/5c01128ec0a607423838f82106b4bd62abc6da9c";
# this seems to be a popular way to declare systems # this seems to be a popular way to declare systems
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
@ -210,8 +208,6 @@
}; };
nullbox = mkSystem { nullbox = mkSystem {
nixpkgs = inputs.nixpkgs-unstable;
home-manager = inputs.home-manager-unstable;
system = "x86_64-linux"; system = "x86_64-linux";
hostname = "nullbox"; hostname = "nullbox";
stateVersion = "23.11"; stateVersion = "23.11";

View File

@ -3,7 +3,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`). # and in the NixOS manual (accessible by running `nixos-help`).
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
@ -21,20 +21,12 @@
# nixfiles # nixfiles
nixfiles = { nixfiles = {
profile.pc.enable = true;
programs.adb.enable = true;
common.remoteAccess.enable = true; common.remoteAccess.enable = true;
sessions.plasma.enable = true; sessions.plasma.enable = true;
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
packageSets.gaming.enable = true; packageSets.gaming.enable = true;
}; };
nixpkgs.overlays = [
(final: prev: {
mesa = inputs.nixpkgs-mesa-fix.legacyPackages.${pkgs.system}.mesa;
})
];
# cryptsetup # cryptsetup
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
lvmroot = { lvmroot = {