diff options
| -rw-r--r-- | depo/hikuj-zupip/configuration.nix | 47 | ||||
| -rw-r--r-- | depo/nutin-madaj/default.nix | 4 | ||||
| -rw-r--r-- | depo/nutin-madaj/mail.nix | 3 | ||||
| -rw-r--r-- | depo/nutin-madaj/networking.nix | 12 |
4 files changed, 28 insertions, 38 deletions
diff --git a/depo/hikuj-zupip/configuration.nix b/depo/hikuj-zupip/configuration.nix index 9de29aa..b313a36 100644 --- a/depo/hikuj-zupip/configuration.nix +++ b/depo/hikuj-zupip/configuration.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: { - networking = { hostName = "lithium"; hosts = { @@ -23,6 +22,21 @@ }; + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.enableContainers = true; + + boot.initrd.luks.devices = [ + { + name = "root"; + device = "/dev/disk/by-uuid/a0160f25-e0e3-4af0-8236-3e298eac957a"; + preLVM = true; + } + ]; + + powerManagement.enable = false; + time.timeZone = "America/Los_Angeles"; fonts.fonts = with pkgs; [ @@ -77,9 +91,7 @@ }; # https://github.com/NixOS/nixpkgs/issues/53985 - systemd.services.gitlab-runner.path = [ - "/run/wrappers" - ]; + systemd.services.gitlab-runner.path = ["/run/wrappers"]; services = { pcscd.enable = true; @@ -110,24 +122,11 @@ printing.enable = true; - tarsnap = { - enable = false; - archives = { - ben-home = { - directories = [ - ]; - }; - }; - }; - xserver = { enable = true; layout = "us"; - xkbOptions = "caps:ctrl_modifier"; - displayManager.sddm.enable = true; - desktopManager = { kodi.enable = true; plasma5.enable = true; @@ -189,20 +188,6 @@ }; }; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.initrd.luks.devices = [ - { - name = "root"; - device = "/dev/disk/by-uuid/a0160f25-e0e3-4af0-8236-3e298eac957a"; - preLVM = true; - } - ]; - - powerManagement.enable = false; - nix = { gc = { automatic = true; diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix index fdfb32e..4fae1e3 100644 --- a/depo/nutin-madaj/default.nix +++ b/depo/nutin-madaj/default.nix @@ -48,8 +48,6 @@ import "${nixpkgs}/nixos" { (import ../../pack/overlay.nix) ]; - networking.firewall.allowedTCPPorts = [ 22 80 443 ]; - programs.mosh = { enable = true; withUtempter = true; @@ -85,8 +83,6 @@ import "${nixpkgs}/nixos" { }; boot.cleanTmpDir = true; - networking.hostName = "simatime"; - networking.firewall.allowPing = true; services.openssh.enable = true; }; } diff --git a/depo/nutin-madaj/mail.nix b/depo/nutin-madaj/mail.nix index 39ed456..81bddc2 100644 --- a/depo/nutin-madaj/mail.nix +++ b/depo/nutin-madaj/mail.nix @@ -4,7 +4,7 @@ mailserver = { enable = true; monitoring = { - enable = true; + enable = false; alertAddress = "bsima@me.com"; }; fqdn = "simatime.com"; @@ -16,6 +16,7 @@ enablePop3Ssl = true; enableManageSieve = true; virusScanning = false; # ur on ur own + localDnsResolver = true; loginAccounts = { "ben@simatime.com" = { diff --git a/depo/nutin-madaj/networking.nix b/depo/nutin-madaj/networking.nix index 6c55005..4cfd73d 100644 --- a/depo/nutin-madaj/networking.nix +++ b/depo/nutin-madaj/networking.nix @@ -1,7 +1,15 @@ { lib, ... }: { - # This file was populated at runtime with the networking - # details gathered from the active system. networking = { + + hostName = "simatime"; + + firewall = { + allowedTCPPorts = [ 22 80 443 ]; + allowPing = true; + }; + + # This following was populated at runtime with the networking details + # gathered from the active system. nameservers = [ "67.207.67.2" "67.207.67.3" |