From 6471de86cb2dcefbe070ba234c6f18ec6e14a649 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Thu, 13 Jun 2024 18:02:03 -0700 Subject: [PATCH 1/7] 24.05 update --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 514cd4c..ebb65de 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - "nixpkgs-23.05".url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; }; From d24d810cebc1cfc30f5bd06b6cbd1d0e76c68bf2 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Thu, 13 Jun 2024 18:02:22 -0700 Subject: [PATCH 2/7] Fix networking warning --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index bff22ef..4836f96 100644 --- a/configuration.nix +++ b/configuration.nix @@ -48,6 +48,7 @@ }; systemd.network.enable = true; + networking.useNetworkd = true; systemd.network.networks."10-wan" = { matchConfig.Name = "enp1s0"; networkConfig.DHCP = "ipv4"; From 88fbbd0914f3ce215366d44536e15b297b38c5fc Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Thu, 13 Jun 2024 18:16:12 -0700 Subject: [PATCH 3/7] flake update --- flake.lock | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 537e95a..456588f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,32 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1713725259, - "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23.05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -35,7 +19,6 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-23.05": "nixpkgs-23.05", "unstable": "unstable" } }, From 0651be0581623a902d4cca854b099e0def76d865 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Thu, 13 Jun 2024 18:17:13 -0700 Subject: [PATCH 4/7] update hardware-configuration.nix --- configuration.nix | 1 + hardware-configuration.nix | 34 +++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4836f96..9a57c22 100644 --- a/configuration.nix +++ b/configuration.nix @@ -55,6 +55,7 @@ address = [ "2a01:4ff:1f0:e4bd::/64" ]; routes = [{ routeConfig.Gateway = "fe80::1"; }]; }; + networking.interfaces."enp1s0".useDHCP = true; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 7902335..a1f7dbe 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,11 +1,35 @@ -{ modulesPath, ... }: { +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = - [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - boot.initrd.kernelModules = [ "nvme" ]; + [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + fileSystems."/" = { - device = "/dev/sda1"; + device = "/dev/disk/by-uuid/be1e37b2-1f27-4d9f-8cc5-c947b721042d"; fsType = "ext4"; }; + + fileSystems."/efi" = { + device = "systemd-1"; + fsType = "autofs"; + }; + + swapDevices = [ ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } From b62722a8714a96485bb8bae375fa0c0de25fd6b1 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Thu, 13 Jun 2024 18:18:44 -0700 Subject: [PATCH 5/7] fix boot --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 9a57c22..3f8f29a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -58,6 +58,7 @@ networking.interfaces."enp1s0".useDHCP = true; boot.tmp.cleanOnBoot = true; + boot.loader.grub.device = "/dev/sda"; zramSwap.enable = true; networking.hostName = "egirls"; networking.domain = "gay"; From ae4501b5af048f382fb552026b831da7b6b2a9aa Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Tue, 2 Jul 2024 22:23:10 -0700 Subject: [PATCH 6/7] flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 456588f..2f18b39 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1719838683, + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "unstable": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { From 084d9077a1f2b76b01f3d3d67ee5bba8a9b93dd5 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Tue, 30 Apr 2024 12:43:13 -0700 Subject: [PATCH 7/7] postfix --- configuration.nix | 1 + postfix.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 postfix.nix diff --git a/configuration.nix b/configuration.nix index 3f8f29a..721d4f5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,6 +4,7 @@ ./misskey-service.nix ./heartles-xyz-proxy.nix ./ogdo.nix + ./postfix.nix ]; nix.settings = { diff --git a/postfix.nix b/postfix.nix new file mode 100644 index 0000000..1818103 --- /dev/null +++ b/postfix.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +{ + services.postfix = { + enable = true; + enableSubmission = true; + + extraConfig = '' + inet_interfaces = 127.0.0.1 + ''; + }; +}