This commit is contained in:
CherryKitten 2024-03-24 19:02:29 +01:00
parent 9233d64ef3
commit 001f641a7f
Signed by: sammy
GPG key ID: 98D8F75FB0658276
16 changed files with 236 additions and 226 deletions

View file

@ -9,18 +9,29 @@
}; };
}; };
outputs = inputs @ { outputs =
self, inputs @ { self
nixpkgs, , nixpkgs
nixpkgs-unstable, , nixpkgs-unstable
home-manager, , home-manager
... , ...
}: let }:
let
inherit (self) outputs; inherit (self) outputs;
systems = [
"aarch64-linux"
"i686-linux"
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
forEachSystem = f: lib.genAttrs systems (system: f);
forAllSystems = lib.genAttrs systems;
lib = nixpkgs.lib // home-manager.lib; lib = nixpkgs.lib // home-manager.lib;
mkHost = { mkHost =
hostname, { hostname
user ? "sammy", , user ? "sammy"
,
}: { }: {
imports = [ imports = [
./hosts/${hostname}/configuration.nix ./hosts/${hostname}/configuration.nix
@ -33,9 +44,10 @@
allowLocalDeployment = true; allowLocalDeployment = true;
}; };
}; };
in { in
{
inherit lib; inherit lib;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
colmena = { colmena = {
meta = { meta = {
description = "All my NixoS machines"; description = "All my NixoS machines";

View file

@ -1,11 +1,10 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: { }: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.

View file

@ -1,11 +1,10 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
boot.initrd.availableKernelModules = [ "ahci" "nvme" ]; boot.initrd.availableKernelModules = [ "ahci" "nvme" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];

View file

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
users.users.admin = { users.users.admin = {
isNormalUser = true; isNormalUser = true;

View file

@ -1,11 +1,12 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
cfg = config.cherrykitten; cfg = config.cherrykitten;
in { in
{
options.cherrykitten = { }; options.cherrykitten = { };
config = { }; config = { };

View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
imports = [ ./fish ./nvim ]; imports = [ ./fish ./nvim ];
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
programs.fish = { programs.fish = {
enable = true; enable = true;

View file

@ -1,13 +1,14 @@
{ { config
config, , pkgs
pkgs, , inputs
inputs, , ...
...
}: { }: {
programs.neovim = let programs.neovim =
let
toLua = str: "lua << EOF\n${str}\nEOF\n"; toLua = str: "lua << EOF\n${str}\nEOF\n";
toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n"; toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
in { in
{
enable = true; enable = true;
viAlias = true; viAlias = true;

View file

@ -1,11 +1,12 @@
{ { lib
lib, , config
config, , pkgs
pkgs, , ...
... }:
}: let let
cfg = config.cherrykitten.common; cfg = config.cherrykitten.common;
in { in
{
options.cherrykitten.common = { options.cherrykitten.common = {
test = lib.mkOption { test = lib.mkOption {
type = lib.types.str; type = lib.types.str;

View file

@ -1,11 +1,12 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
cfg = config.cherrykitten.graphical; cfg = config.cherrykitten.graphical;
in { in
{
options.cherrykitten.graphical = { options.cherrykitten.graphical = {
enable = lib.mkEnableOption (lib.mdDoc "graphical stuffs"); enable = lib.mkEnableOption (lib.mdDoc "graphical stuffs");
}; };

View file

@ -1,11 +1,12 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
cfg = config.cherrykitten.users; cfg = config.cherrykitten.users;
in { in
{
options.cherrykitten.users = { options.cherrykitten.users = {
sammy.enable = lib.mkEnableOption "sammy" // { default = true; }; sammy.enable = lib.mkEnableOption "sammy" // { default = true; };
}; };