Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

This commit is contained in:
Vivian 2023-06-01 10:28:50 +02:00
commit f387a44282
24 changed files with 497 additions and 197 deletions

View file

@ -136,19 +136,19 @@
mac = "12:fa:24:02:65:e6";
nix = false;
};
"docker-registry-proxy" = {
ip = "192.168.0.128";
mac = "0e:11:65:62:66:9f";
};
# "docker-registry-proxy" = {
# ip = "192.168.0.128";
# mac = "0e:11:65:62:66:9f";
# };
"hassio" = {
ip = "192.168.0.129";
mac = "e6:80:32:fb:00:75";
nix = false;
};
"docker-registry" = {
ip = "192.168.0.130";
mac = "5e:0e:a6:cf:64:70";
};
# "docker-registry" = {
# ip = "192.168.0.130";
# mac = "5e:0e:a6:cf:64:70";
# };
"minecraft" = {
ip = "192.168.0.131";
mac = "00:0c:29:9b:e1:c4";

View file

@ -17,4 +17,22 @@
openFirewall = true;
mode = "server";
};
services.unbound.settings.server = {
local-zone = [
"xirion.net typetransparent"
"hades.xirion.net typetransparent"
"requests.xirion.net typetransparent"
"ha.xirion.net typetransparent"
"mail.xirion.net typetransparent"
];
local-data = [
''"xirion.net A 192.168.0.122"''
''"hades.xirion.net A 192.168.0.122"''
''"requests.xirion.net A 192.168.0.122"''
''"ha.xirion.net A 192.168.0.122"''
''"mail.xirion.net A 192.168.0.122"''
];
};
}

View file

@ -69,7 +69,5 @@ in {
pinentryFlavor = "curses";
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.victor = import ./home.nix;
}

View file

@ -1,9 +1,4 @@
_: {
programs.home-manager.enable = true;
home.username = "victor";
home.homeDirectory = "/home/victor";
home.stateVersion = "22.05";
programs.direnv = {
enable = true;
nix-direnv = { enable = true; };

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ pkgs, inputs, ... }: {
{ pkgs, ... }: {
imports = [ ./hardware-configuration.nix ./hardware.nix ];
# Bootloader.
@ -41,10 +41,7 @@
environment.sessionVariables.NIXOS_OZONE_WL = "1";
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.victor = import ./home;
extraSpecialArgs = { inherit inputs; };
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

View file

@ -22,6 +22,11 @@
driSupport = true;
};
hardware.logitech.wireless = {
enable = true;
enableGraphical = true;
};
# udev
services.udev.packages = with pkgs; [
android-udev-rules

View file

@ -1,12 +1,4 @@
_: {
programs.home-manager.enable = true;
home.username = "victor";
home.homeDirectory = "/home/victor";
home.stateVersion = "23.05";
imports = [ ../../../../common/desktop/home.nix ];
dconf.settings."org/gnome/desktop/peripherals/mouse" = {
accel-profile = "flat";
};

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ inputs, ... }: {
{ inputs, lib, ... }: {
imports = [
./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-z
@ -11,16 +11,19 @@
# Bootloader.
boot = {
bootspec.enable = true;
initrd.kernelModules = [ "amdgpu" ];
resumeDevice = "/dev/nvme0n1p2";
loader.systemd-boot.enable = lib.mkForce false;
lanzaboote = {
enable = true;
configurationLimit = 5;
pkiBundle = "/etc/secureboot";
};
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.victor = import ./home;
extraSpecialArgs = { inherit inputs; };
};
home-manager.users.victor = import ./home;
# Enable Ozone rendering for Chromium and Electron apps.
environment.sessionVariables.NIXOS_OZONE_WL = "1";

View file

@ -1,12 +1,4 @@
_: {
programs.home-manager.enable = true;
home.username = "victor";
home.homeDirectory = "/home/victor";
home.stateVersion = "23.05";
imports = [ ../../../../common/desktop/home.nix ];
# Custom dconf settings
dconf.settings."org/gnome/desktop/input-sources" = {
xkb-options = [ "caps:swapescape" ];