ported to nixos-unstable

This commit is contained in:
Aly Raffauf 2024-03-02 13:09:35 -05:00
parent ae75d0bd2b
commit 45bbf40116
4 changed files with 67 additions and 15 deletions

View file

@ -9,8 +9,8 @@
# Configure keymap in X11
services.xserver = {
layout = "us";
xkbVariant = "";
xkb.layout = "us";
xkb.variant = "";
};
## Needed for Flatpaks

View file

@ -6,6 +6,27 @@
"nixpkgs"
]
},
"locked": {
"lastModified": 1709204054,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-stable": {
"inputs": {
"nixpkgs": [
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
@ -23,16 +44,16 @@
},
"nix-flatpak": {
"locked": {
"lastModified": 1699563939,
"narHash": "sha256-2Z4IP5Vb7jDVaDrKMO1tzLvpfuBpgTk9kJ2Okurv7rc=",
"lastModified": 1708268179,
"narHash": "sha256-NNVuhf84AeDTxadfSGnFqPHR0ED+QyM2gmu+Wyz6PrY=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "df3ea9930422fb14bf00e857ff771ddb85aafba6",
"rev": "a243cb0522f6240c194b873dde68e25370b06034",
"type": "github"
},
"original": {
"owner": "gmodena",
"ref": "v0.1.0",
"ref": "v0.3.0",
"repo": "nix-flatpak",
"type": "github"
}
@ -54,6 +75,22 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1709309926,
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
@ -72,9 +109,11 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"home-manager-stable": "home-manager-stable",
"nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
}
}
},

View file

@ -2,27 +2,40 @@
description = "Aly's NixOS configuration.";
inputs = {
# Main NixOS channel
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
# Unstable NixOS channel.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Declarative Flatpaks
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.1.0";
# Release NixOS channel.
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
# Home-manager, used for managing user configuration
# Declarative Flatpaks.
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.3.0";
# Home-manager, used for managing user configuration.
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
url = "github:nix-community/home-manager/master";
# The `follows` keyword in inputs is used for inheritance.
# Here, `inputs.nixpkgs` of home-manager is kept consistent with
# the `inputs.nixpkgs` of the current flake,
# to avoid problems caused by different versions of nixpkgs.
inputs.nixpkgs.follows = "nixpkgs";
};
# Home-manager, used for managing user configuration.
home-manager-stable = {
url = "github:nix-community/home-manager/release-23.11";
# The `follows` keyword in inputs is used for inheritance.
# Here, `inputs.nixpkgs` of home-manager is kept consistent with
# the `inputs.nixpkgs` of the current flake,
# to avoid problems caused by different versions of nixpkgs.
inputs.nixpkgs.follows = "nixpkgs-stable";
};
# Pre-baked hardware support for various devices.
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs = inputs@{ nixpkgs, nix-flatpak, home-manager, nixos-hardware, ... }: {
outputs = inputs@{ nixpkgs, nixpkgs-stable, nix-flatpak, home-manager, home-manager-stable, nixos-hardware, ... }: {
nixosConfigurations = {
# T440p with i5-4210M and 16GB RAM.

View file

@ -8,7 +8,7 @@
# Enable avahi.
services.avahi.enable = true;
services.avahi.nssmdns = true;
services.avahi.nssmdns4 = true;
services.avahi.publish.enable = true;
services.avahi.publish.addresses = true;
services.avahi.publish.workstation = true;