faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: faukah:cd63abe19811f8120540d2572b7f8a10e6706cae
Branches Tags
faukah:main
faukah:website
..
compare: faukah:a0bc8023a62aa84c966e57bc66039137cc9c8408
Branches Tags
faukah:main
faukah:website

No commits in common. "cd63abe19811f8120540d2572b7f8a10e6706cae" and "a0bc8023a62aa84c966e57bc66039137cc9c8408" have entirely different histories.
cd63abe198 ... a0bc8023a6

2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -2,6 +2,7 @@
description = "My NixOS config flake"; description = "My NixOS config flake";
outputs = inputs: let outputs = inputs: let
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
user = import ./modules/user {inherit pkgs;};
eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems); eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
pkgsFor = inputs.nixpkgs.legacyPackages; pkgsFor = inputs.nixpkgs.legacyPackages;
in { in {
@ -10,12 +11,20 @@
devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {}; devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {};
formatter.x86_64-linux = pkgs.alejandra; formatter.x86_64-linux = pkgs.alejandra;
# packages.x86_64-linux = {inherit (user) packages;};
packages = eachSystem ( packages = eachSystem (
system: { system: {
inherit (import ./packages pkgsFor.${system}) helix fish; 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 apps = eachSystem (system: let
user = import ./modules/user {pkgs = pkgsFor.${system};}; user = import ./modules/user {pkgs = pkgsFor.${system};};
@ -29,6 +38,12 @@
program = "${user.packages.helix}/bin/hx"; 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 = { inputs = {
# Unstable nixpkgs baby! # Unstable nixpkgs baby!

16
modules/system/boot/module.nix
View file

@ -1,17 +1,11 @@
{lib, pkgs, ...}:let {pkgs, ...}: {
inherit (lib.modules) mkForce;
in {
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot = { grub = {
enable = true; enable = true;
# security risk, see efiSupport = true;
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L208-L220 device = "nodev";
editor = mkForce false; configurationLimit = 5;
# device = "nodev";
configurationLimit = 15;
}; };
}; };
boot.plymouth = { boot.plymouth = {