diff --git a/configuration.nix b/configuration.nix index 721d4f5..c7a44c9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -49,17 +49,14 @@ }; systemd.network.enable = true; - networking.useNetworkd = true; systemd.network.networks."10-wan" = { matchConfig.Name = "enp1s0"; networkConfig.DHCP = "ipv4"; address = [ "2a01:4ff:1f0:e4bd::/64" ]; routes = [{ routeConfig.Gateway = "fe80::1"; }]; }; - networking.interfaces."enp1s0".useDHCP = true; boot.tmp.cleanOnBoot = true; - boot.loader.grub.device = "/dev/sda"; zramSwap.enable = true; networking.hostName = "egirls"; networking.domain = "gay"; diff --git a/flake.lock b/flake.lock index 2f18b39..537e95a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,32 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "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", "repo": "nixpkgs", "type": "github" } @@ -19,16 +35,17 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", + "nixpkgs-23.05": "nixpkgs-23.05", "unstable": "unstable" } }, "unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ebb65de..514cd4c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + "nixpkgs-23.05".url = "github:NixOS/nixpkgs/nixos-23.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index a1f7dbe..7902335 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,35 +1,11 @@ -# 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, ... }: - -{ +{ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - + boot.loader.grub.device = "/dev/sda"; boot.initrd.availableKernelModules = - [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - + [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; + boot.initrd.kernelModules = [ "nvme" ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/be1e37b2-1f27-4d9f-8cc5-c947b721042d"; + device = "/dev/sda1"; 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"; }