This commit is contained in:
Thilo Billerbeck 2025-01-18 01:26:41 +01:00
parent 9975ca27e2
commit 4934d38771
9 changed files with 91 additions and 70 deletions

View file

@ -27,7 +27,8 @@
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" = {
device = "/dev/disk/by-uuid/877C-C918";

View file

@ -9,27 +9,35 @@
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(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.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/5A04-0844";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5A04-0844";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
fileSystems = {
"/data" = {
@ -39,9 +47,9 @@
};
};
swapDevices =
[ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
];
swapDevices = [
{ device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,8 +1,9 @@
{ inputs
, pkgs
, config
, lib
, ...
{
inputs,
pkgs,
config,
lib,
...
}:
{

View file

@ -54,21 +54,23 @@
programs.kdeconnect.enable = true;
programs.nix-ld = {
enable = true;
libraries = (pkgs.steam-run.args.multiPkgs pkgs) ++ (with pkgs; [
nss
sane-backends
nspr
zlib
libglvnd
qt5.qtbase
qt5.qtsvg
qt5.qtdeclarative
qt5.qtwayland
pkcs11helper
stdenv.cc.cc
freetype
libraries =
(pkgs.steam-run.args.multiPkgs pkgs)
++ (with pkgs; [
nss
sane-backends
nspr
zlib
libglvnd
qt5.qtbase
qt5.qtsvg
qt5.qtdeclarative
qt5.qtwayland
pkcs11helper
stdenv.cc.cc
freetype
stdenv.cc.cc
stdenv.cc.cc
openssl
xorg.libXcomposite
xorg.libXtst
@ -150,7 +152,7 @@
libdrm
mesa
libxkbcommon
]);
]);
};
hardware.opengl = {

View file

@ -46,11 +46,12 @@
};
outputs =
{ nixpkgs
, home-manager
, nixgl
, w17
, ...
{
nixpkgs,
home-manager,
nixgl,
w17,
...
}@inputs:
let
system = "x86_64-linux";

View file

@ -85,7 +85,7 @@ with lib;
nixGL = {
packages = inputs.nixgl.packages;
defaultWrapper = "mesa";
installScripts = ["mesa"];
installScripts = [ "mesa" ];
vulkan.enable = true;
};

View file

@ -59,8 +59,8 @@ in
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
(pkgs.writeShellScriptBin "kitty-term-fix" ''
infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
'')
infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
'')
nixpkgs-fmt
ddev
act

View file

@ -22,7 +22,9 @@ let
user = "git";
identitiesOnly = true;
};
"mail" = { hostname = "mail.officerent.de"; };
"mail" = {
hostname = "mail.officerent.de";
};
"*.tu-darmstadt.de" = {
identityFile = "~/.ssh/id_tu-darmstadt-de";
};
@ -61,25 +63,21 @@ let
};
};
catchAlls = builtins.listToAttrs (
builtins.map
(host: {
name = "*.${host}";
value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root";
};
})
ownDomains
builtins.map (host: {
name = "*.${host}";
value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root";
};
}) ownDomains
);
hostnameAliasses = builtins.listToAttrs (
builtins.map
(host: {
name = "${host}";
value = {
hostname = "${host}.thilo-billerbeck.com";
};
})
thiloBillerbeckHosts
builtins.map (host: {
name = "${host}";
value = {
hostname = "${host}.thilo-billerbeck.com";
};
}) thiloBillerbeckHosts
);
buildersCCCDA = builtins.listToAttrs (
builtins.map
@ -89,7 +87,13 @@ let
user = "avocadoom";
identityFile = "~/.ssh/id_darmstadt-ccc-de";
};
}) [ "1" "2" "3" "4" ]
})
[
"1"
"2"
"3"
"4"
]
);
in
{

View file

@ -1,9 +1,13 @@
{
programs.ssh.knownHosts = {
"build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
"build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
"build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
"build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
"build1.darmstadt.ccc.de".publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
"build2.darmstadt.ccc.de".publicKey =
"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 = {