Compare commits
No commits in common. "cd63abe19811f8120540d2572b7f8a10e6706cae" and "a0bc8023a62aa84c966e57bc66039137cc9c8408" have entirely different histories.
cd63abe198
...
a0bc8023a6
2 changed files with 20 additions and 11 deletions
15
flake.nix
15
flake.nix
|
@ -2,6 +2,7 @@
|
|||
description = "My NixOS config flake";
|
||||
outputs = inputs: let
|
||||
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
|
||||
user = import ./modules/user {inherit pkgs;};
|
||||
eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
|
||||
pkgsFor = inputs.nixpkgs.legacyPackages;
|
||||
in {
|
||||
|
@ -10,12 +11,20 @@
|
|||
devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {};
|
||||
|
||||
formatter.x86_64-linux = pkgs.alejandra;
|
||||
# packages.x86_64-linux = {inherit (user) packages;};
|
||||
|
||||
packages = eachSystem (
|
||||
system: {
|
||||
inherit (import ./packages pkgsFor.${system}) helix fish;
|
||||
}
|
||||
);
|
||||
# packages = eachSystem (
|
||||
# system: let
|
||||
# user = import ./modules/user {pkgs = pkgsFor.${system};};
|
||||
# in {
|
||||
# inherit (user) packages;
|
||||
# }
|
||||
# );
|
||||
|
||||
apps = eachSystem (system: let
|
||||
user = import ./modules/user {pkgs = pkgsFor.${system};};
|
||||
|
@ -29,6 +38,12 @@
|
|||
program = "${user.packages.helix}/bin/hx";
|
||||
};
|
||||
});
|
||||
# nixosModules = eachSystem (system: let
|
||||
# user = import ./modules/user {inherit inputs;};
|
||||
# in {
|
||||
# user = user.module;
|
||||
# });
|
||||
# nixosModules.user = user.module;
|
||||
};
|
||||
inputs = {
|
||||
# Unstable nixpkgs baby!
|
||||
|
|
|
@ -1,17 +1,11 @@
|
|||
{lib, pkgs, ...}:let
|
||||
|
||||
inherit (lib.modules) mkForce;
|
||||
in {
|
||||
{pkgs, ...}: {
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot = {
|
||||
grub = {
|
||||
enable = true;
|
||||
# security risk, see
|
||||
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L208-L220
|
||||
editor = mkForce false;
|
||||
|
||||
# device = "nodev";
|
||||
configurationLimit = 15;
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
configurationLimit = 5;
|
||||
};
|
||||
};
|
||||
boot.plymouth = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue