kenny/nixos-haus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added extra hosts defs for smooth name res

Browse Source
This commit is contained in:
kenny
2025-07-30 17:20:45 +03:00
parent 10f85de469
commit 93ad85f8dd
3 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1753549186, "lastModified": 1753694789,
"narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "17f6bd177404d6d43017595c5264756764444ab8", "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
hosts/puter/hardware-configuration.nix
View File

@@ -1,11 +1,16 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { {
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
[ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel" "wl"]; boot.kernelModules = ["kvm-intel" "wl"];
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];
@@ -15,8 +20,7 @@
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-08992355-1404-44dc-9bb4-fd32f1d0b62d".device = boot.initrd.luks.devices."luks-08992355-1404-44dc-9bb4-fd32f1d0b62d".device = "/dev/disk/by-uuid/08992355-1404-44dc-9bb4-fd32f1d0b62d";
"/dev/disk/by-uuid/08992355-1404-44dc-9bb4-fd32f1d0b62d";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/F54E-7011"; device = "/dev/disk/by-uuid/F54E-7011";
@@ -24,8 +28,7 @@
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };
swapDevices = swapDevices = [{device = "/dev/disk/by-uuid/c9b7b195-d072-4574-8e39-a5e4f90ca84d";}];
[{ device = "/dev/disk/by-uuid/c9b7b195-d072-4574-8e39-a5e4f90ca84d"; }];
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -40,8 +43,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc";
"/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc";
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = intel-vaapi-driver =
@@ -78,6 +80,5 @@
boot.blacklistedKernelModules = ["b43" "ssb" "brcmfmac" "brcmsmac" "bcma"]; boot.blacklistedKernelModules = ["b43" "ssb" "brcmfmac" "brcmsmac" "bcma"];
nixpkgs.config.permittedInsecurePackages = nixpkgs.config.permittedInsecurePackages = ["broadcom-sta-6.30.223.271-57-6.12.40" "python-2.7.18.8"];
[ "broadcom-sta-6.30.223.271-57-6.12.40" "python-2.7.18.8" ];
} }

10
modules/common/networking.nix
View File

@@ -19,9 +19,7 @@
LC_TIME = "ro_RO.UTF-8"; LC_TIME = "ro_RO.UTF-8";
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [torsocks];
torsocks
];
# 9050,9063,8118(HTTP) # 9050,9063,8118(HTTP)
services.tor = { services.tor = {
@@ -30,4 +28,10 @@
openFirewall = true; openFirewall = true;
settings = {ControlPort = 9051;}; settings = {ControlPort = 9051;};
}; };
networking.extraHosts = ''
192.168.0.131 bigbox.local
192.168.0.101 box.local
192.168.0.100 puter.local
'';
} }