cleanup and restructuring

This commit is contained in:
Rouven Seifert 2023-04-06 22:31:45 +02:00
parent 706220f980
commit 8b2ea66132
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
17 changed files with 85 additions and 97 deletions

View file

@ -9,8 +9,6 @@
./modules/nextcloud
./modules/vaultwarden
./modules/nginx
../../shared/vim.nix
../../shared/sops.nix
];
boot = {
@ -22,7 +20,6 @@
time.timeZone = "Europe/Berlin";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
@ -50,7 +47,7 @@
# ../../keys/ssh/rouven-smartcard
];
system.stateVersion = "22.11"; # Did you read the comment?
system.stateVersion = "22.11";
}

View file

@ -51,13 +51,6 @@
swapDevices =
[{ device = "/dev/disk/by-uuid/fdedb47c-a370-4005-ac37-1c186e667de0"; }];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,8 +1,7 @@
{ config, ... }:
{
networking = {
hostName = "nuc"; # Define your hostname.
hostId = "795a4952";
hostName = "nuc";
useNetworkd = true;
};
systemd.network = {

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, ... }:
{ config, pkgs, lib, xdph, ... }:
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -8,9 +8,6 @@
./modules/networks
./modules/greetd
./modules/snapper
../../shared/vim.nix
../../shared/sops.nix
../../shared/gpg.nix
];
# Use the systemd-boot EFI boot loader.
@ -75,7 +72,7 @@
xdg.portal = {
enable = true;
extraPortals = [
inputs.xdph.packages.x86_64-linux.default
xdph.packages.x86_64-linux.default
];
};

View file

@ -68,14 +68,6 @@
[{ device = "/dev/disk/by-uuid/1dd20f07-877c-4ee5-bef5-5e8c6ebe7927"; }];
boot.resumeDevice = "/dev/disk/by-uuid/1dd20f07-877c-4ee5-bef5-5e8c6ebe7927";
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -13,9 +13,6 @@
};
networking = { useNetworkd = true;
hostName = "thinkpad";
hostId = "79353b92"; # Define your hostname.
firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # open ports for kde connect
firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
wireless = {
enable = true;
userControlled.enable = true;