formatting
This commit is contained in:
parent
20e99d234d
commit
9ea28ef218
18 changed files with 183 additions and 75 deletions
|
|
@ -1,32 +1,38 @@
|
|||
{ lib, pkgs, inputs, config, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
inputs.agenix.nixosModules.default
|
||||
];
|
||||
|
||||
config = lib.mkIf config.osbmModules.agenix.enable {
|
||||
environment.systemPackages = [
|
||||
inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix
|
||||
pkgs.age
|
||||
];
|
||||
environment.systemPackages = [
|
||||
inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix
|
||||
pkgs.age
|
||||
];
|
||||
|
||||
age.secrets = {
|
||||
network-manager.file = ../secrets/network-manager.age;
|
||||
ssh-key-private = {
|
||||
file = ../secrets/ssh-key-private.age;
|
||||
path = "/home/osbm/.ssh/id_ed25519";
|
||||
owner = "osbm";
|
||||
group = "users";
|
||||
mode = "600";
|
||||
};
|
||||
ssh-key-public = {
|
||||
file = ../secrets/ssh-key-public.age;
|
||||
path = "/home/osbm/.ssh/id_ed25519.pub";
|
||||
owner = "osbm";
|
||||
group = "users";
|
||||
mode = "644";
|
||||
};
|
||||
age.secrets = {
|
||||
network-manager.file = ../secrets/network-manager.age;
|
||||
ssh-key-private = {
|
||||
file = ../secrets/ssh-key-private.age;
|
||||
path = "/home/osbm/.ssh/id_ed25519";
|
||||
owner = "osbm";
|
||||
group = "users";
|
||||
mode = "600";
|
||||
};
|
||||
ssh-key-public = {
|
||||
file = ../secrets/ssh-key-public.age;
|
||||
path = "/home/osbm/.ssh/id_ed25519.pub";
|
||||
owner = "osbm";
|
||||
group = "users";
|
||||
mode = "644";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.osbmModules;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkIf config.osbmModules.fonts.enable {
|
||||
fonts.packages = with pkgs; [
|
||||
|
|
@ -12,14 +17,23 @@
|
|||
dina-font
|
||||
proggyfonts
|
||||
jetbrains-mono
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; })
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"FiraCode"
|
||||
"JetBrainsMono"
|
||||
"Iosevka"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
fonts.fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "Noto Serif" ];
|
||||
sansSerif = [ "Noto Sans" ];
|
||||
monospace = [ "JetBrainsMono Nerd Font" "Fira Code" ];
|
||||
monospace = [
|
||||
"JetBrainsMono Nerd Font"
|
||||
"Fira Code"
|
||||
];
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, config, inputs, ... }:
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = lib.optionals (inputs ? home-manager) [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, config, inputs, ... }:
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
inputs.nix-index-database.nixosModules.nix-index
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ inputs, lib, config, ... }:
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkIf config.osbmModules.nixSettings.enable {
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"vscode"
|
||||
"discord"
|
||||
|
|
|
|||
|
|
@ -5,16 +5,18 @@ let
|
|||
regularUsers = builtins.filter (u: u != "root") cfg.users;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (cfg.users != []) {
|
||||
config = lib.mkIf (cfg.users != [ ]) {
|
||||
users.users = lib.mkMerge [
|
||||
# Create users based on the list (excluding root)
|
||||
(lib.genAttrs regularUsers (username: {
|
||||
isNormalUser = true;
|
||||
description = username;
|
||||
extraGroups = [ "networkmanager" ]
|
||||
++ lib.optional (username == cfg.defaultUser) "wheel"
|
||||
++ lib.optional config.osbmModules.virtualization.docker.enable "docker"
|
||||
++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers";
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
]
|
||||
++ lib.optional (username == cfg.defaultUser) "wheel"
|
||||
++ lib.optional config.osbmModules.virtualization.docker.enable "docker"
|
||||
++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers";
|
||||
}))
|
||||
|
||||
# Additional configuration for default user (including root if it's default)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue