Flake reorg
This commit is contained in:
parent
53c5ccb5cf
commit
2c64a8487c
3 changed files with 63 additions and 35 deletions
|
@ -8,12 +8,13 @@ with lib;
|
|||
with builtins;
|
||||
|
||||
let
|
||||
unstableTarball = fetchTarball
|
||||
"https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz";
|
||||
# unstableTarball = fetchTarball
|
||||
# "https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz";
|
||||
#unstable = import unstableTarball { config = config.nixpkgs.config; };
|
||||
in {
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
#./vpn.nix
|
||||
#/home/jaina/src/nix-deployments/nordvpn/containers.nix
|
||||
#/home/jaina/src/nix-deployments/refactor/nixos-containers.nix
|
||||
#/home/jaina/src/nix-deployments/arion/arion.nix
|
||||
|
@ -39,7 +40,6 @@ in {
|
|||
dates = "weekly";
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
programs.gamemode.enable = true;
|
||||
|
||||
|
@ -88,26 +88,26 @@ in {
|
|||
# services.xserver.videoDrivers = [ "modesetting" "nouveau" ];
|
||||
# boot.blacklistedKernelModules = [ "bbswitch" "nvidia" "nvidia-drm" ];
|
||||
# };
|
||||
nixpkgs.overlays = [
|
||||
(self: prev: {
|
||||
unstable = import unstableTarball { config = config.nixpkgs.config; };
|
||||
})
|
||||
# nixpkgs.overlays = [
|
||||
# (self: prev: {
|
||||
# unstable = import unstableTarball { config = config.nixpkgs.config; };
|
||||
# })
|
||||
|
||||
# (self: prev: {
|
||||
# sway-unwrapped = prev.sway-unwrapped.override {
|
||||
# wlroots_0_16 = self.wlroots_0_16.overrideAttrs {
|
||||
# patches = [
|
||||
# (prev.fetchpatch {
|
||||
# url =
|
||||
# "https://gitlab.freedesktop.org/wlroots/wlroots/uploads/b4f932e370ed03d88f202191eaf60965/DisplayLink.patch";
|
||||
# sha256 = lib.fakeHash;
|
||||
# })
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# })
|
||||
# # (self: prev: {
|
||||
# # sway-unwrapped = prev.sway-unwrapped.override {
|
||||
# # wlroots_0_16 = self.wlroots_0_16.overrideAttrs {
|
||||
# # patches = [
|
||||
# # (prev.fetchpatch {
|
||||
# # url =
|
||||
# # "https://gitlab.freedesktop.org/wlroots/wlroots/uploads/b4f932e370ed03d88f202191eaf60965/DisplayLink.patch";
|
||||
# # sha256 = lib.fakeHash;
|
||||
# # })
|
||||
# # ];
|
||||
# # };
|
||||
# # };
|
||||
# # })
|
||||
|
||||
];
|
||||
# ];
|
||||
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
|
@ -248,6 +248,8 @@ in {
|
|||
|
||||
gamescope
|
||||
intel-gpu-tools
|
||||
|
||||
sshfs
|
||||
];
|
||||
|
||||
programs.sway.enable = true;
|
||||
|
|
31
flake.lock
31
flake.lock
|
@ -2,16 +2,16 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1696019113,
|
||||
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
|
||||
"lastModified": 1701539137,
|
||||
"narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
|
||||
"rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -19,16 +19,33 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"stable": "stable",
|
||||
"unstable": "unstable"
|
||||
}
|
||||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1701539137,
|
||||
"narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1696019113,
|
||||
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
|
||||
"lastModified": 1701718080,
|
||||
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
|
||||
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
23
flake.nix
23
flake.nix
|
@ -1,16 +1,25 @@
|
|||
{
|
||||
inputs = {
|
||||
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||
stable.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
outputs = { self, nixpkgs, unstable }@attrs: {
|
||||
outputs = { self, nixpkgs, stable, unstable }@attrs: {
|
||||
nixosConfigurations.harrowhark = nixpkgs.lib.nixosSystem rec {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
specialArgs = { inherit unstable; };
|
||||
pkgs = let
|
||||
nixpkgsConfig = {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
in import nixpkgs (nixpkgsConfig // {
|
||||
overlays = [
|
||||
(new: prev: {
|
||||
unstable = import unstable nixpkgsConfig;
|
||||
stable = import stable nixpkgsConfig;
|
||||
})
|
||||
];
|
||||
});
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./configuration.nix
|
||||
|
|
Loading…
Reference in a new issue