Update formatter
This commit is contained in:
parent
4eea2232fb
commit
d8235cb2a9
55 changed files with 1031 additions and 664 deletions
|
@ -1,7 +1,13 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs;
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[
|
||||
vim
|
||||
tmux
|
||||
|
@ -25,8 +31,20 @@
|
|||
units
|
||||
powertop
|
||||
lm_sensors
|
||||
] ++ [ nixfmt nix-index nix-diff nixpkgs-review nixos-option ]
|
||||
++ [ autojump powerline-go ] ++ [ # File Utilities
|
||||
]
|
||||
++ [
|
||||
nixfmt
|
||||
nix-index
|
||||
nix-diff
|
||||
nixpkgs-review
|
||||
nixos-option
|
||||
]
|
||||
++ [
|
||||
autojump
|
||||
powerline-go
|
||||
]
|
||||
++ [
|
||||
# File Utilities
|
||||
ripgrep
|
||||
unzip
|
||||
p7zip
|
||||
|
@ -40,7 +58,9 @@
|
|||
vimPlugins.airline
|
||||
git
|
||||
git-lfs
|
||||
] ++ [ # Filesystem & Disk Utilities
|
||||
]
|
||||
++ [
|
||||
# Filesystem & Disk Utilities
|
||||
exfat
|
||||
samba
|
||||
cifs-utils
|
||||
|
@ -52,7 +72,9 @@
|
|||
smartmontools
|
||||
parted
|
||||
usbutils
|
||||
] ++ [ # Networking Utilities
|
||||
]
|
||||
++ [
|
||||
# Networking Utilities
|
||||
nmap
|
||||
bind
|
||||
curl
|
||||
|
@ -68,5 +90,4 @@
|
|||
imapsync
|
||||
bluez-tools
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
users = {
|
||||
|
@ -7,10 +12,15 @@ let
|
|||
isNormalUser = true;
|
||||
description = "Fabian Hauser";
|
||||
group = "fhauser";
|
||||
extraGroups =
|
||||
[ "wheel" "video" "docker" "networkmanager" "libvirtd" "adbusers" ];
|
||||
hashedPassword =
|
||||
"$6$rounds=20000$TYZ8CojfBLwejcwn$smEJe6/anL9NGf.Ytfny14nBfhr4TRPv2XK1lgHz7yg.zQow1HACePirEjsjxzFC6vTHGaT8t2NxobUsHbWLg1";
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"video"
|
||||
"docker"
|
||||
"networkmanager"
|
||||
"libvirtd"
|
||||
"adbusers"
|
||||
];
|
||||
hashedPassword = "$6$rounds=20000$TYZ8CojfBLwejcwn$smEJe6/anL9NGf.Ytfny14nBfhr4TRPv2XK1lgHz7yg.zQow1HACePirEjsjxzFC6vTHGaT8t2NxobUsHbWLg1";
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIPF8ZV7vhpbVvLxiKq8ANVusNUHMbtii5MuvjxCbVz7vSNVPo9OOLvYyDqhbRAWMTdQeGZVAaALBufKKmprDTRFMpnA7Ut4TFrdz/5DTaR2KEjJ7P75moH+0xooR/GsbzFGsNBSQSXK3u1igndPYEC/PqCHN++32kDo2wLqTB4VLrEovU3iq8BMckn329Bu1fGbXKTgDpEvUEEwFO2brQZLMmzILGF/v4B9ImEGtinAUNgDSfEpgPN23sdWQH9rwEClGv95JmWNf05tuVomhZzOBtCFoAno3XB1nj16avjsqJ3aGFY2CCcfsNrwKzhIotmm82bcI4BJuJIVRIKbZ1 cardno:000603507108"
|
||||
];
|
||||
|
@ -22,18 +32,22 @@ let
|
|||
description = "Testuser empty0";
|
||||
group = "empty0";
|
||||
extraGroups = [ "video" ];
|
||||
hashedPassword =
|
||||
"$6$mlI7Au.EzmrL9uJj$vz8ujechSkx83tsFcRA8D04vh5.3ZwPlPmE.wsf2CTKvLio48a1eXtRxUHkkDfPlLAjqyJ55bSSw2lLazH9Ip/";
|
||||
hashedPassword = "$6$mlI7Au.EzmrL9uJj$vz8ujechSkx83tsFcRA8D04vh5.3ZwPlPmE.wsf2CTKvLio48a1eXtRxUHkkDfPlLAjqyJ55bSSw2lLazH9Ip/";
|
||||
};
|
||||
};
|
||||
in {
|
||||
imports = [ ../../modules ./unfree.nix ./applications.nix ./overlays.nix ];
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../modules
|
||||
./unfree.nix
|
||||
./applications.nix
|
||||
./overlays.nix
|
||||
];
|
||||
|
||||
boot.loader.timeout = 2;
|
||||
boot.tmp.useTmpfs = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
|
||||
catppuccin.flavour = "mocha";
|
||||
|
||||
console.keyMap = "de_CH-latin1";
|
||||
|
@ -46,17 +60,21 @@ in {
|
|||
empty0.gid = 1003;
|
||||
};
|
||||
users.users = users // {
|
||||
root.openssh.authorizedKeys.keys = with lib;
|
||||
concatLists (mapAttrsToList (name: user:
|
||||
if elem "wheel" user.extraGroups then
|
||||
user.openssh.authorizedKeys.keys
|
||||
else
|
||||
[ ]) users);
|
||||
root.openssh.authorizedKeys.keys =
|
||||
with lib;
|
||||
concatLists (
|
||||
mapAttrsToList (
|
||||
name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else [ ]
|
||||
) users
|
||||
);
|
||||
};
|
||||
|
||||
# Package management
|
||||
nix = {
|
||||
settings.trusted-users = [ "root" "@wheel" ];
|
||||
settings.trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
automatic = true;
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
{ config, lib, pkgs, options, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [ (import ../../overlays) ];
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"unrar"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue