mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-03-14 19:31:54 +01:00
nixfmt
This commit is contained in:
parent
9975ca27e2
commit
4934d38771
9 changed files with 91 additions and 70 deletions
|
@ -27,7 +27,8 @@
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
|
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
|
||||||
|
"/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/877C-C918";
|
device = "/dev/disk/by-uuid/877C-C918";
|
||||||
|
|
|
@ -9,28 +9,36 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
|
device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/5A04-0844";
|
device = "/dev/disk/by-uuid/5A04-0844";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/data" = {
|
"/data" = {
|
||||||
device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
|
device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
|
||||||
|
@ -39,8 +47,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
|
{ device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{ inputs
|
{
|
||||||
, pkgs
|
inputs,
|
||||||
, config
|
pkgs,
|
||||||
, lib
|
config,
|
||||||
, ...
|
lib,
|
||||||
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,7 +54,9 @@
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
programs.nix-ld = {
|
programs.nix-ld = {
|
||||||
enable = true;
|
enable = true;
|
||||||
libraries = (pkgs.steam-run.args.multiPkgs pkgs) ++ (with pkgs; [
|
libraries =
|
||||||
|
(pkgs.steam-run.args.multiPkgs pkgs)
|
||||||
|
++ (with pkgs; [
|
||||||
nss
|
nss
|
||||||
sane-backends
|
sane-backends
|
||||||
nspr
|
nspr
|
||||||
|
|
11
flake.nix
11
flake.nix
|
@ -46,11 +46,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ nixpkgs
|
{
|
||||||
, home-manager
|
nixpkgs,
|
||||||
, nixgl
|
home-manager,
|
||||||
, w17
|
nixgl,
|
||||||
, ...
|
w17,
|
||||||
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
|
@ -85,7 +85,7 @@ with lib;
|
||||||
nixGL = {
|
nixGL = {
|
||||||
packages = inputs.nixgl.packages;
|
packages = inputs.nixgl.packages;
|
||||||
defaultWrapper = "mesa";
|
defaultWrapper = "mesa";
|
||||||
installScripts = ["mesa"];
|
installScripts = [ "mesa" ];
|
||||||
vulkan.enable = true;
|
vulkan.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,9 @@ let
|
||||||
user = "git";
|
user = "git";
|
||||||
identitiesOnly = true;
|
identitiesOnly = true;
|
||||||
};
|
};
|
||||||
"mail" = { hostname = "mail.officerent.de"; };
|
"mail" = {
|
||||||
|
hostname = "mail.officerent.de";
|
||||||
|
};
|
||||||
"*.tu-darmstadt.de" = {
|
"*.tu-darmstadt.de" = {
|
||||||
identityFile = "~/.ssh/id_tu-darmstadt-de";
|
identityFile = "~/.ssh/id_tu-darmstadt-de";
|
||||||
};
|
};
|
||||||
|
@ -61,25 +63,21 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
catchAlls = builtins.listToAttrs (
|
catchAlls = builtins.listToAttrs (
|
||||||
builtins.map
|
builtins.map (host: {
|
||||||
(host: {
|
|
||||||
name = "*.${host}";
|
name = "*.${host}";
|
||||||
value = {
|
value = {
|
||||||
identityFile = "~/.ssh/id_thilo-billerbeck-com";
|
identityFile = "~/.ssh/id_thilo-billerbeck-com";
|
||||||
user = "root";
|
user = "root";
|
||||||
};
|
};
|
||||||
})
|
}) ownDomains
|
||||||
ownDomains
|
|
||||||
);
|
);
|
||||||
hostnameAliasses = builtins.listToAttrs (
|
hostnameAliasses = builtins.listToAttrs (
|
||||||
builtins.map
|
builtins.map (host: {
|
||||||
(host: {
|
|
||||||
name = "${host}";
|
name = "${host}";
|
||||||
value = {
|
value = {
|
||||||
hostname = "${host}.thilo-billerbeck.com";
|
hostname = "${host}.thilo-billerbeck.com";
|
||||||
};
|
};
|
||||||
})
|
}) thiloBillerbeckHosts
|
||||||
thiloBillerbeckHosts
|
|
||||||
);
|
);
|
||||||
buildersCCCDA = builtins.listToAttrs (
|
buildersCCCDA = builtins.listToAttrs (
|
||||||
builtins.map
|
builtins.map
|
||||||
|
@ -89,7 +87,13 @@ let
|
||||||
user = "avocadoom";
|
user = "avocadoom";
|
||||||
identityFile = "~/.ssh/id_darmstadt-ccc-de";
|
identityFile = "~/.ssh/id_darmstadt-ccc-de";
|
||||||
};
|
};
|
||||||
}) [ "1" "2" "3" "4" ]
|
})
|
||||||
|
[
|
||||||
|
"1"
|
||||||
|
"2"
|
||||||
|
"3"
|
||||||
|
"4"
|
||||||
|
]
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
{
|
{
|
||||||
programs.ssh.knownHosts = {
|
programs.ssh.knownHosts = {
|
||||||
"build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
|
"build1.darmstadt.ccc.de".publicKey =
|
||||||
"build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
|
||||||
"build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
|
"build2.darmstadt.ccc.de".publicKey =
|
||||||
"build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
|
||||||
|
"build3.darmstadt.ccc.de".publicKey =
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
|
||||||
|
"build4.darmstadt.ccc.de".publicKey =
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue