Nix fmt rfc style (more or less)
This commit is contained in:
parent
e7496c447a
commit
515f098644
146 changed files with 2607 additions and 906 deletions
|
|
@ -1,14 +1,26 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
|
||||
age.secrets = {
|
||||
thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; };
|
||||
ntfy-thor = { file = ../../secrets/ntfy-thor.age; owner = "bertof"; };
|
||||
thor_wg_priv = {
|
||||
file = ../../secrets/thor_wg_priv.age;
|
||||
};
|
||||
ntfy-thor = {
|
||||
file = ../../secrets/ntfy-thor.age;
|
||||
owner = "bertof";
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelModules = [ "hid-nintendo" ];
|
||||
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
|
||||
binfmt.emulatedSystems = [
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_6_1;
|
||||
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||
|
|
@ -42,7 +54,14 @@
|
|||
|
||||
environment = {
|
||||
pathsToLink = [ "/share/zsh" ];
|
||||
systemPackages = builtins.attrValues { inherit (pkgs) git helix tmux vim; };
|
||||
systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
git
|
||||
helix
|
||||
tmux
|
||||
vim
|
||||
;
|
||||
};
|
||||
};
|
||||
|
||||
hardware = {
|
||||
|
|
@ -61,7 +80,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
opengl.enable = true;
|
||||
bluetooth = {
|
||||
enable = true;
|
||||
|
|
@ -69,7 +87,10 @@
|
|||
};
|
||||
enableRedistributableFirmware = true;
|
||||
pulseaudio.enable = false;
|
||||
opentabletdriver = { enable = true; daemon.enable = true; };
|
||||
opentabletdriver = {
|
||||
enable = true;
|
||||
daemon.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
i18n.defaultLocale = "it_IT.UTF-8";
|
||||
|
|
@ -100,15 +121,24 @@
|
|||
wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
autostart = false;
|
||||
address = [ "10.0.0.4/24" "fdc9:281f:04d7:9ee9::4/64" ];
|
||||
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
|
||||
address = [
|
||||
"10.0.0.4/24"
|
||||
"fdc9:281f:04d7:9ee9::4/64"
|
||||
];
|
||||
dns = [
|
||||
"10.0.0.1"
|
||||
"fdc9:281f:04d7:9ee9::1"
|
||||
];
|
||||
privateKeyFile = config.age.secrets.thor_wg_priv.path;
|
||||
|
||||
peers = [
|
||||
{
|
||||
# baldur
|
||||
# allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ];
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
allowedIPs = [
|
||||
"0.0.0.0/0"
|
||||
"::/0"
|
||||
];
|
||||
endpoint = "baldur.bertof.net:51820";
|
||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||
publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
|
||||
|
|
@ -117,19 +147,28 @@
|
|||
# odin
|
||||
publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw=";
|
||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||
allowedIPs = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/128" ];
|
||||
allowedIPs = [
|
||||
"10.0.0.2/24"
|
||||
"fdc9:281f:04d7:9ee9::2/128"
|
||||
];
|
||||
}
|
||||
{
|
||||
# oppo
|
||||
publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA=";
|
||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||
allowedIPs = [ "10.0.0.3/24" "fdc9:281f:04d7:9ee9::3/128" ];
|
||||
allowedIPs = [
|
||||
"10.0.0.3/24"
|
||||
"fdc9:281f:04d7:9ee9::3/128"
|
||||
];
|
||||
}
|
||||
{
|
||||
# thor
|
||||
publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk=";
|
||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||
allowedIPs = [ "10.0.0.4/24" "fdc9:281f:04d7:9ee9::4/128" ];
|
||||
allowedIPs = [
|
||||
"10.0.0.4/24"
|
||||
"fdc9:281f:04d7:9ee9::4/128"
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
@ -159,7 +198,10 @@
|
|||
# daemon.enable = true;
|
||||
# updater.enable = true;
|
||||
# };
|
||||
dbus = { packages = [ pkgs.dconf ]; implementation = "broker"; };
|
||||
dbus = {
|
||||
packages = [ pkgs.dconf ];
|
||||
implementation = "broker";
|
||||
};
|
||||
gnome.gnome-keyring.enable = true;
|
||||
gvfs = {
|
||||
enable = true;
|
||||
|
|
@ -168,10 +210,16 @@
|
|||
# joycond.enable = true;
|
||||
keybase.enable = true;
|
||||
onedrive.enable = true;
|
||||
openssh = { enable = true; openFirewall = true; };
|
||||
openssh = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa = { enable = true; support32Bit = true; };
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
jack.enable = true;
|
||||
pulse.enable = true;
|
||||
# media-session.enable = true;
|
||||
|
|
@ -206,17 +254,22 @@
|
|||
xserver = {
|
||||
enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
displayManager.gdm = { enable = true; autoSuspend = false; };
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
autoSuspend = false;
|
||||
};
|
||||
# windowManager.bspwm = { enable = true; };
|
||||
videoDrivers = [ "nvidia" ];
|
||||
xkb = {
|
||||
layout = "us,it";
|
||||
options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
|
||||
};
|
||||
xrandrHeads = [{
|
||||
primary = true;
|
||||
output = "DP-2";
|
||||
}];
|
||||
xrandrHeads = [
|
||||
{
|
||||
primary = true;
|
||||
output = "DP-2";
|
||||
}
|
||||
];
|
||||
};
|
||||
# gnome.gnome-remote-desktop.enable = true;
|
||||
};
|
||||
|
|
@ -226,7 +279,9 @@
|
|||
security = {
|
||||
tpm2.enable = true;
|
||||
rtkit.enable = true;
|
||||
pam.services = { autounlock_gnome_keyring.enableGnomeKeyring = true; };
|
||||
pam.services = {
|
||||
autounlock_gnome_keyring.enableGnomeKeyring = true;
|
||||
};
|
||||
sudo.extraConfig = ''
|
||||
Defaults pwfeedback
|
||||
'';
|
||||
|
|
@ -261,9 +316,7 @@
|
|||
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
packageOverrides = pkgs: {
|
||||
steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; };
|
||||
};
|
||||
packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; };
|
||||
# cudaSupport = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,14 @@
|
|||
boot = {
|
||||
extraModulePackages = [ ];
|
||||
initrd = {
|
||||
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
|
|
@ -19,7 +26,13 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@root" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
|
||||
options = [
|
||||
"subvol=@root"
|
||||
"x-gvfs-hide"
|
||||
"space_cache=v2"
|
||||
"discard"
|
||||
"compress-force=zstd:1"
|
||||
];
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/B9D2-255C";
|
||||
|
|
@ -28,17 +41,32 @@
|
|||
"/home/bertof" = {
|
||||
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home_bertof" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
|
||||
options = [
|
||||
"subvol=@home_bertof"
|
||||
"x-gvfs-hide"
|
||||
"space_cache=v2"
|
||||
"discard"
|
||||
"compress-force=zstd:1"
|
||||
];
|
||||
};
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
|
||||
options = [
|
||||
"subvol=@nix"
|
||||
"x-gvfs-hide"
|
||||
"space_cache=v2"
|
||||
"discard"
|
||||
"compress-force=zstd:1"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/dee188e4-4ff8-417c-9419-b7f00ecb9989"; }
|
||||
{ device = "/swapfile"; size = 1024 * 32; }
|
||||
{
|
||||
device = "/swapfile";
|
||||
size = 1024 * 32;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
{ pkgs, ... }: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "us,it";
|
||||
variant = ",colemak,";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
|
||||
options = [
|
||||
"terminate:ctrl_alt_bksp"
|
||||
"compose:rctrl"
|
||||
"grp:menu_toggle"
|
||||
];
|
||||
};
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
|
|
@ -58,13 +63,13 @@
|
|||
# seahorse
|
||||
totem
|
||||
;
|
||||
inherit (pkgs.unstable_pkgs)
|
||||
heroic
|
||||
;
|
||||
inherit (pkgs.unstable_pkgs) heroic;
|
||||
};
|
||||
};
|
||||
|
||||
services = { gnome-keyring.enable = true; };
|
||||
services = {
|
||||
gnome-keyring.enable = true;
|
||||
};
|
||||
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue